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/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/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 {