diff --git a/src/helpers/cms-adapter.js b/src/helpers/cms-adapter.js
deleted file mode 100644
index 721569396..000000000
--- a/src/helpers/cms-adapter.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { storeActions } from "@/constants/store-actions.js";
-import { widgetNames } from "@/constants/widget-names.js";
-import store from "@/store";
-
-export function GetContentFromCms(fmgPage) {
-    return store.dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage }).then((response) => {
-
-        const pageDataFromCms = {
-            isCmsContentReady: false
-        };
-
-        response.data.Result.forEach((widget) => {
-            if (Object.values(widgetNames).includes(widget.Type)) {
-                // If we already have this widget, push it on the collection
-                if (widget.Type in pageDataFromCms) {
-                    pageDataFromCms[widget.Type].push(widget.Model);
-                    return;
-                }
-
-                pageDataFromCms[widget.Type] = [widget.Model];
-
-            }
-        });
-
-        // Our 'Page' is ready because we have data now
-        pageDataFromCms.isCmsContentReady = true;
-
-        return pageDataFromCms;
-    });
-}
-
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 0ac20bc89..444619ab1 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,4 +1,4 @@
-<template>
+<template v-if="isCmsContentReady">
 <div class="select-car">
     <div class="select-car-form rounded text-center">
         <vehicleBanner />
@@ -12,9 +12,6 @@
 import yearQuestion from "@/layouts/vehicle-year/year-question/year-question";
 import pageHeader from "@/ux-components/header/header";
 import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import {
-    GetContentFromCms
-} from "@/helpers/cms-adapter";
 
 export default {
     name: "vehicle-year",
@@ -25,14 +22,10 @@ export default {
         };
     },
     computed: {},
-    beforeRouteEnter(to, from, next) {
-        GetContentFromCms(to.query.fmgPage).then((response) => {
-            console.log(response)
-            next(vm => {
-                vm.pageHeaderWidgets = response.PageHeaderWidget[0];
-                vm.radioQuestionWidgets = response.RadioQuestionWidget[0];
-            });
-        });
+    async created() {
+        const pageContent = await this.GetContentFromCms();
+        this.pageHeaderWidgets = pageContent.PageHeaderWidget[0];
+        this.radioQuestionWidgets = pageContent.RadioQuestionWidget[0];
     },
     components: {
         yearQuestion,
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 39df28b9b..db2e75618 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -8,13 +8,13 @@ export default {
     }
   },
   methods: {
-    dispatchBlockingStoreAction(type, payload) {
-      // globalMethods.showWaitingModal(true);
+    // dispatchBlockingStoreAction(type, payload) {
+    //   // globalMethods.showWaitingModal(true);
 
-      return this.dispatchNonBlockingStoreAction(type, payload).finally(() => {
-        // globalMethods.showWaitingModal(false);
-      });
-    },
+    //   return this.dispatchNonBlockingStoreAction(type, payload).finally(() => {
+    //     // globalMethods.showWaitingModal(false);
+    //   });
+    // },
     dispatchNonBlockingStoreAction(type, payload, encodePayload = false) {
       // Encode the payload if required
       if (encodePayload) {
@@ -23,6 +23,30 @@ export default {
 
       return this.$store.dispatch(type, payload);
     },
+    GetContentFromCms() {
+      return this.dispatchNonBlockingStoreAction(this.storeActions.GET_PAGE_DATA,{ pageName: this.$route.query.fmgPage }).then((response) => {
+
+        const pageDataFromCms = {};
+
+        response.data.Result.forEach((widget) => {
+          if (Object.values(this.widgetNames).includes(widget.Type)) {
+            // If we already have this widget, push it on the collection
+            if (widget.Type in pageDataFromCms) {
+              pageDataFromCms[widget.Type].push(widget.Model);
+              return;
+            }
+
+            pageDataFromCms[widget.Type] = [widget.Model];
+
+          }
+        });
+
+        // Our 'Page' is ready because we have data now
+        this.isCmsContentReady = true;
+
+        return pageDataFromCms;
+      });
+    },
   },
   computed: {
     storeActions() {