diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index a97c63dc..25b259d9 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,21 +1,15 @@
 <template>
 <div>
-    <navButton type="button" text="back" :scenario="navigationScenarios.CLICKED_BACK"></navButton>
+    <navButton type="button" text="back" :scenario="this.navigationScenarios.CLICKED_BACK"></navButton>
     <p class="fade-on-route-transition">Vehicle Year Placeholder</p>
 </div>
 </template>
 
 <script>
     import navButton from '@/common-components/nav-button/nav-button.vue';
-    import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
     export default {
         name: 'vehicle-year',
         components: { navButton },
-        data() {
-            return {
-                navigationScenarios,        
-            }
-        }
     }
 </script>
\ No newline at end of file
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 9c056bf0..c205b19a 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -2,23 +2,17 @@
 <div>
     <p class="fade-on-route-transition">Welcome Page Placeholder</p>
     <br />
-    <navButton type="button" text="Next" :scenario="navigationScenarios.CLICKED_FORWARD"></navButton>
-    <navButton text="Google" :scenario="navigationScenarios.CLICKED_TEST"></navButton>
+    <navButton type="button" text="Next" :scenario="this.navigationScenarios.CLICKED_FORWARD"></navButton>
+    <navButton text="Google" :scenario="this.navigationScenarios.CLICKED_TEST"></navButton>
 </div>
 </template>
 
 <script>
     import navButton from "@/common-components/nav-button/nav-button.vue";
-    import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
     export default {
     name: "welcome-page",
     components: { navButton },
-    data() {
-        return {
-            navigationScenarios,        
-        }
-    }
 }
 </script>
 
diff --git a/src/main.js b/src/main.js
index 74f6b847..550d42a5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,12 +5,14 @@ import router from './router';
 import "../node_modules/bootstrap/dist/js/bootstrap.js";
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
 import { useMainStore } from './store';
+import baseMixin from "@/mixins/base-mixin.js";
 
 const vueApp = createApp(App);
 const pinia = createPinia();
 pinia.use(piniaPluginPersistedstate);
 vueApp.use(pinia);
 vueApp.config.globalProperties.$store = useMainStore();
+vueApp.mixin(baseMixin);
 vueApp.use(router);
 vueApp.mount("#app");