diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 13c81f815..9636d1d25 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -192,9 +192,9 @@ export default {
                     classes = "d-flex flex-row p-0";
                     break;
                 case "listCard":
-                    classes = "row g-2 justify-content-center mb-1";
+                    classes = "row g-2 g-md-5 justify-content-center mb-1";
                     if (this.isWide) {
-                        classes += " flex-column";
+                        classes += "flex-column";
                     }
                     break;
                 case "radio":
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 9670ec48c..e5583d986 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -10,61 +10,61 @@
                 <div class="d-none d-md-block col-md-2 col-lg-3">&nbsp;</div>
                 <div class="col-md-8 col-lg-6">
                     <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+                    cmsWidgetName="VehicleBannerWidget"
+                    :displayGenericVehicleImage="false" />
 
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
 
                     <alert
-                        ref="vehicleChangeAlert"
-                        v-if="shouldDisplayVehicleChangeAlert"
-                        class="mt-5 mb-0"
-                        cmsWidgetName="VehicleChangeAlert"
-                        alertClass="alert-warning"
-                        :isDismissible="false" />
+                    ref="vehicleChangeAlert"
+                    v-if="shouldDisplayVehicleChangeAlert"
+                    class="mt-5 mb-0"
+                    cmsWidgetName="VehicleChangeAlert"
+                    alertClass="alert-warning"
+                    :isDismissible="false" />
 
                     <damageLocationQuestion
-                        ref="damageLocation"
-                        cmsWidgetName="DamageLocationQuestion"
-                        v-model="selectedDamageLocations"
-                        groupName="DamageLocationQuestion" />
+                    ref="damageLocation"
+                    cmsWidgetName="DamageLocationQuestion"
+                    v-model="selectedDamageLocations"
+                    groupName="DamageLocationQuestion" />
 
                     <windshieldOptions
-                        ref="windshieldOptions"
-                        v-model="selectedWindshieldOptions"
-                        :hasRepairReplaceConflict="hasRepairReplaceConflict"
-                        :hasSplitSingleConflict="hasSplitSingleConflict"
-                        :selectedDamageLocations="selectedDamageLocations" />
+                    ref="windshieldOptions"
+                    v-model="selectedWindshieldOptions"
+                    :hasRepairReplaceConflict="hasRepairReplaceConflict"
+                    :hasSplitSingleConflict="hasSplitSingleConflict"
+                    :selectedDamageLocations="selectedDamageLocations" />
 
                     <alert
-                        v-if="hasRepairReplaceConflict"
-                        class="my-5"
-                        cmsWidgetName="HasReplacementConflict"
-                        alertClass="alert-danger"
-                        :isDismissible="false" />
+                    v-if="hasRepairReplaceConflict"
+                    class="my-5"
+                    cmsWidgetName="HasReplacementConflict"
+                    alertClass="alert-danger"
+                    :isDismissible="false" />
 
                     <sideDoorOptions
-                        ref="sideDoorOptions"
-                        cmsWidgetName="SideDoorSideQuestion"
-                        groupName="SideDoorSideQuestion"
-                        v-model="sideDoorOptionsData"
-                        v-show="!hasRepairReplaceConflict"
-                        :selectedDamageLocations="selectedDamageLocations" />
+                    ref="sideDoorOptions"
+                    cmsWidgetName="SideDoorSideQuestion"
+                    groupName="SideDoorSideQuestion"
+                    v-model="sideDoorOptionsData"
+                    v-show="!hasRepairReplaceConflict"
+                    :selectedDamageLocations="selectedDamageLocations" />
 
                     <replaceOptionsQuestion
-                        ref="backGlassOptions"
-                        cmsWidgetName="RearReplaceOptionsQuestion"
-                        :isAvailable="isRearWindowDamageLocation && !hasRepairReplaceConflict"
-                        v-model="selectedRearReplaceOptions"
-                        groupName="BackGlassReplaceOptionsQuestion"
-                        validationRules="replace-options-required" />
+                    ref="backGlassOptions"
+                    cmsWidgetName="RearReplaceOptionsQuestion"
+                    :isAvailable="isRearWindowDamageLocation && !hasRepairReplaceConflict"
+                    v-model="selectedRearReplaceOptions"
+                    groupName="BackGlassReplaceOptionsQuestion"
+                    validationRules="replace-options-required" />
 
                     <navbar
-                        cmsWidgetName="FunnelFooterWidget"
-                        :isForwardActionDisabled="!meta.valid"
-                        :isBackButtonHidden="shouldHideBackButton"
-                        @back-clicked="backButtonAction"
-                        @ForwardClicked="forwardButtonAction" />
+                    cmsWidgetName="FunnelFooterWidget"
+                    :isForwardActionDisabled="!meta.valid"
+                    :isBackButtonHidden="shouldHideBackButton"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction" />
                 </div>
                 <div class="d-none d-md-block col-md-2 col-lg-3">&nbsp;</div>
             </div>
@@ -235,7 +235,7 @@ export default {
                     })
                 ) {
                     windShieldOptions.selectedWindshieldDamageType =
-                        damageLocationsSelected.REPLACE;
+                    damageLocationsSelected.REPLACE;
                     windShieldOptions.selectedWindshieldReplaceOptions.push(
                         damageLocationsSelected.SINGLE
                     );
@@ -250,7 +250,7 @@ export default {
                     })
                 ) {
                     windShieldOptions.selectedWindshieldDamageType =
-                        damageLocationsSelected.REPLACE;
+                    damageLocationsSelected.REPLACE;
                     windShieldOptions.selectedWindshieldReplaceOptions.push(
                         damageLocationsSelected.DRIVER
                     );
@@ -265,7 +265,7 @@ export default {
                     })
                 ) {
                     windShieldOptions.selectedWindshieldDamageType =
-                        damageLocationsSelected.REPLACE;
+                    damageLocationsSelected.REPLACE;
                     windShieldOptions.selectedWindshieldReplaceOptions.push(
                         damageLocationsSelected.PASSENGER
                     );
@@ -335,7 +335,7 @@ export default {
                     isWindshieldRepair: this.isWindshieldRepair,
                     selectedGlassToReplace: this.selectedGlassToReplace(),
                     selectedWindshieldChipCount:
-                        this.selectedWindshieldOptions.selectedWindshieldChipCount,
+                    this.selectedWindshieldOptions.selectedWindshieldChipCount,
                 },
                 false
             );
