diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index ca96b6271..741bc56ab 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,8 +1,8 @@
 <template>
 <div class="select-car">
     <div class="select-car-form rounded text-center">
-        <!-- <Header :text="headerTextWidgetModel.HeaderText" class="Header" />
-      <yearQuestion :questionText="radioQuestionWidgetModel.QuestionText" /> -->
+        <Header :text="headerTextWidgets[0].HeaderText" class="Header" />
+        <yearQuestion :questionText="radioQuestionWidgets[0].QuestionText" />
     </div>
 </div>
 </template>
@@ -20,15 +20,18 @@ export default {
         };
     },
     computed: {},
-    async mounted() {
+    created() {
+        let self = this;
+        
+        this.GetContentFromCms().then(response => {
+            self.headerTextWidgets = response.HeaderTextWidget;
+            self.radioQuestionWidgets = response.RadioQuestionWidget;
+        });
 
-        const content = await this.GetContentFromCms();
-        this.headerTextWidgets = content.HeaderTextWidget;
-        console.log(content);
     },
     components: {
-        // yearQuestion,
-        // Header,
+        yearQuestion,
+        Header,
     },
 };
 </script>
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 3cbcd9696..2d9b08b1c 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -4,8 +4,6 @@
 
 <script>
 import radioQuestion from "@/commonComponents/radioQuestion/radioQuestion";
-import store from "@/store";
-import router from "@/router";
 
 export default {
     name: "year-question",
@@ -17,9 +15,8 @@ export default {
             years: [],
         };
     },
-    mounted() {
-        this.dispatchNonBlockingStoreAction(this.storeActions.GET_VEHICLE_YEARS, {}
-        ).then((response) => {
+    created() {
+        this.dispatchNonBlockingStoreAction(this.storeActions.GET_VEHICLE_YEARS, {}).then((response) => {
             this.years = response.data;
         });
     },
diff --git a/src/mixins/baseMixin.js b/src/mixins/baseMixin.js
index 1f51eb346..1bb6b23f5 100644
--- a/src/mixins/baseMixin.js
+++ b/src/mixins/baseMixin.js
@@ -20,10 +20,7 @@ export default {
     },
 
     GetContentFromCms() {
-      return this.dispatchNonBlockingStoreAction(
-        this.storeActions.GET_PAGE_DATA,
-        { pageName: this.$route.query.fmgPage }
-      ).then((response) => {
+      return this.dispatchNonBlockingStoreAction(this.storeActions.GET_PAGE_DATA,{ pageName: this.$route.query.fmgPage }).then((response) => {
         const pageDataFromCms = {};
 
         response.data.Result.forEach((widget) => {