diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 197639e3a..3f42f9a5f 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -44,7 +44,7 @@ const storeMutations = {
 
   // OTHER MUTATIONS
   UPDATE_PAGE_DATA: "updatePageData",
-  SET_LOAD_FUNNEL_SESSION_INFO: "updateStateWithOrderInformation"
+  UPDATE_STATE_WITH_ORDER_INFORMATION: "updateStateWithOrderInformation"
   
 };
 
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 e2a6bb426..df0fefb60 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-if="isAvailable && this.answersToDisplay.length > 0" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
+        <div v-show="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 a79cdf49f..becd55ddc 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-if="selectedDamageLocations.includes('SideDoor')" aria-live="polite">
+            <div class="side-doors" v-show="selectedDamageLocations.includes('SideDoor')" aria-live="polite">
                 <buttonQuestion
                     :questionText="questionText"
                     isMultiSelect
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 fc29d1c34..5112363ce 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-if="isAvailable" aria-live="polite">
+        <div class="windshield-chip-count-question" v-show="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 3c377ec88..c05196a1c 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-if="isAvailable" aria-live="polite">
+        <div class="windshield-damage-type-question" v-show="isAvailable" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/store/index.js b/src/store/index.js
index b1a8f4da1..65eff4230 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -412,7 +412,7 @@ export const actions = {
         referralCorrelationId: referralCorrelationId
       },
     }).then((response) => {
-      context.commit(storeMutations.SET_LOAD_FUNNEL_SESSION_INFO, response.data);
+      context.commit(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, response.data);
       return response;
     });
   }
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index dc743d1ae..08db50bd0 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -586,7 +586,7 @@ describe("Actions", () => {
 
     // Assert
     expect(response.data).toEqual({ referralNumber: 123 });
-    expect(commit).toBeCalledWith(storeMutations.SET_LOAD_FUNNEL_SESSION_INFO, {"referralNumber": 123});
+    expect(commit).toBeCalledWith(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, {"referralNumber": 123});
   });
 
   it("setReferralInformation, should call commit three times", () => {
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index adbd8a377..d984ac171 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -188,7 +188,7 @@ export default {
   input[type="radio"] {
     opacity: 0;
     width: 0;
-    height: 0;
+    height: 0.1px; // NOTE: cannot be zero or safari can't put focus on it
     position: absolute;
 
     + label {