diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index d9f07a5fe..f8a45aa4e 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,14 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <loadingModal ref="loadingModal" />
-        <div class="container-fluid page-container-grouped-styles estimate">
-            <div class="row justify-content-center">
-                <div class="col-md-6">
-                    <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4 mt-4">
+        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container page-container-grouped-styles estimate">
+            <div class="row">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
                     <div>
                         <div class="vinlookupquestion" v-html="this.VinLookupQuestionText"></div>
diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index 4c3644cac..92e7953c4 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -151,8 +151,5 @@ export default {
     & .alert-heading {
         font-size: 0.875rem;
     }
-    #afterpay-learnmore {
-        white-space: nowrap;
-    }
 }
 </style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 2d2e25690..e8b64f8e0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -2,7 +2,7 @@
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <loadingModal ref="loadingModal" />
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-        <div class="container quote">
+        <div class="container quote position-relative">
             <div class="row justify-content-center">
                 <div class="col-md-6">
                     <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
@@ -63,7 +63,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-12 col-xl-10">
+                <div class="col-md-8 col-xl-6">
                     <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
                     <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
                     <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />
@@ -896,13 +896,31 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// Unique to quote page for 2.0/Heritage parity
 .quote {
-    .nav-bar {
+    padding-bottom: 2rem;
+    :deep(.nav-bar) {
+        position: initial;
         button {
             width: 100%;
+            justify-content: center;
+        }
+        a.navigation-link {
+            position: absolute;
+            left: 1rem;
+            bottom: 1rem;
+            @include media-breakpoint-up(lg) {
+                    left: 6rem;
+                }
+            }
+        .col-auto {
+            width: -webkit-fill-available;
+        }
+        .col-auto {
+            width: -moz-available;
+        }
         }
     }
-}
 .quote-page.show-save-progress-popup .row.justify-content-center {
     display: none;
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 5b397ea76..9f5ecf3f6 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -2,15 +2,12 @@
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
         <div class="return-user small-question-text">
             <loadingModal ref="loadingModal" />
-            <div class="container-fluid page-container-grouped-styles">
-                <div class="row justify-content-center">
-                    <div class="col-md-6">
-                        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-                    </div>
-                </div>
-                <div class="row justify-content-center return-user-spacing">
-                    <div class="col-md-6 col-xl-4 mt-4">
+            <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container page-container-grouped-styles">
+            <div class="row justify-content-center">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7 return-user-spacing">
                         <funnelSubHeader
+                            class="justify-content-center d-flex"
                             ref="funnelSubHeader"
                             cmsWidgetName="FunnelSubHeaderWidget" />
                     </div>