diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 20c202bb..a1758c54 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -23,7 +23,7 @@
                         @keypress.space="closeModal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-5 pe-5 pb-4 pt-0">
+                <div class="modal-body ps-5 pe-5 pb-5 pt-0">
                     <slot></slot>
                 </div>
                 <div class="modal-footer px-5 py-4">
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index c502681c..2a71b795 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
         <label
+            v-if="displayQuestionText"
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
@@ -66,6 +67,10 @@ export default {
             type: String,
             default: "",
         },
+        displayQuestionText: {
+            type: Boolean,
+            default: true,
+        },
         modelValue: String,
         inputId: {
             type: String,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 80162a37..29a56f2c 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -73,7 +73,7 @@ import serviceZipModalQuestion from '@/layouts/service-location/service-zip-moda
 defineRule("selection-required", required(errorMessages.OPTION_REQUIRED));
 export default {
     name: "service-location",
-    mixins: [baseFormMixin, baseMixin],
+    mixins: [baseFormMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 5e3493a3..380645bb 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,6 +12,7 @@
     </div>
     <modal
         :ref="modalName"
+        :headerText="modalHeaderText"
         :onModalOpenedCallback="onModalOpened"
         :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"