diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 28381dcb..1684ed8e 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"  >
+<Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm"  v-slot="{ meta }" >
     <div class="page-container-grouped-styles overflow-auto welcome">
         <div class="fade-on-route-transition">
             <siteHeader cmsWidgetName="SiteHeaderWidget"/>
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"/>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
-                        id="policyNumberField"
+                        inputId="policyNumberField"
                         cmsWidgetName="PolicyNumberQuestion"
                         v-model="policyNumber"
                         isRequired
@@ -14,11 +14,11 @@
             </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
-                        id="policyZipField"
-                        cmsWidgetName="PolicyZipQuestion"
-                        v-model="policyZip"
-                        isRequired
-                        validationRules="policy-zip-required" />
+                    inputId="policyZipField"
+                    cmsWidgetName="PolicyZipQuestion"
+                    v-model="policyZip"
+                    isRequired
+                    validationRules="policy-zip-required" />
             </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
@@ -33,6 +33,9 @@
                     validationRules="loss-date-required"
                 />
             </div>
+            <div class="row mb-4">
+                <textBlock cmsWidgetName="DamageDateEstimateWidget" typeStyle="caption" />
+            </div>
             <div class="row mt-2 mb-4">
                 <dropdownQuestion
                     cmsWidgetName="DamageCauseQuestion"
@@ -46,11 +49,11 @@
             </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
-                        id="damageCityField"
-                        cmsWidgetName="DamageCityQuestion"
-                        v-model="damageCity"
-                        isRequired
-                        validationRules="loss-city-required" />
+                    inputId="damageCityField"
+                    cmsWidgetName="DamageCityQuestion"
+                    v-model="damageCity"
+                    isRequired
+                    validationRules="loss-city-required" />
             </div>
             <div class="row mt-2 mb-4">
                 <dropdownQuestion
@@ -67,6 +70,7 @@
                 <buttonQuestion
                     cmsWidgetName="GlassOnlyQuestion"
                     v-model="isDamageGlassOnly"
+                    inputId = "isDamageGlassOnly"
                     :answers="DamageGlassOnlyOptions"
                     :questionText="DamageGlassOnlyQuestion"
                     buttonTypeString="listButtonHorizontal"
@@ -74,25 +78,26 @@
             </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
-                        id="phoneNumberField"
-                        cmsWidgetName="PhoneNumberQuestion"
-                        v-model="phoneNumber"
-                        validationRules="phone-number-required"
-                        isRequired />
+                    inputId="phoneNumberField"
+                    cmsWidgetName="PhoneNumberQuestion"
+                    v-model="phoneNumber"
+                    validationRules="phone-number-required"
+                    isRequired />
             </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
-                        id="emailField"
-                        cmsWidgetName="EmailAddressQuestion"
-                        v-model="email"
-                        validationRules="email-address-required"
-                        isRequired />
+                    inputId="emailField"
+                    cmsWidgetName="EmailAddressQuestion"
+                    v-model="email"
+                    validationRules="email-address-required"
+                    isRequired />
             </div>
             <div class="row mt-2 mb-4">
                 <site-footer
-                        cmsWidgetName="SiteFooterWidget"
-                        @back-clicked="backButtonAction"
-                        @ForwardClicked="forwardButtonAction" />
+                    cmsWidgetName="SiteFooterWidget"
+                    :isForwardActionDisabled="!meta.valid"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction" />
             </div>
         </div>
     </div>
@@ -107,6 +112,7 @@
     import textboxQuestion from "@/common-components/textbox-question/textbox-question";
     import buttonQuestion from "@/common-components/button-question/button-question";
     import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
+    import textBlock from "@/common-components/text-block/text-block";
     
     // Supporting files
     import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -255,6 +261,8 @@
             textboxQuestion,
             dropdownQuestion,
             siteFooter,
+            textBlock,
+            Form,
         },
     }
 </script>