diff --git a/public/index.html b/public/index.html
index 9047c9643..35da253dd 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="en-US">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/src/App.vue b/src/App.vue
index a44ab87b7..3d665312e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,11 @@
 <template>
   <router-view></router-view>
 </template>
+
+<style lang="scss">
+  @import "./node_modules/bootstrap/scss/bootstrap";
+  @import "@/styles/common-styles.scss";
+  @import "@/styles/common-button-styles.scss";
+  @import "@/styles/common-list-styles.scss";
+  @import "@/styles/common-typography-styles.scss";
+</style>
\ No newline at end of file
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index abf24e998..ea77b4494 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -3,7 +3,6 @@
         <funnelHeader ref="funnelHeader" />
         <vehicleBanner ref="vehicleBanner" />
         <funnelSubHeader 
-            class="Header" 
             ref="funnelSubHeader"
         />
     </div>
@@ -26,7 +25,7 @@ export default ({
     beforeRouteEnter(to, from, next) { 
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-        const damageOptions = baseMixin.methods.dispatchNonBlockingStoreAction(storeActions.GET_DAMAGE_OPTIONS, {carId: store.getters.vehicle.carId});
+        const damageOptionsPromise = baseMixin.methods.dispatchNonBlockingStoreAction(storeActions.GET_DAMAGE_OPTIONS, {carId: store.getters.vehicle.carId});
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -36,7 +35,7 @@ export default ({
         },
         {
             resultKey: "damageOptions",
-            promise: damageOptions
+            promise: damageOptionsPromise
         },
         ];
 
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index e641c4c73..031ffb20b 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -9,7 +9,6 @@
             :hasBackButton="true"
             backButtonAccessibleText="Change Vehicle Year"
             @click-event="backButtonAction"
-            class="Header"
         />
         <makeQuestion v-model="selectedMake" ref="makeQuestion" />
       </div>
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index c682e9e24..8d99afdb8 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -9,7 +9,6 @@
           :hasBackButton="true"
           backButtonAccessibleText="Change Vehicle Make"
           @click-event="backButtonAction"
-          class="Header"
         />
         <modelQuestion v-model="selectedModel" ref="modelQuestion" />
       </div>
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index ea3300036..a9ac67ef5 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -9,7 +9,6 @@
           :hasBackButton="true"
           backButtonAccessibleText="Change Vehicle Model"
           @click-event="backButtonAction"
-          class="Header"
         />
         <styleQuestion v-model="selectedStyle" ref="styleQuestion" />
       </div>
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index c5c85675e..e95865f57 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -5,7 +5,6 @@
       <div class="select-car-form rounded text-center">
         <vehicleBanner ref="vehicleBanner" />
         <funnelSubHeader 
-            class="Header" 
             ref="funnelSubHeader"
         />
         <yearQuestion v-model="selectedYear" ref="yearQuestion" />
diff --git a/vue.config.js b/vue.config.js
index 9d9b2401b..316656ed1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,17 +8,13 @@ module.exports = {
     loaderOptions: {
       sass: {
         // Load Order Matters!!!
+        // Note: only include functions, variables and mixins here
         prependData: `
         @import "./node_modules/bootstrap/scss/functions";
         @import "@/styles/ux-variables.scss";
         @import "./node_modules/bootstrap/scss/variables";
         @import "./node_modules/bootstrap/scss/mixins";
         @import "@/styles/mixins/customMixins";
-        @import "./node_modules/bootstrap/scss/bootstrap";
-        @import "@/styles/common-styles.scss";
-        @import "@/styles/common-button-styles.scss";
-        @import "@/styles/common-list-styles.scss";
-        @import "@/styles/common-typography-styles.scss";
         `,
       },
     },
diff --git a/vue.release.config.js b/vue.release.config.js
index c4b18d5dd..43fffb47f 100644
--- a/vue.release.config.js
+++ b/vue.release.config.js
@@ -7,17 +7,13 @@ module.exports = {
     loaderOptions: {
       sass: {
         // Load Order Matters!!!
+        // Note: only include functions, variables and mixins here
         prependData: `
         @import "./node_modules/bootstrap/scss/functions";
         @import "@/styles/ux-variables.scss";
         @import "./node_modules/bootstrap/scss/variables";
         @import "./node_modules/bootstrap/scss/mixins";
-        @import "@/styles/mixins/customMixins";
-        @import "./node_modules/bootstrap/scss/bootstrap";
-        @import "@/styles/common-styles.scss";
-        @import "@/styles/common-button-styles.scss";
-        @import "@/styles/common-list-styles.scss";
-        @import "@/styles/common-typography-styles.scss";
+        @import "@/styles/mixins/customMixins"; 
         `,
       },
     },
