diff --git a/src/iss-components/site-sub-header/site-sub-header.vue b/src/iss-components/site-sub-header/site-sub-header.vue
index 6f18f00b..2d5f7342 100644
--- a/src/iss-components/site-sub-header/site-sub-header.vue
+++ b/src/iss-components/site-sub-header/site-sub-header.vue
@@ -12,8 +12,8 @@
           />
         </h5>
       </div>
-      <div class="d-flex align-items-center container-fluid overflow-hidden" :class="justifySubheader">
-            <p class="text-center fw-normal mb-0 subheader-secondary" :class="alternateFormatting">
+      <div class="subheader-secondary d-flex align-items-center container-fluid overflow-hidden" :class="justifySubheader">
+            <p class="fw-normal mb-0" :class="alternateFormatting">
                 <span v-html="subText">
                 </span>
             </p>
@@ -92,4 +92,18 @@ import buttonBack from "@/iss-components/site-sub-header/button-back/button-back
         line-height: 24px;
     }
 
+    .subheader-secondary {
+        &.justify-content-center{
+            p {
+                text-align: center;
+            }
+        }
+
+        &.justify-content-left{
+            p {
+                text-align: left;
+            }
+        }
+    }
+
 </style>
\ No newline at end of file
diff --git a/src/iss-components/vehicle-banner/vehicle-banner.vue b/src/iss-components/vehicle-banner/vehicle-banner.vue
index 568313dc..312d4868 100644
--- a/src/iss-components/vehicle-banner/vehicle-banner.vue
+++ b/src/iss-components/vehicle-banner/vehicle-banner.vue
@@ -67,9 +67,6 @@ export default {
             return this.carUnmatchedVehicleIcon;
        }
     },
-    forceRerender() {
-      this.componentKey += 1;
-    }
   }
 };
 </script>
diff --git a/src/layouts/entry-page/entry-page.vue b/src/layouts/entry-page/entry-page.vue
index e3c6d718..ec3ecbfb 100644
--- a/src/layouts/entry-page/entry-page.vue
+++ b/src/layouts/entry-page/entry-page.vue
@@ -88,16 +88,19 @@
 
                 try
                 {
-                    const clientFlags = JSON.parse(data.clientFlags);
-
-                    if ( clientFlags.TPAEnabled )
+                    if(data.clientFlags)
                     {
-                        this.mainStore.issConfig.enableTPAFlow = true;
-                    }
+                        const clientFlags = JSON.parse(data.clientFlags);
 
-                    if ( clientFlags.ClientDisplayName != null )
-                    {
-                        this.mainStore.issConfig.clientDisplayName = clientFlags.ClientDisplayName;
+                        if ( clientFlags.TPAEnabled )
+                        {
+                            this.mainStore.issConfig.enableTPAFlow = true;
+                        }
+
+                        if ( clientFlags.ClientDisplayName != null )
+                        {
+                            this.mainStore.issConfig.clientDisplayName = clientFlags.ClientDisplayName;
+                        }
                     }
                 }
                 catch ( e )
diff --git a/src/layouts/vehicle-selection/vehicle-question/vehicle-question.vue b/src/layouts/vehicle-selection/vehicle-question/vehicle-question.vue
index 5341a18c..8ac79071 100644
--- a/src/layouts/vehicle-selection/vehicle-question/vehicle-question.vue
+++ b/src/layouts/vehicle-selection/vehicle-question/vehicle-question.vue
@@ -35,7 +35,7 @@ export default {
       },
       set(newValue) {
         this.selectedIndex = newValue;
-        newValue = newValue ? this.values[newValue] : null;
+        newValue = newValue != null && newValue > -1 ? this.values[newValue] : null;
         this.$emit("update:modelValue", newValue);
       }
     },
