diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index c5ddda85f..f0721b66c 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -11,7 +11,7 @@
       <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
       <div class="row my-2">
         <div class="col">
-          <textboxQuestion ref="VinNumber" v-model="vin" inputId="vin" disableAutoFill validationRules="vin-required|vin-format" />
+          <textboxQuestion cmsWidgetName="VinNumber" v-model="vin" inputId="vin" disableAutoFill validationRules="vin-required|vin-format" />
         </div>
       </div>
       <div class="row my-2">
@@ -21,7 +21,7 @@
       </div>
       <div class="row my-2">
         <div class="col">
-          <textboxQuestion cmsWidgetName="ServiceZip" v-model="zip" inputId="zip" mask="#####" disableAutoFill validationRules="zip-required" />
+          <textboxQuestion cmsWidgetName="ServiceZIP" v-model="zip" inputId="zip" mask="#####" disableAutoFill validationRules="zip-required" />
         </div>
       </div>
       <div class="row my-2">
@@ -85,12 +85,8 @@
         :alertHeadline="PerfectMatchNewVinAlert.headline"
         :alertCopy="PerfectMatchNewVinAlert.copy"
       />
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion v-if="newServiceZipRequired" cmsWidgetName="ServiceZip" v-model="serviceZip" inputId="serviceZip" disableAutoFill  validationRules="zip-required" />
-        </div>
-      </div>
       <funnelFooter
+        cmsWidgetName="FunnelFooterWidget"
         ref="funnelFooter"
         :isDisabled="!meta.valid"
         @back-clicked="backButtonAction"
@@ -144,7 +140,7 @@ export default {
 
     // Call the "next" function to complete the transition to this page.
     next((vm) => {
-      //vm.setCmsContent(resultMap.cmsContent);
+      vm.setCmsContent(resultMap.cmsContent);
       vm.noServiceZipWidget = {
         headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText,
         copy: resultMap.cmsContent.NoServiceZipWidget.BodyText,
@@ -157,6 +153,10 @@ export default {
         headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText,
         copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText
       };
+      vm.PerfectMatchNewVinAlert = {
+        headline: resultMap.cmsContent.PerfectMatchNewVinAlert.HeadlineText,
+        copy: resultMap.cmsContent.PerfectMatchNewVinAlert.BodyText
+      };
     });
   },
   props: {
@@ -164,13 +164,18 @@ export default {
   },
   data() {
     return {
+      MatchedDifferentVehicle: false,
+      NoMatchAlertWidget: false,
+      PerfectMatchNewVinAlert: false,
+      NoServiceZipWidget: false,
+      VinFoundWidget: false,
+      VinFoundReadOnlyWidget: false,
+      FoundWindshieldAlert: false,
       newServiceZipRequired: false,
-      vinNotValid: false,
-      vinDoesNotMatchCarId: false,
-      licensePlate: '',
+      VinNotFound: false,
+      vin: '',
       zip: '',
       email: '',
-      serviceZip: '',
     };
   },
   methods: {
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 20c8d97b3..620c788e2 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -60,7 +60,7 @@ const routingTable = [
       },
       {
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_SINGLE_PART,
-        destinationFmgPageValue: fmgPageValues.REVEAL
+        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
       },
       {
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_MULTIPLE_PARTS,