diff --git a/src/iss-components/site-footer/site-footer.vue b/src/iss-components/site-footer/site-footer.vue
index 7ae66874..06e614d6 100644
--- a/src/iss-components/site-footer/site-footer.vue
+++ b/src/iss-components/site-footer/site-footer.vue
@@ -160,13 +160,13 @@ export default {
 {
     text-align: center;
     position: sticky;
-    bottom: 72px;
+    bottom: 65px;
 }
 
 @media only screen and (max-width: 340px) {
     .footerImage
     {
-        bottom: 85px;
+        bottom: 78px;
     }
 }
 
diff --git a/src/iss-components/site-header/site-header.spec.js b/src/iss-components/site-header/site-header.spec.js
index b94b4028..251df95a 100644
--- a/src/iss-components/site-header/site-header.spec.js
+++ b/src/iss-components/site-header/site-header.spec.js
@@ -1,12 +1,12 @@
 import siteHeader from "@/iss-components/site-header/site-header";
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { useMainStore } from "@/store/";
 
 describe("site-header", () => {
 
     test("renders the logo image", () => {
-      const wrapper = setupMocks({mountOptionsMockData: {}});
-        
+        const wrapper = setupMocks({mountOptionsMockData: {}});
     
         expect(wrapper.find("img")).toBeTruthy();
         wrapper.unmount();
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 8d2fd556..e84f7431 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -1,12 +1,12 @@
 <template>
 <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm"  v-slot="{ meta }" >
 
-    <div class="page-container-grouped-styles overflow-auto welcome">     
+    <div class="page-container-grouped-styles welcome">     
         <siteHeader cmsWidgetName="SiteHeaderWidget"/>
-        <div class="fade-on-route-transition h-100 px-5">
+        <div class="fade-on-route-transition h-100 overflow-auto ">
             
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"/>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <textboxQuestion
                         inputId="policyNumberField"
@@ -18,7 +18,7 @@
                         validationRules="policy-number-required" />
                 </div>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <textboxQuestion
                         type="date"
@@ -34,12 +34,12 @@
                 />
                 </div>
             </div>
-            <div class="row">
+            <div class="row px-5">
                 <div class="col">
                     <textBlock cmsWidgetName="DamageDateEstimateWidget" typeStyle="caption" class="mt-2" />
                 </div>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <dropdownQuestion
                         cmsWidgetName="DamageCauseQuestion"
@@ -53,7 +53,7 @@
                     />
                 </div>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <textboxQuestion
                         inputId="damageCityField"
@@ -65,7 +65,7 @@
                         validationRules="loss-city-required" />
                 </div>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <dropdownQuestion
                         cmsWidgetName="DamageStateQuestion"
@@ -93,7 +93,7 @@
                         ref="glassOnlyDamage"
                         disableAutoFill/>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <textboxQuestion
                         inputId="phoneNumberField"
@@ -106,7 +106,7 @@
                         disableAutoFill />
                 </div>
             </div>
-            <div class="row mt-4">
+            <div class="row mt-4 px-5">
                 <div class="col">
                     <textboxQuestion
                         inputId="emailField"