diff --git a/src/iss-components/questions-page-layout/questions-page-layout.vue b/src/iss-components/questions-page-layout/questions-page-layout.vue
index 526d8de4..fa9ca34e 100644
--- a/src/iss-components/questions-page-layout/questions-page-layout.vue
+++ b/src/iss-components/questions-page-layout/questions-page-layout.vue
@@ -1,34 +1,43 @@
 <template>
     <div :class="`page-container-grouped-styles questions-page`">
-        <loadingModal ref="loadingModal" />
-        <siteHeader cmsWidgetName="SiteHeaderWidget" />
-        <div class="fade-on-route-transition sub-container overflow-scroll">
-        <vehicleBanner class="mb-3" cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="false" />
-        <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" />
-            <alert
-                ref="alertFewMoreQuestions"
-                cmsWidgetName="alertWidget"
-                class="m-5"
-                alertClass="alert-warning"
-                :manualHeadline="alertFewMoreQuestionsHeader"
-                :manualCopy="alertFewMoreQuestionsCopy"
-                v-bind:isDismissible="false" />
-            <div v-for="(questionsDatum, i) in questionsData" :key="questionsDatum.key">
-                <questionChain
-                    ref="questionChain"
-                    v-model="selectedAnswers[questionsDatum.answerKey]"
-                    :questionData="questionsDatum.questions"
-                    :index="i"
-                    v-if="showThisQuestionChain(questionsDatum, i)"
-                    :answerKey="questionsDatum.answerKey"
-                    :validationRules="validationRules" />
+        <div class="fade-on-route-transition position-relative">
+            <loadingModal ref="loadingModal" />
+            <siteHeader cmsWidgetName="SiteHeaderWidget" />
+            <div class="select-car">
+                <div class="container-fluid pb-2">
+                    <div class="row px-3">
+                        <div class="col">
+                            <div class="select-car-form rounded">
+                                <vehicleBanner class="mb-3" cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="false" />
+                                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" />
+                                <alert
+                                ref="alertFewMoreQuestions"
+                                cmsWidgetName="alertWidget"
+                                alertClass="alert-warning"
+                                :manualHeadline="alertFewMoreQuestionsHeader"
+                                :manualCopy="alertFewMoreQuestionsCopy"
+                                v-bind:isDismissible="false" />
+                                <div v-for="(questionsDatum, i) in questionsData" :key="questionsDatum.key">
+                                    <questionChain
+                                    ref="questionChain"
+                                    v-model="selectedAnswers[questionsDatum.answerKey]"
+                                    :questionData="questionsDatum.questions"
+                                    :index="i"
+                                    v-if="showThisQuestionChain(questionsDatum, i)"
+                                    :answerKey="questionsDatum.answerKey"
+                                    :validationRules="validationRules" />
+                                </div>
+                                <siteFooter
+                                ref="siteFooter"
+                                cmsWidgetName="SiteFooterWidget"
+                                :isForwardActionDisabled="!isMetaValid"
+                                @back-clicked="handleBackButtonAction"
+                                @ForwardClicked="handleForwardButtonAction" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <siteFooter
-                ref="siteFooter"
-                cmsWidgetName="SiteFooterWidget"
-                :isForwardActionDisabled="!isMetaValid"
-                @back-clicked="handleBackButtonAction"
-                @ForwardClicked="handleForwardButtonAction" />
         </div>
     </div>
 </template>
@@ -94,11 +103,20 @@ export default {
 };
 </script>
 
