diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 1d8540075..1fd8c3256 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -203,6 +203,7 @@ export default {
         border: 1px solid $gray-500;
         border-radius: 0.5rem;
         min-height: 3rem;
+        max-height: 48px;
         padding: 12px 16px;
         &::placeholder {
             color: $gray-500;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5c903ea7e..fe29401b6 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -92,7 +92,7 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        const glassParts = [...store.getters.order.lineItems.glassParts];
+        const glassParts = store.getters.order.lineItems.glassParts ?? [];
         const availableLineItems = [
             resultMap.rainDefense,
             ...resultMap.supportingItems,
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index 0a6098c97..0b96a8e37 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -35,7 +35,7 @@
                 </ul>
                 <!-- End of body text parsing -->
                 <div
-                    class="package-footer"
+                    class="package-footer fw-bold caption ms-n6"
                     v-if="this.buttonFooterCopy"
                     v-html="this.buttonFooterCopy"></div>
             </div>
@@ -179,10 +179,7 @@ export default {
         }
 
         .package-footer {
-            font-size: 12px;
-            font-weight: 500;
-            color: #d4281c;
-            margin-left: -32px;
+            color: $red;
         }
 
         .package-specs {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 0c75aa788..db1905310 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -471,10 +471,10 @@ export default {
         navigateBack(vm) {
             const self = vm ?? this;
             const partsOrQuestions = (
-                self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ??
-                self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ??
+                self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ??
                 self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ??
-                self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
+                self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ??
+                self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)
             )?.partsOrQuestions;
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
diff --git a/src/store/index.js b/src/store/index.js
index 253b404de..1182f5f3f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -900,14 +900,14 @@ export const actions = {
         const carId = context.getters.vehicle.carId;
         const isRepair = context.getters.damage.isRepair;
         const numberOfChips = context.getters.damage.numberOfChips;
-        const accountNumber = "82791"; //context.getters.order.accountNumber.toString();
+        const parentAccountNumber = context.getters.order.accountNumber.toString();
         return globalMethods.callHttpClient({
             method: endpoints.GetSupportingItems.method,
             endpoint: endpoints.GetSupportingItems.url,
             payload: {
                 carId: carId,
                 serviceType: isRepair ? "Repair" : "Replace",
-                //accountNumber: accountNumber,
+                parentAccountNumber: parentAccountNumber,
                 parts: glassPartsArray,
                 numberOfRepairChips: isRepair ? numberOfChips : 0,
             },
diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index f7b8ce23e..cc5c08248 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -185,11 +185,11 @@ html {
             pointer-events: all;
             font-weight: $font-weight-normal;
         }
-        &.btn.btn-primary:hover {
+        &.btn.btn-primary:hover,
+        &.btn.btn-primary:focus {
             background: $gray-200;
             box-shadow: none;
         }
-        &.btn.btn-primary:focus,
         &.btn.btn-primary:focus-visible {
             box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700;
         }
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index d9b462af4..1e95a4052 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -163,6 +163,9 @@ $spacers: (
     /* 48px */
 );
 
+//Enable negative spacing (does NOT work on padding)
+$enable-negative-margins: true;
+
 //Grid breakpoints
 $grid-breakpoints: (
     xs: 0,