diff --git a/jest.config.js b/jest.config.js
index 631d0b9c4..c1edf3074 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -34,7 +34,7 @@ module.exports = {
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
   coverageThreshold: {
     global: {
-      statements: 88,
+      statements: 87,
       // Got the go ahead from Mark to temporarily lower this. Taking out initialize component made the year,make,model and style coverage drop a bit. Once unit tests for license plate lookup, vin lookup and address lookup are in the coverage should go back up to 90
     },
   },
diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index b46d933c0..79937c780 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -160,6 +160,7 @@ export default {
   .overflow-scroll {
     // Height will be determined by overall height of content above list
     height: calc(100% - 300px);
+    overflow-x: hidden !important;
     -webkit-overflow-scrolling: touch;
   }
 }
diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index 62b7d9147..cea6b403e 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -126,5 +126,8 @@ export default {
       justify-content: flex-start;
     }
   }
+  & > .container-fluid {
+    overflow-x: visible; // needed to fix hidden footer on some iphones
+  }
 }
 </style>
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 974bff7cb..77d6abe92 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -43,10 +43,10 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
         return 'vehicle-damage'
     } else {
         if (store.getters.vehicle.vin) {
-            return 'heritage';
+            return 'vehicle-damage';
             //return "vin-lookup"; (uncomment)
         } else {
-            return 'heritage';
+            return 'vehicle-damage';
             //return "estimate" (uncomment)
         }
     }
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 44f087b64..be1136e63 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -229,7 +229,7 @@ describe("getPageToRouteExistingOrderTo", () => {
 
         //Assert
         //expect(result).toBe('vin-lookup');
-        expect(result).toBe('heritage');
+        expect(result).toBe('vehicle-damage');
     });
 
     test("getPageToRouteExistingOrderTo, should return estimate", async () => {
@@ -285,7 +285,7 @@ describe("getPageToRouteExistingOrderTo", () => {
 
         //Assert
         //expect(result).toBe('estimate');
-        expect(result).toBe('heritage');
+        expect(result).toBe('vehicle-damage');
     });
 
     test("getPageToRouteExistingOrderTo, existing order, should return heritage", async () => {
diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index df0fefb60..e2a6bb426 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div v-show="isAvailable && this.answersToDisplay.length > 0" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
+        <div v-if="isAvailable && this.answersToDisplay.length > 0" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
             <buttonQuestion
                 isWide
                 :questionText="questionText"
diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index becd55ddc..a79cdf49f 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="side-door-options">
         <transition name="fade" mode="out-in">
-            <div class="side-doors" v-show="selectedDamageLocations.includes('SideDoor')" aria-live="polite">
+            <div class="side-doors" v-if="selectedDamageLocations.includes('SideDoor')" aria-live="polite">
                 <buttonQuestion
                     :questionText="questionText"
                     isMultiSelect
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 893e7d572..da252308a 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -277,7 +277,8 @@ export default {
 
     navigateForward(partsData){
       // CSR-98 TEMP
-      if (store.getters.vehicle.year == 2010) {
+      const vehicleYearsToShowHeritageFunnel = [ "2001", "2002", "2010" ];
+      if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) {
         navigateToHeritageFunnel();
         return;
       }
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index 5112363ce..fc29d1c34 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div class="windshield-chip-count-question" v-show="isAvailable" aria-live="polite">
+        <div class="windshield-chip-count-question" v-if="isAvailable" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index c05196a1c..3c377ec88 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div class="windshield-damage-type-question" v-show="isAvailable" aria-live="polite">
+        <div class="windshield-damage-type-question" v-if="isAvailable" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 8425a3021..2b2fde4c4 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -23,7 +23,7 @@ body {
   }
   .container,
   .container-fluid {
-    overflow-x: hidden !important;
+    overflow-x: hidden;
   }
 
   .sr-only {
diff --git a/src/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js
index 11f24abbb..3aa803cc1 100644
--- a/src/ux-components/list-card/list-card.spec.js
+++ b/src/ux-components/list-card/list-card.spec.js
@@ -145,7 +145,7 @@ describe("list-card.vue", () => {
 
     // Assert
     const label = wrapper.find("label");
-    expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4"]);
+    expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-2", "ps-4", "pe-4"]);
   });
 
   it("Should return flex row classes if isWide is true and checkboxTop if buttonLabelSubCopy is true", async () => {
@@ -167,7 +167,7 @@ describe("list-card.vue", () => {
 
     // Assert
     const label = wrapper.find("label");
-    expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4", "checkboxTop"]);
+    expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-2", "ps-4", "pe-4", "checkboxTop"]);
   });
 
   it("Should return flex column classes if isWide is false", async () => {
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index d984ac171..eb0570c58 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -107,7 +107,7 @@ export default {
   computed: {
     getLabelClasses() {
       if (this.isWide) {
-        let classes = "flex-row py-r ps-3 pe-4";
+        let classes = "flex-row py-2 ps-4 pe-4";
         if (this.buttonLabelSubCopy) {
           classes += " checkboxTop";
         }
@@ -173,7 +173,7 @@ export default {
     // svg's should be constructed on the same canvas size/viewbox to ensure they occupy the same space in the DOM. This will allow easy/proper alignment of elements. See exisitng svg's for examples.
     height: auto;
     width: 6.5rem;
-    margin-bottom: 3rem;
+    margin-bottom: 2.2rem;
     max-width: 100%;
   }