-<style lang="scss">
- .overflow-scroll {
-        height: calc(100% - 180px);
-        overflow-x: hidden !important;
- }
+<style lang="scss" scoped>
+.fade-on-route-transition {
+    margin-bottom: 100px;
+}
+.page-container-grouped-styles {
+    //height: calc(100% - 80px);
+    overflow: auto;
+}
+
+.modal-open {
+    .page-container-grouped-styles {
+        overflow: hidden;
+    }
+}
 .questions-page {
     .question-text {
         margin-bottom: 0.5rem;
diff --git a/src/iss-components/site-header/menu-modal/menu-modal.vue b/src/iss-components/site-header/menu-modal/menu-modal.vue
index bb456e2e..b6577fc8 100644
--- a/src/iss-components/site-header/menu-modal/menu-modal.vue
+++ b/src/iss-components/site-header/menu-modal/menu-modal.vue
@@ -78,7 +78,7 @@ export default {
         show() {
             this.currentFooterAndHeaderHeight = this.getFooterInfoBoxHeight() + 72;
             this.isActive = true;
-            document.querySelector('.fade-on-route-transition').scrollTo({
+            document.querySelector('.page-container-grouped-styles').scrollTo({
                 top: 0,  behavior: 'instant'
             });
         },
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 584887ad..a0af6bbe 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -1,43 +1,53 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-        <div class="page-container-grouped-styles vehicle-parts small-question-text">
-            <siteHeader ref="siteHeader" cmsWidgetName="SiteHeaderWidget" />
-            <div class="fade-on-route-transition sub-container overflow-scroll px-5">
-                <vehicleBanner
-                        class="mb-3"
-                        ref="vehicleBanner"
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-                <siteSubHeader ref="siteSubHeader" cmsWidgetName="SiteSubHeaderWidget" />
-                <div class="prevent-squish my-5">
-                    <div class="row">
-                        <div class="col">
-                            <alert
-                                class="rounded border-0 shadow-sm"
-                                alertClass="alert-warning"
-                                cmsWidgetName="AlertWidget"
-                                :isDismissible="false"
-                                id="vehicle-parts-alert" />
+        <div class="page-container-grouped-styles">
+            <div class="fade-on-route-transition position-relative">
+                <siteHeader cmsWidgetName="SiteHeaderWidget" />
+                <div class="select-car">
+                    <div class="container-fluid pb-2">
+                        <div class="row px-3">
+                            <div class="col">
+                                <div class="select-car-form rounded">
+                                    <vehicleBanner
+                                    class="mb-3"
+                                    ref="vehicleBanner"
+                                    cmsWidgetName="VehicleBannerWidget"
+                                    :displayGenericVehicleImage="false" />
+                                    <siteSubHeader ref="siteSubHeader" cmsWidgetName="SiteSubHeaderWidget" />
+                                    <div class="prevent-squish my-5">
+                                        <div class="row">
+                                            <div class="col">
+                                                <alert
+                                                class="rounded border-0 shadow-sm"
+                                                alertClass="alert-warning"
+                                                cmsWidgetName="AlertWidget"
+                                                :isDismissible="false"
+                                                id="vehicle-parts-alert" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-for="(item, i) in PartsOrQuestions" :key="i">
+                                        <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
+                                        <hr v-if="i > 0" />
+                                        <glassPartQuestion
+                                        :ref="`${RefPrefix}-${item.glassLocation}-${item.glassName}`"
+                                        v-model="selectedGlassParts[item.glassLocation + '-' + item.glassName]"
+                                        :glassLocation="item.glassLocation"
+                                        :glassName="item.glassName"
+                                        :colorAnswers="item.colorAnswers"
+                                        :alreadyPopulatedPartsData="alreadyPopulatedPartsData" />
+                                    </div>
+                                    <siteFooter
+                                    cmsWidgetName="SiteFooterWidget"
+                                    ref="siteFooter"
+                                    :isForwardActionDisabled="isForwardActionDisabled"
+                                    @backClicked="navigateBack"
+                                    @ForwardClicked="forwardButtonAction" />
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
-                <div v-for="(item, i) in PartsOrQuestions" :key="i">
-                    <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
-                    <hr v-if="i > 0" />
-                    <glassPartQuestion
-                        :ref="`${RefPrefix}-${item.glassLocation}-${item.glassName}`"
-                        v-model="selectedGlassParts[item.glassLocation + '-' + item.glassName]"
-                        :glassLocation="item.glassLocation"
-                        :glassName="item.glassName"
-                        :colorAnswers="item.colorAnswers"
-                        :alreadyPopulatedPartsData="alreadyPopulatedPartsData" />
-                </div>
-                <siteFooter
-                    cmsWidgetName="SiteFooterWidget"
-                    ref="siteFooter"
-                    :isForwardActionDisabled="isForwardActionDisabled"
-                    @backClicked="navigateBack"
-                    @ForwardClicked="forwardButtonAction" />
             </div>
         </div>
     </Form>
@@ -80,152 +90,161 @@ export default {
 
             // Glass Part Question dynamic component
             Object.keys(vm.$refs)
-                .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
-                .forEach((c) =>
-                    vm.$refs[c][0].initializeComponent({
-                        ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
-                        FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
-                    })
-                );
-        });
+            .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
+            .forEach((c) =>
+            vm.$refs[c][0].initializeComponent({
+                ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
+                FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
+            })
+        );
+    });
+},
+data() {
+    return {
+        selectedGlassParts: {},
+        alertWidgetData: Object,
+        alreadyPopulatedPartsData: [],
+    };
+},
+computed: {
+    isForwardActionDisabled() {
+        return (
+            this.selectedGlassPartNumbers.length !== this.PartsFromApi.partsOrQuestions.length
+        );
     },
-    data() {
-        return {
-            selectedGlassParts: {},
-            alertWidgetData: Object,
-            alreadyPopulatedPartsData: [],
-        };
+    selectedGlassPartNumbers() {
+        // Compile all selected parts from the page.
+        const numberArray = [];
+        for (let glassPart of Object.values(this.selectedGlassParts)) {
+            if (glassPart?.partNumber) {
+                numberArray.push(glassPart.partNumber);
+            }
+        }
+        return numberArray;
     },
-    computed: {
-        isForwardActionDisabled() {
-            return (
-                this.selectedGlassPartNumbers.length !== this.PartsFromApi.partsOrQuestions.length
-            );
-        },
-        selectedGlassPartNumbers() {
-            // Compile all selected parts from the page.
-            const numberArray = [];
-            for (let glassPart of Object.values(this.selectedGlassParts)) {
-                if (glassPart?.partNumber) {
-                    numberArray.push(glassPart.partNumber);
-                }
-            }
-            return numberArray;
-        },
-        PartsOrQuestions() {
-            const partsData = this.PartsFromApi;
+    PartsOrQuestions() {
+        const partsData = this.PartsFromApi;
 
-            // Map API result data, to vehicle-parts data structure
-            const mappedData = partsData.partsOrQuestions.map((g) => {
-                return {
-                    glassName: g.glassName,
-                    glassLocation: g.glassLocation,
-                    colorAnswers: g.parts?.reduce((arr, p) => {
-                        arr.push({
-                            ColorAnswerText: p.color,
-                            FeatureAnswers: [
-                                {
-                                    FeatureAnswerText:
-                                        p.description === "" ? p.color : p.description,
-                                    PartNumber: p.partNumber,
-                                },
-                            ],
-                        });
-                        return arr;
-                    }, []),
-                };
-            });
-
-            return mappedData;
-        },
-
-        PartsFromApi() {
-            return this.mainStore.pageData(issPageValues.VEHICLE_PARTS);
-        },
-
-        RefPrefix() {
-            return "partQuestion";
-        },
-    },
-    methods: {
-        arePagePrerequisitesValid() {
-            // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            return (
-                this.mainStore.damage.isRepair != null &&
-                this.mainStore.pageData(issPageValues.VEHICLE_PARTS) &&
-                Object.keys(this.mainStore.pageData(issPageValues.VEHICLE_PARTS)).length !== 0
-            );
-        },
-        async forwardButtonAction() {
-            const matchedParts = [];
-
-            // Match them to the parts from the API.
-            for (let [key, value] of Object.entries(this.PartsFromApi.partsOrQuestions)) {
-                for (let [partKey, partValue] of Object.entries(value.parts)) {
-                    const currentPart = this.PartsFromApi.partsOrQuestions[key].parts[partKey];
-
-                    const isMatched = this.selectedGlassPartNumbers.some(
-                        (p) => p === currentPart.partNumber
-                    );
-
-                    if (isMatched) {
-                        matchedParts.push({
-                            glassLocation: value.glassLocation,
-                            glassName: value.glassName,
-                            parts: [currentPart],
-                        });
-                    }
-                }
-            }
-            // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
-            if (this.isForwardActionDisabled) {
-                this.$refs.siteFooter.removeLoader();
-                throw new Error("Could not match any parts to the selected parts");
-            }
-
-            await this.mainStore.resetMoldingAndCapabilityQuestionAnswersIfNeeded(matchedParts);
-
-            this.navigateForward(matchedParts, null);
-        },
-
-        LoadInitialPartsData() {
-            const partsData = this.PartsFromApi;
-            this.alreadyPopulatedPartsData =
-                this.mainStore.lineItems.glassParts === null
-                    ? []
-                    : this.mainStore.lineItems.glassParts;
-
-            partsData.partsOrQuestions.map((g) => {
-                // If the part is already populated, use the value from the store and populate the v-model.
-                Object.keys(this.alreadyPopulatedPartsData).forEach((key) => {
-                    const partNumber = this.alreadyPopulatedPartsData[key].partNumber;
-                    g.parts.forEach((p) => {
-                        if (p.partNumber === partNumber) {
-                            this.selectedGlassParts[g.glassLocation + "-" + g.glassName] = p;
-                        }
+        // Map API result data, to vehicle-parts data structure
+        const mappedData = partsData.partsOrQuestions.map((g) => {
+            return {
+                glassName: g.glassName,
+                glassLocation: g.glassLocation,
+                colorAnswers: g.parts?.reduce((arr, p) => {
+                    arr.push({
+                        ColorAnswerText: p.color,
+                        FeatureAnswers: [
+                            {
+                                FeatureAnswerText:
+                                p.description === "" ? p.color : p.description,
+                                PartNumber: p.partNumber,
+                            },
+                        ],
                     });
+                    return arr;
+                }, []),
+            };
+        });
+
+        return mappedData;
+    },
+
+    PartsFromApi() {
+        return this.mainStore.pageData(issPageValues.VEHICLE_PARTS);
+    },
+
+    RefPrefix() {
+        return "partQuestion";
+    },
+},
+methods: {
+    arePagePrerequisitesValid() {
+        // Check if isRepair is populated and if the pageData we need is here (Parts data)
+        return (
+            this.mainStore.damage.isRepair != null &&
+            this.mainStore.pageData(issPageValues.VEHICLE_PARTS) &&
+            Object.keys(this.mainStore.pageData(issPageValues.VEHICLE_PARTS)).length !== 0
+        );
+    },
+    async forwardButtonAction() {
+        const matchedParts = [];
+
+        // Match them to the parts from the API.
+        for (let [key, value] of Object.entries(this.PartsFromApi.partsOrQuestions)) {
+            for (let [partKey, partValue] of Object.entries(value.parts)) {
+                const currentPart = this.PartsFromApi.partsOrQuestions[key].parts[partKey];
+
+                const isMatched = this.selectedGlassPartNumbers.some(
+                    (p) => p === currentPart.partNumber
+                );
+
+                if (isMatched) {
+                    matchedParts.push({
+                        glassLocation: value.glassLocation,
+                        glassName: value.glassName,
+                        parts: [currentPart],
+                    });
+                }
+            }
+        }
+        // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
+        if (this.isForwardActionDisabled) {
+            this.$refs.siteFooter.removeLoader();
+            throw new Error("Could not match any parts to the selected parts");
+        }
+
+        await this.mainStore.resetMoldingAndCapabilityQuestionAnswersIfNeeded(matchedParts);
+
+        this.navigateForward(matchedParts, null);
+    },
+
+    LoadInitialPartsData() {
+        const partsData = this.PartsFromApi;
+        this.alreadyPopulatedPartsData =
+        this.mainStore.lineItems.glassParts === null
+        ? []
+        : this.mainStore.lineItems.glassParts;
+
+        partsData.partsOrQuestions.map((g) => {
+            // If the part is already populated, use the value from the store and populate the v-model.
+            Object.keys(this.alreadyPopulatedPartsData).forEach((key) => {
+                const partNumber = this.alreadyPopulatedPartsData[key].partNumber;
+                g.parts.forEach((p) => {
+                    if (p.partNumber === partNumber) {
+                        this.selectedGlassParts[g.glassLocation + "-" + g.glassName] = p;
+                    }
                 });
             });
-        },
-    },
-    mounted() {
-        this.LoadInitialPartsData();
-    },
-    components: {
-        Form,
-        glassPartQuestion,
-        siteHeader,
-        vehicleBanner,
-        siteSubHeader,
-        siteFooter,
-        alert,
+        });
     },
+},
+mounted() {
+    this.LoadInitialPartsData();
+},
+components: {
+    Form,
+    glassPartQuestion,
+    siteHeader,
+    vehicleBanner,
+    siteSubHeader,
+    siteFooter,
+    alert,
+},
 };
 </script>
-<style lang="scss">
-.overflow-scroll {
-    height: calc(100% - 180px);
-    overflow-x: hidden !important;
+<style lang="scss" scoped>
+.fade-on-route-transition {
+    margin-bottom: 100px;
+}
+.page-container-grouped-styles {
+    //height: calc(100% - 80px);
+    overflow: auto;
+}
+
+.modal-open {
+    .page-container-grouped-styles {
+        overflow: hidden;
+    }
 }
 
 #vehicle-parts-alert {