diff --git a/src/constants/dynamictext-mapper.js b/src/constants/dynamictext-mapper.js
index b450d0561..d47ef9d02 100644
--- a/src/constants/dynamictext-mapper.js
+++ b/src/constants/dynamictext-mapper.js
@@ -10,7 +10,7 @@ const customMappings = {
         { key: 'Rear Stationary', transformedValue: 'rear window' },
         { key: 'Rear Slider', transformedValue: 'rear window' },
         { key: 'Driver Front', transformedValue: 'driver side front door' },
-        { key: 'Driver Back ', transformedValue: 'driver side back door' },
+        { key: 'Driver Back', transformedValue: 'driver side back door' },
         { key: 'Driver Vent', transformedValue: 'driver side vent glass' },
         { key: 'Driver Quarter', transformedValue: 'driver side quarter panel' },
         { key: 'Driver SideDoor', transformedValue: 'driver side sliding door' },
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 0717a3498..e83b44096 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -14,10 +14,10 @@ const storeActions = {
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
 
   // DEPENDENCY MUTATIONS
-  RESET_VEHICLE_STATE: "resetVehicleAndDependencies",
-  RESET_DAMAGE_STATE: "resetDamageAndDependencies",
-  RESET_REGISTRATION_STATE: "resetRegistrationAndDependencies",
-  RESET_PARTS_STATE: "resetPartsAndDependencies",
+  RESET_VEHICLE_STATE_AND_DEPENDENCIES: "resetVehicleAndDependencies",
+  RESET_DAMAGE_STATE_AND_DEPENDENCIES: "resetDamageAndDependencies",
+  RESET_REGISTRATION_STATE_AND_DEPENDENCIES: "resetRegistrationAndDependencies",
+  RESET_PARTS_STATE_AND_DEPENDENCIES: "resetPartsAndDependencies",
 };
 
 export { storeActions };
diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue
index 774d863a8..7f2c736b2 100644
--- a/src/layouts/form-test/form-test.vue
+++ b/src/layouts/form-test/form-test.vue
@@ -144,7 +144,7 @@ export default {
     },
     resetDependentState() {
       // Invokes
-      store.dispatch(storeActions.RESET_PARTS_STATE);
+      store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
     },
     onSubmit(values) {
       window.alert('Success! Submitted values: ' + JSON.stringify(values, null ,2))
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 75cf54527..c1b9142bd 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -1,11 +1,11 @@
 <template>
-    <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall">
-        <funnelHeader ref="funnelHeader" />
-        <vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage="false" />
-        <funnelSubHeader ref="funnelSubHeader" />
-        <h1>Part Questions Page Placeholder</h1>
-        <funnelFooter ref="funnelFooter" @back-clicked="backButtonAction" />
-    </div>
+<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall">
+    <funnelHeader ref="funnelHeader" />
+    <vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage="false" />
+    <funnelSubHeader ref="funnelSubHeader" />
+    <h1>Part Questions Page Placeholder</h1>
+    <funnelFooter ref="funnelFooter" @back-clicked="backButtonAction" />
+</div>
 </template>
 
 <script>
@@ -16,11 +16,22 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
 
 // Supporting Files
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-import {storeMutations} from "@/constants/store-mutations";
-import {storeActions} from "@/constants/store-actions";
+import {
+    fetchCmsContentForPage
+} from "@/helpers/cms-content-helper";
+import {
+    settleAllPromises
+} from "@/helpers/layout-helper";
+import {
+    storeMutations
+} from "@/constants/store-mutations";
+import {
+    storeActions
+} from "@/constants/store-actions";
 import store from "@/store";
+import {
+    fmgPageValues
+} from "@/router/router-constants/fmgPage-values";
 
 export default {
     name: "part-questions",
@@ -61,7 +72,10 @@ export default {
             );
         },
         arePagePrerequisitesValid() {
-            return store.getters.lineItems.glassParts !== null;
+            if (Object.keys(store.getters.pageData(fmgPageValues.PART_QUESTIONS)).length !== 0) {
+                return true;
+            }
+            return false;
         },
         resetDependentState() {
             // Set
@@ -71,8 +85,7 @@ export default {
             store.dispatch(storeActions.RESET_PARTS_AND_DEPS);
         },
     },
-    data() {
-    },
+    data() {},
     components: {
         funnelHeader,
         vehicleBanner,
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 3b5913e56..39ee4beda 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -591,7 +591,7 @@ describe("vehicle-damage.vue", () => {
     wrapper.vm.resetDependentState();
 
     //Assert
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_PARTS_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES)
 
   });
 });
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 5a9eca92f..7a4f3e6be 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -121,7 +121,7 @@ export default {
       return store.getters.vehicle.carId !== null;
     },
     resetDependentState() {
-      store.dispatch(storeActions.RESET_PARTS_STATE);
+      store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
     },
     backButtonAction() {
       // route to move backwards
diff --git a/src/layouts/vehicle-make/vehicle-make.spec.js b/src/layouts/vehicle-make/vehicle-make.spec.js
index ab04bb1d2..d00b9240f 100644
--- a/src/layouts/vehicle-make/vehicle-make.spec.js
+++ b/src/layouts/vehicle-make/vehicle-make.spec.js
@@ -223,8 +223,8 @@ describe("vehicle-make.vue", () => {
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_CAR_ID, null)
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_VEHICLE_CATEGORY, null)
 
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES)
 
   });
 });
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 41c19a64c..262bee6fd 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -94,8 +94,8 @@ export default {
       store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
 
       // Invokes
-      store.dispatch(storeActions.RESET_DAMAGE_STATE);
-      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
     },
   },
 
