diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 708e532f1..4dde1dd61 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -143,4 +143,7 @@ export default {
     font-weight: 500; 
     color: $black; 
   }
+  div .current_car_info-text{
+    padding-bottom: 16px; 
+  }
 </style>
\ No newline at end of file
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 17dfcba28..05c251bfd 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -57,14 +57,6 @@
             />
           </div>
         </div>
-        <alert
-          class="my-3"
-          :manualHeadline="MatchedDifferentVehicleAlertHeader"
-          :manualCopy="MatchedDifferentVehicleAlertBody"
-          v-model="customAlertData"
-          v-if="matchedDifferentVehicle"
-          alertClass="alert-danger"
-        />
         <alert
           class="my-3"
           v-model="customAlertData"
@@ -83,9 +75,33 @@
         <alert
           class="my-3"
           v-model="customAlertData"
-          v-if="foundWindshieldAlert"
+          v-if="vinNotFound"
+          alertClass="alert-warning"
+          cmsWidgetName="VinNotFound"
+        />
+        <alert
+          class="my-3"
+          :manualHeadline="PerfectMatchNewVinAlertReadOnlyHeader"
+          :manualCopy="PerfectMatchNewVinAlertReadOnlyBody"
+          v-model="customAlertData"
+          v-if="isVinFieldReadOnly"
+          alertClass="alert-success"
+        />
+        <alert
+          class="my-3"
+          :manualHeadline="MatchedDifferentVehicleAlertHeader"
+          :manualCopy="MatchedDifferentVehicleAlertBody"
+          v-model="customAlertData"
+          v-if="isCarIdDifferent"
+          alertClass="alert-danger"
+        />
+        <alert
+          class="my-3"
+          :manualHeadline="NoServiceZipHeader"
+          :manualCopy="NoServiceZipBody"
+          v-model="customAlertData"
+          v-if="noServiceZip"
           alertClass="alert-warning"
-          cmsWidgetName="FoundWindshieldAlert"
         />
         <alert
           class="my-3"
@@ -98,16 +114,8 @@
           class="my-3"
           v-model="customAlertData"
           v-if="perfectMatchNewVinAlert"
-          alertClass="alert-warning"
-          cmsWidgetName="PerfectMatchNewVinAlert"
-        />
-        <alert
-          class="my-3"
-          :manualHeadline="PerfectMatchNewVinAlertReadOnlyHeader"
-          :manualCopy="PerfectMatchNewVinAlertReadOnlyBody"
-          v-model="customAlertData"
-          v-if="isVinFieldReadOnly"
           alertClass="alert-success"
+          cmsWidgetName="PerfectMatchNewVinAlert"
         />
         <funnelFooter
           cmsWidgetName="FunnelFooterWidget"
@@ -117,36 +125,6 @@
           @ForwardClicked="forwardButtonAction"
         />
       </div>
-      <alert
-        class="my-3"
-        :manualHeadline="MatchedDifferentVehicleAlertHeader"
-        :manualCopy="MatchedDifferentVehicleAlertBody"
-        v-model="customAlertData"
-        v-if="isCarIdDifferent"
-        alertClass="alert-danger"
-      />
-      <alert
-        class="my-3"
-        :manualHeadline="NoServiceZipHeader"
-        :manualCopy="NoServiceZipBody"
-        v-model="customAlertData"
-        v-if="noServiceZip"
-        alertClass="alert-warning"
-      />
-      <alert
-        class="my-3"
-        v-model="customAlertData"
-        v-if="vinNotFound"
-        alertClass="alert-warning"
-        cmsWidgetName="VinNotFound"
-      />
-      <alert
-        class="my-3"
-        v-model="customAlertData"
-        v-if="perfectMatchNewVinAlert"
-        alertClass="alert-success"
-        cmsWidgetName="PerfectMatchNewVinAlert"
-      />
     </div>
   </Form>
 </template>
@@ -306,34 +284,36 @@ export default {
       this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
     },
     async forwardButtonAction() {
-      const zipValidation = await this.validateZip(this.zip);
-      if (!zipValidation.data.isServiceable) {
+      const zipValidation = this.validateZip(this.zip);
+      const vehicleLookup = this.lookupVehicle(this.vin);
+      const zipValidationResponse = await zipValidation;
+      const vehicleLookupResponse = await vehicleLookup.catch(() => {
+        this.vinNotFound = true;
+        this.$refs.funnelFooter.removeLoader();
+        this.noServiceZip = false;
+        return;
+      });
+      if (!zipValidationResponse.data.isServiceable) {
         this.customAlertData.zip = this.zip;
         this.$refs.funnelFooter.removeLoader();
         this.noServiceZip = true;
         this.invalidZip = this.zip;
         return;
       }
-      const vehicleLookup = await this.lookupVehicle(this.vin).catch(() => {
-        this.vinNotFound = true;
-        this.$refs.funnelFooter.removeLoader();
-        this.noServiceZip = false;
-        return;
-      });
-      this.isCarIdDifferent = vehicleLookup.data.carId !== store.getters.vehicle.carId;
+      this.isCarIdDifferent = vehicleLookupResponse.data.carId !== store.getters.vehicle.carId;
 
-      if (this.isCarIdDifferent && (vehicleLookup.data.carId !== this.previouslyEnteredCarId)) {
-        this.previouslyEnteredCarId = vehicleLookup.data.carId;
+      if (this.isCarIdDifferent && (vehicleLookupResponse.data.carId !== this.previouslyEnteredCarId)) {
+        this.previouslyEnteredCarId = vehicleLookupResponse.data.carId;
         this.noServiceZip = false;
-        this.customAlertData.vehicleInfo = vehicleLookup.data;
-        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookup.data.year} ${vehicleLookup.data.make} ${vehicleLookup.data.model}`);
+        this.customAlertData.vehicleInfo = vehicleLookupResponse.data;
+        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookupResponse.data.year} ${vehicleLookupResponse.data.make} ${vehicleLookupResponse.data.model}`);
         this.isVinValid = true;
-        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookup.data.carId);
+        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookupResponse.data.carId);
         this.$refs.funnelFooter.removeLoader();
         this.isCarIdDifferent = true;
         return;
       }
-      this.updateStore(vehicleLookup.data);
+      this.updateStore(vehicleLookupResponse.data);
       this.navigateForward();
     },
     navigateForward(){