@@ -43,8 +43,15 @@ export default {
   methods: {  
     async getNewValues() {
       const results = await this.updateValues();
-      this.values = results?.data;   
-      this.selectedValue = null;  
+      this.values = results?.data;
+      if(this.values.length == 1)
+      {
+        this.selectedValue = 0;
+      }   
+      else {
+        this.selectedValue = null;
+      }
+        
     },
     clearValues() {
       this.values = [];
diff --git a/src/layouts/vehicle-selection/vehicle-selection.vue b/src/layouts/vehicle-selection/vehicle-selection.vue
index 2a8729dd..1e86b9fb 100644
--- a/src/layouts/vehicle-selection/vehicle-selection.vue
+++ b/src/layouts/vehicle-selection/vehicle-selection.vue
@@ -8,11 +8,15 @@
                    <div class="row">
                        <div class="col">
                            <div class="select-car-form rounded">
-                                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" class="mt-5" />
+                                <siteSubHeader 
+                                    cmsWidgetName="SiteSubHeaderWidget" 
+                                    class="siteSubHeader"
+                                    justification="left" 
+                                />
                                 
                                 <vehicleQuestion 
                                     ref="vehicleYearQuestion" 
-                                    class="px-4 mb-2 mt-4" 
+                                    class="mb-2 mt-4" 
                                     v-model="selectedYear" 
                                     cmsWidgetName="VehicleYearQuestion" 
                                     :updateValues="updateYearValues" 
@@ -21,7 +25,7 @@
                                 />
                                 <vehicleQuestion  
                                     ref="vehicleMakeQuestion" 
-                                    class="px-4 mb-2 mt-4" 
+                                    class="mb-2 mt-4" 
                                     v-model="selectedMake"
                                     cmsWidgetName="VehicleMakeQuestion" 
                                     :updateValues="updateMakeValues" 
@@ -30,7 +34,7 @@
                                 />
                                 <vehicleQuestion  
                                     ref="vehicleModelQuestion" 
-                                    class="px-4 mb-2 mt-4" 
+                                    class="mb-2 mt-4" 
                                     v-model="selectedModel"
                                     cmsWidgetName="VehicleModelQuestion" 
                                     :updateValues="updateModelValues" 
@@ -39,7 +43,7 @@
                                 />
                                 <vehicleQuestion  
                                     ref="vehicleStyleQuestion" 
-                                    class="px-4 mb-2 mt-4" 
+                                    class="mb-2 mt-4" 
                                     v-model="selectedStyle"
                                     cmsWidgetName="VehicleStyleQuestion" 
                                     :updateValues="updateStyleValues" 
@@ -102,23 +106,13 @@ export default {
            selectedYear: null,
            selectedMake: null,
            selectedModel: null,
-           selectedStyle: null,
-           displayGeneric: true           
+           selectedStyle: null,          
        };
    },
     props:{
         cmsWidgetName:String,
         validationRules:String,
     },
-    setup() {
-      const { meta, validate, resetForm } = useForm();
-
-      return {
-          meta,
-          validate,
-          resetForm,
-      };
-    },
     mounted(){     
         this.$refs["vehicleYearQuestion"].getNewValues();
     },
@@ -146,7 +140,6 @@ export default {
     watch: {
         selectedYear(value) {
             this.mainStore.updateVehicleYear(value);
-            
             if(value)
             {   
                 this.$refs["vehicleMakeQuestion"].getNewValues();
@@ -178,7 +171,6 @@ export default {
         selectedStyle(value) {
             this.mainStore.updateVehicleStyle(value);
             this.mainStore.setVehicle();
-            this.$nextTick(() => {this.displayGeneric = false; this.$refs["banner"].forceRerender();});
         },
     },
    methods: {
@@ -213,6 +205,11 @@ export default {
             return await this.mainStore.getVehicleStyles();
         },
     },
+    computed: {
+        displayGeneric() {
+            return !useMainStore().order.vehicle.imageUrl || !this.selectedStyle;
+        }
+    },
     components: {
         siteHeader,
         siteSubHeader,
@@ -223,3 +220,18 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+    .select-car-form {
+        margin-left: .75rem;
+        margin-right: .75rem;
+    }
+    .siteSubHeader {
+        margin-top: 1.5rem;
+    }
+
+    .subheader-secondary {
+        margin-top: .5rem;
+        padding: 0px; 
+    }
+</style>