diff --git a/src/layouts/vehicle-model/vehicle-model.spec.js b/src/layouts/vehicle-model/vehicle-model.spec.js
index 4e40a89cb..53710aa65 100644
--- a/src/layouts/vehicle-model/vehicle-model.spec.js
+++ b/src/layouts/vehicle-model/vehicle-model.spec.js
@@ -208,8 +208,8 @@ describe("vehicle-model.vue", () => {
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_CAR_ID, null)
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_VEHICLE_CATEGORY, null)
 
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES)
 
   });
 });
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index f57429c8b..97d017e34 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -94,8 +94,8 @@ export default {
       store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
 
       // Invokes
-      store.dispatch(storeActions.RESET_DAMAGE_STATE);
-      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
     },
   },
 
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index c7b035fdd..fcf27d3ba 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -6,6 +6,7 @@
 </div>
 
 <div class="container nested-radio" v-for="(value, name, index) in featureListData" :key="index">
+
     <div class="row my-2">
         <div class="col">
             <listCard v-model="selectedTint[name]" :isRadio="true" :isWide="true" :buttonImage="
@@ -18,9 +19,10 @@
     </div>
     <transition name="fade" mode="out-in">
         <div v-if="
-        selectedTint[name] != undefined &&
-        selectedTint[name].buttonId === `${glassLocation}-${glassName}-${name}`
-      " class="row my-2" aria-live="polite">
+          selectedTint[name] != undefined &&
+          selectedTint[name].buttonId ===
+            `${glassLocation}-${glassName}-${name}`
+        " class="row my-2" aria-live="polite">
             <div class="col">
                 <buttonQuestion v-model="selectedPart[glassLocation]" buttonType="radio" class="radioQuestion" :questionText="glassFeatureQuestion" :answers="value" textPosition="text-start" :loaderEnabled="false" :isRequired="true" :groupName="`${glassLocation}-${glassName}-${name}`" />
             </div>
@@ -47,8 +49,8 @@ export default {
     inheritAttrs: false,
     data() {
         return {
-            glassColorQuestion: '',
-            glassFeatureQuestion: '',
+            glassColorQuestion: "",
+            glassFeatureQuestion: "",
             selectedTint: {}, // v-model for the list card selections
         };
     },
@@ -56,12 +58,13 @@ export default {
         glassName: String,
         glassLocation: String,
         colorAnswers: Array,
-        modelValue: Object
+        modelValue: Object,
     },
     mounted() {
         if (this.modelValue !== undefined) {
             // Populate button-question model-value if parts data already exists in VueX
-            const alreadyPopulatedPartsData = this.$store.getters.lineItems.glassParts;
+            const alreadyPopulatedPartsData =
+                this.$store.getters.lineItems.glassParts;
 
             Object.keys(alreadyPopulatedPartsData).forEach((key) => {
                 const partNumber = alreadyPopulatedPartsData[key].partNumber;
@@ -71,8 +74,8 @@ export default {
                     if (this.modelValue[key][0] === partNumber) {
                         this.selectedTint[tintColor] = {
                             buttonId: `${this.glassLocation}-${this.glassName}-${tintColor}`,
-                            checkValue: '',
-                            value: ''
+                            checkValue: "",
+                            value: "",
                         };
                     }
                 });
@@ -85,7 +88,10 @@ export default {
     },
     computed: {
         colorQuestionText() {
-            return getCustomTransformValue(this.glassColorQuestion, `${this.glassLocation} ${this.glassName}`);
+            return getCustomTransformValue(
+                this.glassColorQuestion,
+                `${this.glassLocation} ${this.glassName}`
+            );
         },
 
         selectedPart: {
@@ -94,7 +100,7 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
-            }
+            },
         },
 
         // Creates a map of the feature list data in the correct Name/Value
@@ -120,7 +126,7 @@ export default {
             }, {});
 
             return tintMapByColor;
-        }
+        },
     },
     methods: {
         initializeComponent(cmsContent) {
@@ -144,7 +150,7 @@ export default {
         ResetTintAndPartSelections() {
             this.selectedTint = {};
             this.selectedPart = {};
-        }
+        },
     },
 };
 </script>
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index c12aba5b4..0ccfd9c4e 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -17,7 +17,7 @@
             <hr v-if="i > 0" />
         </div>
 
