diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index dddab1d66..0717a3498 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_AND_DEPS: "resetVehicleAndDependencies",
-  RESET_DAMAGE_AND_DEPS: "resetDamageAndDependencies",
-  RESET_REGISTRATION_AND_DEPS: "resetRegistrationAndDependencies",
-  RESET_PARTS_AND_DEPS: "resetPartsAndDependencies",
+  RESET_VEHICLE_STATE: "resetVehicleAndDependencies",
+  RESET_DAMAGE_STATE: "resetDamageAndDependencies",
+  RESET_REGISTRATION_STATE: "resetRegistrationAndDependencies",
+  RESET_PARTS_STATE: "resetPartsAndDependencies",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index c572c4f69..9034d594f 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -16,10 +16,10 @@ const storeMutations = {
   REMOVE_EVENT_FROM_BUS: "removeEventFromBus",
 
   // DEPENDENCY MUTATIONS
-  RESET_VEHICLE_AND_DEPS: "resetVehicleAndDependencies",
-  RESET_DAMAGE_AND_DEPS: "resetDamageAndDependencies",
-  RESET_REGISTRATION_AND_DEPS: "resetRegistrationAndDependencies",
-  RESET_PARTS_AND_DEPS: "resetPartsAndDependencies",
+  RESET_VEHICLE_STATE: "resetVehicleState",
+  RESET_DAMAGE_STATE: "resetDamageState",
+  RESET_REGISTRATION_STATE: "resetRegistrationState",
+  RESET_PARTS_STATE: "resetPartsState",
   
 };
 
diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue
index f12abb261..774d863a8 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_AND_DEPS);
+      store.dispatch(storeActions.RESET_PARTS_STATE);
     },
     onSubmit(values) {
       window.alert('Success! Submitted values: ' + JSON.stringify(values, null ,2))
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 519d33457..d01febba1 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -162,7 +162,7 @@ describe("vehicle-damage.vue", () => {
     wrapper.vm.resetDependentState();
 
     //Assert
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_PARTS_AND_DEPS)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_PARTS_STATE)
 
   });
 });
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index aa888e14a..2188d4845 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -128,7 +128,7 @@ export default {
     },
     resetDependentState() {
       // Invokes
-      store.dispatch(storeActions.RESET_PARTS_AND_DEPS);
+      store.dispatch(storeActions.RESET_PARTS_STATE);
     },
     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 b2c4dcaf7..ab04bb1d2 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_AND_DEPS)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_AND_DEPS)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
 
   });
 });
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index c91379318..41c19a64c 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_AND_DEPS);
-      store.dispatch(storeActions.RESET_REGISTRATION_AND_DEPS);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
     },
   },
 
diff --git a/src/layouts/vehicle-model/vehicle-model.spec.js b/src/layouts/vehicle-model/vehicle-model.spec.js
index 7f8f96eb6..4e40a89cb 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_AND_DEPS)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_AND_DEPS)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
 
   });
 });
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index 02de04c3b..f57429c8b 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_AND_DEPS);
-      store.dispatch(storeActions.RESET_REGISTRATION_AND_DEPS);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
     },
   },
 
diff --git a/src/layouts/vehicle-parts/part-question/part-question.vue b/src/layouts/vehicle-parts/part-question/part-question.vue
index 9a7e63df6..7046e1b79 100644
--- a/src/layouts/vehicle-parts/part-question/part-question.vue
+++ b/src/layouts/vehicle-parts/part-question/part-question.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="container">
     <div class="row">
-        <p>{{ colorQuestionText }}</p>
+        <p class="mb-0">{{ colorQuestionText }}</p>
     </div>
 </div>
 
@@ -27,6 +27,7 @@
         </div>
     </transition>
 </div>
+
 </template>
 
 <script>
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 72bf62d9c..8c9b4d843 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -12,8 +12,13 @@
     </div>
 
     <div v-for="(item, i) in Parts" :key="i">
+
+        <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
+        <div class="container-fluid">
+            <hr v-if="i > 0">
+        </div>
+
         <partQuestion :ref="`${refPrefix}-${item.glassLocation}`" v-model="glassParts[item.glassLocation + '-' + item.glassName]" :glassLocation="item.glassLocation" :glassName="item.glassName" :colorAnswers="item.colorAnswers" />
-        <br />
     </div>
     <funnelFooter ref="funnelFooter" @back-clicked="backButtonAction" />
 </div>
@@ -146,7 +151,6 @@ export default {
                     glassName: g.glassName,
                     glassLocation: g.glassLocation,
                     colorAnswers: g.parts.reduce((arr, p) => {
-
                         arr.push({
                             ColorAnswerText: p.color,
                             FeatureAnswers: [{
@@ -154,7 +158,6 @@ export default {
                                 PartNumber: p.partNumber
                             }]
                         });
-
                         return arr;
                     }, [])
                 }
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 3009a696a..11653e25d 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_AND_DEPS);
-      store.dispatch(storeActions.RESET_REGISTRATION_AND_DEPS);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
     },
   },
 