@@ -358,9 +358,9 @@ export default {
             const payment = this.$store.getters.payment;
 
             const vehicleChangedDuringPolicyLookupInHeritage =
-                payment.isInsurance &&
-                payment.insuranceCoverage.coverageStatus &&
-                payment.insuranceCoverage.coverageStatus !== "";
+            payment.isInsurance &&
+            payment.insuranceCoverage.coverageStatus &&
+            payment.insuranceCoverage.coverageStatus !== "";
             if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (store.getters.damage.isRepair) {
                     this.$router.navigateWithSaving(
@@ -370,7 +370,7 @@ export default {
                 } else {
                     this.$router.navigateWithSaving(
                         this.navigationScenarios
-                            .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                        .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
                         this.$route
                     );
                 }
@@ -452,7 +452,7 @@ export default {
             return (
                 this.isWindshieldDamageLocation &&
                 this.selectedWindshieldOptions.selectedWindshieldDamageType ===
-                    damageLocationsSelected.REPAIR
+                damageLocationsSelected.REPAIR
             );
         },
         isDriverSideReplace() {
@@ -480,10 +480,10 @@ export default {
             if (
                 !this.selectedDamageLocations?.includes("Windshield") ||
                 this.selectedWindshieldOptions.selectedWindshieldDamageType ===
-                    damageLocationsSelected.REPAIR ||
+                damageLocationsSelected.REPAIR ||
                 !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions
             )
-                return false;
+            return false;
 
             return (
                 this.selectedWindshieldOptions.selectedWindshieldReplaceOptions?.some(
@@ -502,14 +502,14 @@ export default {
                         );
                     }
                 ) ||
-                    this.selectedWindshieldOptions.selectedWindshieldReplaceOptions?.some(
-                        (selectedPassengerWindshield) => {
-                            return (
-                                selectedPassengerWindshield.toUpperCase() ===
-                                damageLocationsSelected.PASSENGER.toUpperCase()
-                            );
-                        }
-                    ))
+                this.selectedWindshieldOptions.selectedWindshieldReplaceOptions?.some(
+                    (selectedPassengerWindshield) => {
+                        return (
+                            selectedPassengerWindshield.toUpperCase() ===
+                            damageLocationsSelected.PASSENGER.toUpperCase()
+                        );
+                    }
+                ))
             );
         },
         shouldDisplayVehicleChangeAlert() {