diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index bb8e1391..82f402e0 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -271,4 +271,21 @@ export default {
       }
   }
 }
+
+.welcome {
+  .question-text {
+      span {
+          text-align: left;
+          margin: 0 0 0.25rem 0;
+      }
+  }
+  .question-text {
+      margin: 0;
+  }
+  fieldset {
+      .ui-radio {
+          margin: 0;
+      }
+  }
+}
 </style>
diff --git a/src/common-components/site-footer/site-footer.vue b/src/common-components/site-footer/site-footer.vue
index f33cd605..e29c3e54 100644
--- a/src/common-components/site-footer/site-footer.vue
+++ b/src/common-components/site-footer/site-footer.vue
@@ -1,5 +1,7 @@
 <template>
     <div class="row" :style="`padding-bottom: ${paddingHeight}px`">
+    </div>
+    <div class="row">
         <img id="siteFooterImage" :src="footerImageURL" />
     </div>
     <footer class="footer container-fluid fixed-bottom g-5 bg-light py-4" id="infoBox">
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 46686f60..87fcfdc5 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -1,6 +1,6 @@
 <template>
 <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" >
-    <div class="page-container-grouped-styles overflow-auto">
+    <div class="page-container-grouped-styles overflow-auto welcome">
         <div class="fade-on-route-transition">
             <siteHeader cmsWidgetName="SiteHeaderWidget"/>
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"/>
@@ -9,6 +9,7 @@
                         id="policyNumberField"
                         cmsWidgetName="PolicyNumberQuestion"
                         v-model="policyNumber"
+                        isRequired
                         validationRules="policy-number-required" />
             </div>
             <div class="row mt-2 mb-4">
@@ -16,6 +17,7 @@
                         id="policyZipField"
                         cmsWidgetName="PolicyZipQuestion"
                         v-model="policyZip"
+                        isRequired
                         validationRules="policy-zip-required" />
             </div>
             <div class="row mt-2 mb-4">
@@ -36,6 +38,7 @@
                     cmsWidgetName="DamageCauseQuestion"
                     v-model="damageCause"
                     ref="damageCause"
+                    isRequired
                     inputId="damageCauseQuestionField"
                     :options="DamageCauseOptions"
                     validationRules="loss-cause-required"
@@ -47,6 +50,7 @@
                         id="damageCityField"
                         cmsWidgetName="DamageCityQuestion"
                         v-model="damageCity"
+                        isRequired
                         validationRules="loss-city-required" />
             </div>
             <div class="row mt-2 mb-4">
@@ -57,22 +61,33 @@
                     inputId="8fdf9dc2e13e430eb57529499dceb3eb"
                     :options="stateOptions"
                     validationRules="loss-state-required" 
-                    placeholderText="Select an option"
+                    isRequired
                     />
             </div>
+            <div class="row mt-2 mb-4">
+                <buttonQuestion
+                    cmsWidgetName="GlassOnlyQuestion"
+                    v-model="isDamageGlassOnly"
+                    :answers="DamageGlassOnlyOptions"
+                    :questionText="DamageGlassOnlyQuestion"
+                    buttonTypeString="listButtonHorizontal"
+                    isRequired />
+            </div>
             <div class="row mt-2 mb-4">
                 <textboxQuestion
                         id="phoneNumberField"
                         cmsWidgetName="PhoneNumberQuestion"
                         v-model="phoneNumber"
-                        validationRules="phone-number-required" />
+                        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" />
+                        validationRules="email-address-required"
+                        isRequired />
             </div>
             <div class="row mt-2 mb-4">
                 <site-footer
@@ -94,7 +109,7 @@
     import { required } from "@/helpers/validation-rules";
     import { errorMessages } from "@/constants/error-messages";
 	import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-    import buttonQuestionModal from "@/common-components/button-question-modal/button-question-modal";
+    import buttonQuestion from "@/common-components/button-question/button-question";
     import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
     import siteFooter from "@/common-components/site-footer/site-footer";
     import BaseFormMixin from '@/mixins/base-form-mixin.js';
@@ -144,6 +159,16 @@
                 vm.setCmsContent(resultMap.cmsContent);
             });
         },
+        methods:
+        {
+            async forwardButtonAction() {
+                return this.navigateForward();
+            },
+
+            navigateForward() {            
+                
+            },
+        },
         computed:{
             DamageCauseOptions() {
                 const damageCauseAnswers =  this.getCmsContent("DamageCauseQuestion", "Answers");
@@ -155,6 +180,14 @@
                 }
                 return answerArray;
             },
+            DamageGlassOnlyOptions()
+            {
+                return this.getCmsContent("GlassOnlyQuestion", "Answers");
+            },
+            DamageGlassOnlyQuestion()
+            {
+                return this.getCmsContent("GlassOnlyQuestion", "QuestionText");
+            },
             stateOptions: {
                 get: function () {
                     return {
@@ -216,7 +249,7 @@
         components: {
             siteHeader,
             siteSubHeader,
-            buttonQuestionModal,
+            buttonQuestion,
             textboxQuestion,
             dropdownQuestion,
             siteFooter