diff --git a/src/constants/widgetNames.js b/src/constants/widgetNames.js
index 6fd0a1196..bad1390c6 100644
--- a/src/constants/widgetNames.js
+++ b/src/constants/widgetNames.js
@@ -1,5 +1,5 @@
 const widgetNames = {
-  HEADER_TEXT_WIDGET: "HeaderTextWidget",
+  PAGE_HEADER_WIDGET: "PageHeaderWidget",
   RADIO_QUESTION_WIDGET: "RadioQuestionWidget",
 };
 
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 808210dca..18f679232 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,8 +1,8 @@
-<template>
-<div v-if="isPageReady" class="select-car">
+<template v-if="isPageReady">
+<div class="select-car">
     <div class="select-car-form rounded text-center">
-        <Header :text="headerTextWidgets[0].HeaderText" class="Header" />
-        <yearQuestion :questionText="radioQuestionWidgets[0].QuestionText" />
+        <Header :text="pageHeaderWidgets.HeaderText" class="Header" />
+        <yearQuestion :questionText="radioQuestionWidgets.QuestionText" />
     </div>
 </div>
 </template>
@@ -15,19 +15,15 @@ export default {
     name: "vehicle-year",
     data() {
         return {
-            headerTextWidgets: {},
+            pageHeaderWidgets: {},
             radioQuestionWidgets: {},
-            isPageReady: false,
         };
     },
     computed: {},
     async created() {
         const pageContent = await this.GetContentFromCms();
-
-        this.headerTextWidgets = pageContent.HeaderTextWidget;
-        this.radioQuestionWidgets = pageContent.RadioQuestionWidget;
-        this.isPageReady = true;
-
+        this.pageHeaderWidgets = pageContent.PageHeaderWidget[0];
+        this.radioQuestionWidgets = pageContent.RadioQuestionWidget[0];
     },
     components: {
         yearQuestion,
diff --git a/src/mixins/baseMixin.js b/src/mixins/baseMixin.js
index 915b43ab5..34658e079 100644
--- a/src/mixins/baseMixin.js
+++ b/src/mixins/baseMixin.js
@@ -2,6 +2,11 @@ import { storeActions } from "@/constants/storeActions.js";
 import { widgetNames } from "@/constants/widgetNames.js";
 
 export default {
+  data(){
+    return {
+      isPageReady: false
+    }
+  },
   methods: {
     dispatchBlockingStoreAction(type, payload) {
       // globalMethods.showWaitingModal(true);
@@ -34,6 +39,10 @@ export default {
             pageDataFromCms[widget.Type] = [widget.Model];
           }
         });
+        
+        // Our 'Page' is ready because we have data now
+        this.isPageReady = true;
+
         return pageDataFromCms;
       });
     },