diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index f778d642..315621e8 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -4,23 +4,16 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        ref="vehicleBanner"
-                        class="mt-2 mb-4"
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+            <div class="iss-heritage-container-width">
+                <div class="address-lookup-container iss-heritage-content-container-width">
                     <siteSubHeader
                         ref="siteSubHeader"
                         cmsWidgetName="SiteSubHeaderWidget"
-                        class="mb-5" />
+                        class="mt-4" />
                     <alert
                         v-if="displayVinNotFoundAlert"
                         ref="alertVinNotFound"
@@ -82,7 +75,6 @@
 import baseFormMixin from '@/mixins/base-form-mixin';
 import siteHeader from '@/iss-components/site-header/site-header.vue';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
-import vehicleBanner from '@/iss-components/vehicle-banner/vehicle-banner.vue';
 import siteSubHeader from '@/iss-components/site-sub-header/site-sub-header.vue';
 import customerQuestions from '@/layouts/address-lookup/customer-questions/customer-questions.vue';
 import alert from '@/ux-components/alert/alert.vue';
@@ -106,7 +98,6 @@ export default {
     components: {
         siteHeader,
         siteFooter,
-        vehicleBanner,
         siteSubHeader,
         customerQuestions,
         alert,
@@ -390,3 +381,14 @@ export default {
     }
 };
 </script>
+
+<style lang="scss" scoped>
+.iss-heritage-container-width {
+    .address-lookup-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+</style>
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 6f57e98a..0510ad5f 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -4,19 +4,15 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        class="mt-2 mb-4"
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-                    <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" />
+            <div class="iss-heritage-container-width">
+                <div class="address-vehicles-container iss-heritage-content-container-width">
+                    <siteSubHeader
+                        cmsWidgetName="SiteSubHeaderWidget"
+                        class="mt-4" />
                     <alert
                         id="multiple-vehicles-alert"
                         ref="alertFoundMultipleVehicles"
@@ -27,8 +23,8 @@
                         manualCopy=""
                         :isDismissible="false" />
                     <alert
-                        ref="AlertNoService"
                         v-if="displayNoServiceAlert"
+                        ref="AlertNoService"
                         class="mt-5"
                         cmsWidgetName="AlertVehicleSelection"
                         alertClass="alert-danger"
@@ -110,7 +106,6 @@ import baseFormMixin from '@/mixins/base-form-mixin';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
 import siteHeader from '@/iss-components/site-header/site-header.vue';
 import siteSubHeader from '@/iss-components/site-sub-header/site-sub-header.vue';
-import vehicleBanner from '@/iss-components/vehicle-banner/vehicle-banner.vue';
 import alert from '@/ux-components/alert/alert.vue';
 import addressVehiclesQuestion from '@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue';
 
@@ -125,7 +120,6 @@ export default {
         siteSubHeader,
         // eslint-disable-next-line vue/no-reserved-component-names
         Form,
-        vehicleBanner,
         alert,
         addressVehiclesQuestion
     },
@@ -313,8 +307,16 @@ export default {
     }
 };
 </script>
-
 <style lang="scss" scoped>
+.iss-heritage-container-width {
+    .address-vehicles-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .alert-provide-vin {
     font-size: 0.75rem;
     line-height: 1.4;
diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue
index 692837e1..a84f0dfe 100644
--- a/src/layouts/bailout-page/bailout-page.vue
+++ b/src/layouts/bailout-page/bailout-page.vue
@@ -4,16 +4,14 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        ref="siteHeader"
-                        cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    ref="siteHeader"
+                    cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="bailout-page-container iss-heritage-content-container-width">
                     <siteSubHeader
                         ref="siteSubHeader"
                         :cmsWidgetName="subHeaderCmsWidgetName"
@@ -225,4 +223,13 @@ export default {
 
 <style lang="scss">
 @import '@/styles/bailout-common.scss';
+
+.iss-heritage-container-width {
+    .bailout-page-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
 </style>
diff --git a/src/layouts/contact-confirmation/contact-confirmation.vue b/src/layouts/contact-confirmation/contact-confirmation.vue
index 9496fb30..29c52745 100644
--- a/src/layouts/contact-confirmation/contact-confirmation.vue
+++ b/src/layouts/contact-confirmation/contact-confirmation.vue
@@ -1,19 +1,19 @@
 <template>
-    <div class="container-fluid fade-on-route-transition">
-        <div class="row justify-content-center">
-            <div class="col-md-6 px-0 px-md-2">
+    <form>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
             </div>
-        </div>
-        <div class="row justify-content-center">
-            <div class="col-md-6 col-xl-4">
-                <siteSubHeader
-                    cmsWidgetName="SiteSubHeaderWidget"
-                    class="sub-header-content"
-                    justification="left" />
+            <div class="iss-heritage-container-width">
+                <div class="contact-confirmation-container iss-heritage-content-container-width">
+                    <siteSubHeader
+                        cmsWidgetName="SiteSubHeaderWidget"
+                        class="sub-header-content mt-4"
+                        justification="left" />
+                </div>
             </div>
         </div>
-    </div>
+    </form>
 </template>
 <script>
 // Components
@@ -64,9 +64,17 @@ export default {
 </script>
 
 <style lang="scss">
-    .sub-header-content {
-        h5 {
-            margin-bottom: 1rem;
-        }
+.iss-heritage-container-width {
+    .contact-confirmation-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
     }
+}
+.sub-header-content {
+    h5 {
+        margin-bottom: 1rem;
+    }
+}
 </style>
diff --git a/src/layouts/contact-details/contact-details.vue b/src/layouts/contact-details/contact-details.vue
index bd710d18..7e0b22f1 100644
--- a/src/layouts/contact-details/contact-details.vue
+++ b/src/layouts/contact-details/contact-details.vue
@@ -4,16 +4,14 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        ref="siteHeader"
-                        :cmsWidgetName="widget.siteHeader" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    ref="siteHeader"
+                    :cmsWidgetName="widget.siteHeader" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="contact-details-container iss-heritage-content-container-width">
                     <siteSubHeader
                         id="sub-header"
                         ref="siteSubHeader"
@@ -236,6 +234,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.iss-heritage-container-width {
+    .contact-details-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .dark-gray {
     color: $darker-gray;
 }
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 18bd068c..6d157400 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -4,20 +4,18 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        ref="siteHeader"
-                        :cmsWidgetName="widget.siteHeader" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    ref="siteHeader"
+                    :cmsWidgetName="widget.siteHeader" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="duplicate-check-container iss-heritage-content-container-width">
                     <siteSubHeader
                         id="sub-header"
                         ref="siteSubHeader"
-                        class="mt-5 duplicate-check-subheader"
+                        class="mt-4 duplicate-check-subheader"
                         :cmsWidgetName="widget.siteSubHeader" />
                     <buttonQuestion
                         ref="buttonQuestion"
@@ -56,7 +54,7 @@ import { fetchCmsContentForPage } from '@/helpers/cms-content-helper.js';
 import BaseFormMixin from '@/mixins/base-form-mixin.js';
 import { useMainStore } from '@/store/index.js';
 import globalRules from '@/constants/global-rules.js';
-import {formatDate, toTitleCase} from '@/helpers/text-helper.js';
+import { formatDate, toTitleCase } from '@/helpers/text-helper.js';
 
 const dupeCheckDateFormatter = new Intl.DateTimeFormat('en-US', { timeZone: 'UTC', month: '2-digit', day: '2-digit', year: 'numeric' });
 
@@ -205,6 +203,15 @@ export default {
 </script>
 
 <style lang="scss">
+.iss-heritage-container-width {
+    .duplicate-check-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .duplicate-check-subheader {
     .subheader-secondary {
         margin-top: map-get($spacers, 2);
diff --git a/src/layouts/policy-endorsements/policy-endorsements.vue b/src/layouts/policy-endorsements/policy-endorsements.vue
index 07718a68..031d33db 100644
--- a/src/layouts/policy-endorsements/policy-endorsements.vue
+++ b/src/layouts/policy-endorsements/policy-endorsements.vue
@@ -4,20 +4,18 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        ref="siteHeader"
-                        cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    ref="siteHeader"
+                    cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="policy-endorsements-container iss-heritage-content-container-width">
                     <siteSubHeader
                         ref="siteSubHeader"
                         cmsWidgetName="SiteSubHeaderWidget"
-                        class="mt-5" />
+                        class="mt-4" />
                     <buttonQuestion
                         v-if="educatorEndorsement"
                         ref="schoolPropertyQuestion"
@@ -188,6 +186,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.iss-heritage-container-width {
+    .policy-endorsements-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 :deep(.subheader-primary) {
     margin-bottom: map-get($spacers, 2);
 }
diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index 0f840b9e..281ab42a 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -4,29 +4,23 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition policy-vehicles">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        class="mb-2 header"
-                        cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition policy-vehicles">
+            <div class="justify-content-center">
+                <siteHeader
+                    class="header"
+                    cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="policy-vehicles-container iss-heritage-content-container-width">
                     <div class="select-car-form rounded text-center">
-                        <vehicleBanner
-                            cmsWidgetName="VehicleBannerWidget"
-                            :displayGenericVehicleImage="displayGeneric"
-                            class="mt-2" />
                         <policyVehiclesQuestion
                             v-model="selectedVehicleVin"
                             cmsWidgetName="PolicyVehiclesQuestion"
                             :vehicles="VehiclesForQuestions"
                             :validationRules="rules.optionRequired" />
                         <alert
-                            ref="AlertNoService"
                             v-if="displayNoServiceAlert"
+                            ref="AlertNoService"
                             class="mt-3"
                             cmsWidgetName="AlertVehicleSelection"
                             alertClass="alert-danger"
@@ -47,7 +41,6 @@
 // Components
 import siteHeader from '@/iss-components/site-header/site-header.vue';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
-import vehicleBanner from '@/iss-components/vehicle-banner/vehicle-banner.vue';
 import policyVehiclesQuestion from '@/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue';
 // Supporting files
 import { fetchCmsContentForPage } from '@/helpers/cms-content-helper.js';
@@ -72,7 +65,6 @@ export default {
     components: {
         siteHeader,
         siteFooter,
-        vehicleBanner,
         policyVehiclesQuestion,
         // eslint-disable-next-line vue/no-reserved-component-names
         Form,
@@ -94,7 +86,6 @@ export default {
         return {
             policyVehicles,
             selectedVehicleVin: '',
-            displayGeneric: true,
             policyVinFound: true,
             rules: {
                 optionRequired: globalRules.OPTION_REQUIRED
@@ -150,7 +141,6 @@ export default {
             if (value === vehicleSelectionOptions.VEHICLE_NOT_LISTED) {
                 // clear previously selected vehicle and image
                 this.mainStore.resetVehicleState();
-                this.displayGeneric = true;
             } else {
                 // get vehicle details from selected VIN
                 const vehicle = await this.lookupVehicleByVin(value);
@@ -158,7 +148,6 @@ export default {
                 // handle error in case vehicle info doesn't come back for selected VIN
                 if (vehicle?.error === true) {
                     this.mainStore.resetVehicleState();
-                    this.displayGeneric = true;
                     return;
                 }
                 if (!vehicle?.data.canSafeliteService) {
@@ -167,7 +156,6 @@ export default {
                 }
                 if (vehicle) {
                     // save selected vehicle to the store
-                    this.displayGeneric = false;
                     useMainStore().updateVehicle({
                         ...vehicle.data,
                         policyVehicleId: this.selectedPolicyVehicle?.id,
@@ -232,8 +220,7 @@ export default {
                     repairWaived: this.repairWaivedForSelectedVehicle,
                     endorsements: this.endorsementsForSelectedVehicle
                 });
-            }
-            else {
+            } else {
                 useMainStore().updateCoverageType(coverageType.NONE);
             }
             return this.navigateForward();
@@ -292,6 +279,15 @@ export default {
 };
 </script>
 <style lang="scss">
+.iss-heritage-container-width {
+    .policy-vehicles-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .policy-vehicles {
     .button-question {
         .question-text {
diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue
index f00fd2a9..ca3b7593 100644
--- a/src/layouts/provider-preference/provider-preference.vue
+++ b/src/layouts/provider-preference/provider-preference.vue
@@ -1,26 +1,20 @@
 <template>
     <Form
-ref="theForm"
-@submit="onSubmit"
-@invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition provider-preference">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        class="mb-2 header"
-                        cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        ref="theForm"
+        @submit="onSubmit"
+        @invalidSubmit="onInvalidSubmit">
+        <div class="fade-on-route-transition provider-preference">
+            <div class="justify-content-center">
+                <siteHeader
+                    class="mt-4 header"
+                    cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="provider-preference-container iss-heritage-content-container-width">
                     <siteSubHeader
                         id="sub-header"
                         cmsWidgetName="SiteSubHeader"
                         class="mb-0 mt-4 text-center" />
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
                     <buttonQuestion
                         ref="buttonQuestion"
                         v-model="selectedProvider"
@@ -267,6 +261,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.iss-heritage-container-width {
+    .provider-preference-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .provider-preference {
     #sub-header span {
         color: $black;
diff --git a/src/layouts/schedule-page/schedule-page.vue b/src/layouts/schedule-page/schedule-page.vue
index d824cb66..f3531c61 100644
--- a/src/layouts/schedule-page/schedule-page.vue
+++ b/src/layouts/schedule-page/schedule-page.vue
@@ -4,16 +4,14 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-6">
-                    <siteHeader
-                        class="mb-2 header"
-                        cmsWidgetName="SiteHeaderWidget" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    class="header"
+                    cmsWidgetName="SiteHeaderWidget" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+            <div class="iss-heritage-container-width">
+                <div class="schedule-page-container iss-heritage-content-container-width">
                     <siteSubHeader
                         cmsWidgetName="ScheduleSubHeaderWidget"
                         subTextClasses="text-center small sub-text"
@@ -492,8 +490,13 @@ export default {
 <style lang="scss" scoped>
 $page-side-padding: 1.5rem;
 
-.page-container-grouped-styles {
-    overflow: auto;
+.iss-heritage-container-width {
+    .schedule-page-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
 }
 
 :deep(.text-link-small) {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 0d25700b..78d0aa4b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,13 +4,15 @@
         v-slot="{ meta }"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-6">
-                    <siteHeader cmsWidgetName="SiteHeaderWidget" />
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader cmsWidgetName="SiteHeaderWidget" />
+            </div>
+            <div class="iss-heritage-container-width">
+                <div class="service-location-container iss-heritage-content-container-width">
                     <siteSubHeader
                         cmsWidgetName="SiteSubHeaderWidget"
-                        class="mt-5" />
+                        class="mt-4" />
                     <serviceZipModalQuestion
                         ref="serviceZipCodeQuestion"
                         v-model="serviceZipCodeQuestion"
@@ -51,24 +53,18 @@
                         class="my-5"
                         cmsWidgetName="AlertNoShopsWidget"
                         alertClass="alert-warning" />
-                </div>
-            </div>
-            <div class="row justify-content-center appointment-type">
-                <div class="col-md-6">
-                    <appointmentTypeQuestion
-                        v-show="isAppointmentTypeDisplayed"
-                        ref="appointmentTypeQuestion"
-                        v-model="selectedAppointmentType"
-                        :isServiceableMobile="isServiceableMobile"
-                        :isServiceableInshop="isServiceableInshop"
-                        :isDisplayed="isAppointmentTypeDisplayed"
-                        groupName="appointmentTypeQuestion"
-                        cmsWidgetName="AppointmentTypeQuestionWidget"
-                        validationRules="option-required" />
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+                    <div class="appointment-type">
+                        <appointmentTypeQuestion
+                            v-show="isAppointmentTypeDisplayed"
+                            ref="appointmentTypeQuestion"
+                            v-model="selectedAppointmentType"
+                            :isServiceableMobile="isServiceableMobile"
+                            :isServiceableInshop="isServiceableInshop"
+                            :isDisplayed="isAppointmentTypeDisplayed"
+                            groupName="appointmentTypeQuestion"
+                            cmsWidgetName="AppointmentTypeQuestionWidget"
+                            validationRules="option-required" />
+                    </div>
                     <mobileLocationModalQuestions
                         v-if="isMobileLocationDisplayed"
                         ref="mobileLocationQuestions"
@@ -537,8 +533,13 @@ export default {
 <style lang="scss">
 $page-side-padding: 1.5rem;
 
-.fade-on-route-transition {
-    overflow: auto;
+.iss-heritage-container-width {
+    .service-location-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
 }
 
 .question-text {
diff --git a/src/layouts/tpa-submit/tpa-submit.spec.js b/src/layouts/tpa-submit/tpa-submit.spec.js
index 30934db3..9ce2cf6d 100644
--- a/src/layouts/tpa-submit/tpa-submit.spec.js
+++ b/src/layouts/tpa-submit/tpa-submit.spec.js
@@ -120,20 +120,6 @@ describe('tpa-submit', () => {
             expect(siteHeader.exists()).toBeTruthy();
             expect(siteHeader.props().cmsWidgetName).toBe(expectedWidgetName);
         });
-        test('vehicle banner', () => {
-            // Arrange
-            const wrapper = shallowMount(tpaSubmit, getMountOptions());
-            const expectedWidgetName = 'VehicleBannerWidget';
-
-            // Act
-            const vehicleBanner = wrapper.findComponent({ ref: 'vehicleBanner' });
-
-            // Assert
-            expect(vehicleBanner.exists()).toBeTruthy();
-            expect(vehicleBanner.props().cmsWidgetName).toBe(expectedWidgetName);
-            expect(vehicleBanner.props().displayGenericVehicleImage).toBe(false);
-            expect(vehicleBanner.classes()).toContain('mt-5');
-        });
         test('sub header', () => {
             // Arrange
             const wrapper = shallowMount(tpaSubmit, getMountOptions());
diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue
index eded8794..306ab7a6 100644
--- a/src/layouts/tpa-submit/tpa-submit.vue
+++ b/src/layouts/tpa-submit/tpa-submit.vue
@@ -5,21 +5,14 @@
         class="tpa-submit"
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
-        <div class="container-fluid fade-on-route-transition">
-            <div class="row justify-content-center">
-                <div class="col-md-6 px-0 px-md-2">
-                    <siteHeader
-                        ref="siteHeader"
-                        :cmsWidgetName="widget.siteHeader" />
-                </div>
+        <div class="fade-on-route-transition">
+            <div class="justify-content-center">
+                <siteHeader
+                    ref="siteHeader"
+                    :cmsWidgetName="widget.siteHeader" />
             </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        ref="vehicleBanner"
-                        :cmsWidgetName="widget.vehicleBanner"
-                        :displayGenericVehicleImage="false"
-                        class="mt-5" />
+            <div class="iss-heritage-container-width">
+                <div class="tpa-submit-container iss-heritage-content-container-width">
                     <!-- TODO fix styling -->
                     <textBlock
                         ref="subHeaderTitle"
@@ -56,8 +49,8 @@
                                 v-for="(section, index) in sections"
                                 :key="section.title">
                                 <hr
-v-if="index !== 0"
-class="my-3" />
+                                    v-if="index !== 0"
+                                    class="my-3" />
                                 <reviewBlock
                                     :id="'review-block-' + index"
                                     :customHeaderText="section.title"
@@ -107,7 +100,6 @@ class="my-3" />
 import siteHeader from '@/iss-components/site-header/site-header.vue';
 import buttonMain from '@/ux-components/button-main/button-main.vue';
 import textBlock from '@/digital-components/text-block/text-block.vue';
-import vehicleBanner from '@/iss-components/vehicle-banner/vehicle-banner.vue';
 import reviewBlock from '@/layouts/tpa-submit/review-block/review-block.vue';
 import deductibleBox from '@/layouts/tpa-submit/deductible-box/deductible-box.vue';
 import contactDetailsDrawer from '@/layouts/tpa-submit/contact-details-drawer/contact-details-drawer.vue';
@@ -144,7 +136,6 @@ export default {
     name: 'tpa-submit',
     components: {
         siteHeader,
-        vehicleBanner,
         textBlock,
         buttonMain,
         reviewBlock,
@@ -326,12 +317,10 @@ export default {
                     this.getDamageLines,
                     () => this.navigate(this.navigationScenarios.EDIT_DAMAGE)
                 ),
-                // eslint-disable-next-line max-len
                 this.getSection(
                     this.widget.subheader.shop,
                     this.getPreferredShopLines,
-                    () =>
-                        this.navigate(this.navigationScenarios.EDIT_PREFERRED_SHOP)
+                    () => this.navigate(this.navigationScenarios.EDIT_PREFERRED_SHOP)
                 ),
                 // eslint-disable-next-line max-len
                 this.getSection(
@@ -389,6 +378,15 @@ export default {
 };
 </script>
 <style lang="scss">
+.iss-heritage-container-width {
+    .tpa-submit-container {
+        position: relative;
+        min-height: 1px;
+        padding-left: .9375rem;
+        padding-right: .9375rem;
+    }
+}
+
 .tpa-submit {
     #tpaSubmitOrderDetailsBody {
         p {
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 2f964407..3405bc83 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -41,7 +41,6 @@ const mountOptions = {
         },
         stubs: {
             siteHeader: true,
-            vehicleBanner: true,
             siteSubHeader: true,
             siteDoorOptions: true,
             damageLocationQuestion: true,
diff --git a/src/layouts/vehicle-lookup/vehicle-lookup.spec.js b/src/layouts/vehicle-lookup/vehicle-lookup.spec.js
index 2d60532e..0aa12f8a 100644
--- a/src/layouts/vehicle-lookup/vehicle-lookup.spec.js
+++ b/src/layouts/vehicle-lookup/vehicle-lookup.spec.js
@@ -118,8 +118,7 @@ function setupMocks() {
             },
             stubs: {
                 SiteHeader: true,
-                SiteSubHeader: true,
-                VehicleBanner: true
+                SiteSubHeader: true
             }
         }
     });
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index fab393bd..8cd277ff 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -202,7 +202,6 @@ const mountOptions = {
         stubs: {
             siteHeader: true,
             siteSubHeader: true,
-            vehicleBanner: true,
             vinLocationInformation: true,
             vinLookupAlerts: true,
             vinQuestion: true
diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js
index 865883ac..ca071640 100644
--- a/src/layouts/welcome-page/welcome-page.spec.js
+++ b/src/layouts/welcome-page/welcome-page.spec.js
@@ -58,10 +58,6 @@ function setupMocks({
     const apiResponses = {
         cmsContent: {
             SiteSubHeaderWidget: pageHeaderWidgetHeaderText,
-            VehicleBannerWidget: {
-                GenericVehicleImage:
-                    `${applicationConfig.ISS_DEV_CMS_DOMAIN}/images/default-source/default-album/blurred-image.jpg`
-            },
             SiteHeaderWidget: {
                 LogoImage:
                     `${applicationConfig.ISS_DEV_CMS_DOMAIN}/images/default-source/default-album/logos/insuranceLogo.jpg`
diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss
index bf59ece8..ae6a41b6 100644
--- a/src/styles/client-customizations.scss
+++ b/src/styles/client-customizations.scss
@@ -15,10 +15,6 @@
     //Variables
     --iss-loader-color: #{$button-text-color};
 
-    .site-header {
-        background-color: $header-background;
-    }
-
     svg,
     .modal-text {
         fill: $accent-color;