diff --git a/src/layouts/vehicle-year/vehicle-year.spec.js b/src/layouts/vehicle-year/vehicle-year.spec.js
index 5ef3ea404..c04d61b17 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_AND_DEPS)
-    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_AND_DEPS)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_DAMAGE_STATE)
+    expect(store.dispatch).toBeCalledWith(storeActions.RESET_REGISTRATION_STATE)
 
   });
 });
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index e8e69c29a..d73ac46f9 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_AND_DEPS);
-      store.dispatch(storeActions.RESET_REGISTRATION_AND_DEPS);
+      store.dispatch(storeActions.RESET_DAMAGE_STATE);
+      store.dispatch(storeActions.RESET_REGISTRATION_STATE);
     }
   },
   components: {
diff --git a/src/store/index.js b/src/store/index.js
index 7feea102d..9e4c5b0c1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -86,7 +86,7 @@ export const mutations = {
   },
 
   // DEPENDENCY MUTATIONS
-  resetVehicleAndDependencies(state) {
+  resetVehicleState(state) {
     state.order.vehicle.year = null;
     state.order.vehicle.make = null;
     state.order.vehicle.model = null;
@@ -94,7 +94,7 @@ export const mutations = {
     state.order.vehicle.carId = null;
     state.order.vehicle.category = null;
   },
-  resetDamageAndDependencies(state) {
+  resetDamageState(state) {
     state.order.damage.isRepair = null;
     state.order.damage.numberOfChips = null;
     state.order.damage.windshieldGlassToReplace = null;
@@ -103,10 +103,10 @@ export const mutations = {
     state.order.damage.rearGlassToReplace = null;
 
   },
-  resetRegistrationAndDependencies(state) {
+  resetRegistrationState(state) {
 
   },
-  resetPartsAndDependencies(state) {
+  resetPartsState(state) {
     state.glassParts = null;
     state.childParts = null;
     state.otherParts = null;
@@ -202,20 +202,20 @@ export const actions = {
 
   // DEPENDENCY ACTIONS
   resetVehicleAndDependencies(context) {
-    context.commit(storeMutations.RESET_VEHICLE_AND_DEPS);
-    context.commit(storeMutations.RESET_DAMAGE_AND_DEPS);
-    context.commit(storeMutations.RESET_REGISTRATION_AND_DEPS);
+    context.commit(storeMutations.RESET_VEHICLE_STATE);
+    context.commit(storeMutations.RESET_DAMAGE_STATE);
+    context.commit(storeMutations.RESET_REGISTRATION_STATE);
   },
   resetDamageAndDependencies(context) {
-    context.commit(storeMutations.RESET_DAMAGE_AND_DEPS);
-    context.commit(storeMutations.RESET_PARTS_AND_DEPS);
+    context.commit(storeMutations.RESET_DAMAGE_STATE);
+    context.commit(storeMutations.RESET_PARTS_STATE);
   },
   resetRegistrationAndDependencies(context) {
-    context.commit(storeMutations.RESET_REGISTRATION_AND_DEPS);
-    context.commit(storeMutations.RESET_PARTS_AND_DEPS)
+    context.commit(storeMutations.RESET_REGISTRATION_STATE);
+    context.commit(storeMutations.RESET_PARTS_STATE)
   },
   resetPartsAndDependencies(context) {
-    context.commit(storeMutations.RESET_PARTS_AND_DEPS);
+    context.commit(storeMutations.RESET_PARTS_STATE);
   },
 
   // Content API Actions
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index f33595e58..b6920b72f 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -313,9 +313,9 @@ describe("Actions", () => {
     // Act
     await actions.resetVehicleAndDependencies(context)
 
-    expect(commit).toBeCalledWith(storeMutations.RESET_VEHICLE_AND_DEPS);
-    expect(commit).toBeCalledWith(storeMutations.RESET_DAMAGE_AND_DEPS);
-    expect(commit).toBeCalledWith(storeMutations.RESET_REGISTRATION_AND_DEPS);
+    expect(commit).toBeCalledWith(storeMutations.RESET_VEHICLE_STATE);
+    expect(commit).toBeCalledWith(storeMutations.RESET_DAMAGE_STATE);
+    expect(commit).toBeCalledWith(storeMutations.RESET_REGISTRATION_STATE);
 
   });
 
@@ -330,8 +330,8 @@ describe("Actions", () => {
     // Act
     await actions.resetDamageAndDependencies(context)
 
-    expect(commit).toBeCalledWith(storeMutations.RESET_DAMAGE_AND_DEPS);
-    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_AND_DEPS);
+    expect(commit).toBeCalledWith(storeMutations.RESET_DAMAGE_STATE);
+    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_STATE);
 
   });
 
@@ -346,8 +346,8 @@ describe("Actions", () => {
     // Act
     await actions.resetRegistrationAndDependencies(context)
 
-    expect(commit).toBeCalledWith(storeMutations.RESET_REGISTRATION_AND_DEPS);
-    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_AND_DEPS);
+    expect(commit).toBeCalledWith(storeMutations.RESET_REGISTRATION_STATE);
+    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_STATE);
 
   });
 
@@ -362,7 +362,7 @@ describe("Actions", () => {
     // Act
     await actions.resetPartsAndDependencies(context)
 
-    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_AND_DEPS);
+    expect(commit).toBeCalledWith(storeMutations.RESET_PARTS_STATE);
 
   });
 
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 383b37da5..6b0fa291d 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -10,7 +10,7 @@
     :aria-required="isRequired"
     :value="value"
     :v-model="checkValue"
-    @change="handleCheckChange()"
+    @change="handleCheckChanged()"
     />
     <label class="d-flex align-items-start form-check-label" :for="buttonID">
       <p v-if="buttonLabel" class="m-0">{{ buttonLabel }}</p>