diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 849f5a353..3d2f75893 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -47,6 +47,13 @@ export default {
   components: {
     listButton,
   },
+  updated() {
+
+    // Dynamically account for the header height.
+    var element = document.getElementsByClassName('overflow-scroll')[0];
+
+    element.style.height = 'calc(100% - ' + element.offsetTop + 'px)';
+  }
 };
 </script>
 
@@ -55,8 +62,6 @@ export default {
   height: calc(100vh - 280px);
 
   .overflow-scroll {
-    // Height will be determined by overall height of content above list
-    height: calc(100% - 320px);
     -webkit-overflow-scrolling: touch;
   }
 }
diff --git a/src/common-components/funnel-header/funnel-header.vue b/src/common-components/funnel-header/funnel-header.vue
index 7d5be69b0..0a3fd5219 100644
--- a/src/common-components/funnel-header/funnel-header.vue
+++ b/src/common-components/funnel-header/funnel-header.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="funnel-header d-flex justify-content-center align-items-center" v-if="imageSrc">
+<div class="funnel-header d-flex justify-content-center align-items-center flex-column" v-if="imageSrc">
     <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
     <alert v-if="displayGlobalAlert" :alertClass="globalAlertMessage.type" :alertHeadline="globalAlertMessage.messageCopy" :alertCopy="globalAlertMessage.messageHeadline" v-bind:isDismissible="globalAlertMessage.isDismissible" />
 </div>