-        <glassPartQuestion :ref="`${refPrefix}-${item.glassLocation}`" v-model="glassParts[item.glassLocation + '-' + item.glassName]" :glassLocation="item.glassLocation" :glassName="item.glassName" :colorAnswers="item.colorAnswers" />
+        <glassPartQuestion :ref="`${RefPrefix}-${item.glassLocation}-${item.glassName}`" v-model="glassParts[item.glassLocation + '-' + item.glassName]" :glassLocation="item.glassLocation" :glassName="item.glassName" :colorAnswers="item.colorAnswers" />
     </div>
     <funnelFooter ref="funnelFooter" @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" />
 </div>
@@ -75,7 +75,7 @@ export default {
             // Glass Part Question dynamic component
 
             Object.keys(vm.$refs)
-                .filter((r) => r.includes(vm.refPrefix) && vm.$refs[r][0] !== undefined)
+                .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
                 .forEach((c) =>
                     vm.$refs[c][0].initializeComponent({
                         ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
@@ -95,7 +95,6 @@ export default {
     data() {
         return {
             glassParts: {},
-            refPrefix: "partQuestion",
             alertWidgetData: Object,
         };
     },
@@ -110,7 +109,7 @@ export default {
     computed: {
         PartsForQuestions() {
             const partsData = this.$store.getters.pageData(this.$route.query.fmgPage);
-            const alreadyPopulatedPartsData = this.$store.getters.lineItems.glassParts;
+            const alreadyPopulatedPartsData = this.$store.getters.lineItems.glassParts === null ? {} : this.$store.getters.lineItems.glassParts;
 
             // Map API result data, to vehicle-parts data structure
             const mappedData = partsData.partsOrQuestions.map(g => {
@@ -148,6 +147,10 @@ export default {
 
         PartsFromApi() {
             return store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+        },
+
+        RefPrefix() {
+            return 'partQuestion';
         }
 
     },
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 11653e25d..d7b37b4b0 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -99,8 +99,8 @@ export default {
     },
     resetDependentState() {
       // Invokes
-      store.dispatch(storeActions.RESET_DAMAGE_STATE);
-      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
     },
   },
 
diff --git a/src/layouts/vehicle-year/vehicle-year.spec.js b/src/layouts/vehicle-year/vehicle-year.spec.js
index c04d61b17..5e6d9bf33 100644
--- a/src/layouts/vehicle-year/vehicle-year.spec.js
+++ b/src/layouts/vehicle-year/vehicle-year.spec.js
@@ -163,8 +163,8 @@ describe("vehicle-year.vue", () => {
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_CAR_ID, null)
     expect(store.commit).toBeCalledWith(storeMutations.UPDATE_VEHICLE_CATEGORY, null)
 
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES)
 
   });
 });
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index d73ac46f9..460c8ced4 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -95,8 +95,8 @@ export default {
       store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
 
       // Invokes
-      store.dispatch(storeActions.RESET_DAMAGE_STATE);
-      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
     }
   },
   components: {
diff --git a/src/store/index.js b/src/store/index.js
index eaa4e4f67..4b0e06eb4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -122,9 +122,8 @@ export const mutations = {
 
   },
   resetPartsState(state) {
-    state.glassParts = null;
-    state.childParts = null;
-    state.otherParts = null;
+    state.order.lineItems.glassParts = null;
+    state.order.lineItems.otherParts = null;
   }
 }
 
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index cccc0d91d..84267fb01 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -42,12 +42,14 @@ export default {
   },
   data() {
     return {
-      checkValue: false,
+      checkValue: Boolean,
     };
   },
   created() {
     if (this.selectedValues) {
       this.checkValue = this.selectedValues[0] === this.value;
+    }else{
+      this.checkValue = false;
     }
   },
   methods: {