diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index e590fb4e5..e6ad2bf4b 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -1,35 +1,91 @@
 <template>
-<Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-    <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
-        <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="false" />
-        <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-        <div class="row my-2">
-            <div class="col">
-                <textboxQuestion cmsWidgetName="LicensePlateNumber" v-model="licensePlate" isRequired inputId="license_plate" validationRules="license-plate-required" />
-            </div>
+  <Form
+    @submit="onSubmit"
+    @invalid-submit="onInvalidSubmit"
+    ref="theForm"
+    v-slot="{ meta }"
+  >
+    <div
+      class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5"
+    >
+      <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
+      <vehicleBanner
+        cmsWidgetName="VehicleBannerWidget"
+        :displayGenericVehicleImage="false"
+      />
+      <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+      <div class="row my-2">
+        <div class="col">
+          <textboxQuestion
+            cmsWidgetName="LicensePlateNumber"
+            v-model="licensePlate"
+            isRequired
+            inputId="license_plate"
+            validationRules="license-plate-required"
+          />
         </div>
-        <div class="row my-2">
-            <div class="col">
-                <textboxQuestion cmsWidgetName="RegistrationZip" v-model="registrationZip" inputId="zip" mask="#####" validationRules="zip-required" />
-            </div>
+      </div>
+      <div class="row my-2">
+        <div class="col">
+          <textboxQuestion
+            cmsWidgetName="RegistrationZip"
+            v-model="registrationZip"
+            inputId="zip"
+            mask="#####"
+            validationRules="zip-required"
+          />
         </div>
-        <div class="row my-2">
-            <div class="col">
-                <textboxQuestion cmsWidgetName="EmailAddress" v-model="email" inputId="email" validationRules="email-address-required|email-address-format" />
-            </div>
+      </div>
+      <div class="row my-2">
+        <div class="col">
+          <textboxQuestion
+            cmsWidgetName="EmailAddress"
+            v-model="email"
+            inputId="email"
+            validationRules="email-address-required|email-address-format"
+          />
         </div>
-        <alert class="my-3" :manualHeadline="NoServiceZipHeader" :manualCopy="NoServiceZipBody" v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent" alertClass="alert-danger" />
-        <div class="row my-2">
-            <div class="col">
-                <textboxQuestion v-if="!isRegistrationZipServicable" cmsWidgetName="ServiceZip" v-model="serviceZip" inputId="serviceZip" validationRules="zip-required" />
-            </div>
+      </div>
+      <alert
+        class="my-3"
+        :manualHeadline="NoServiceZipHeader"
+        :manualCopy="NoServiceZipBody"
+        v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent"
+        alertClass="alert-danger"
+      />
+      <div class="row my-2">
+        <div class="col">
+          <textboxQuestion
+            v-if="!isRegistrationZipServicable"
+            cmsWidgetName="ServiceZip"
+            v-model="serviceZip"
+            inputId="serviceZip"
+            validationRules="zip-required"
+          />
         </div>
-        <alert class="my-3" cmsWidgetName="NoMatchAlertWidget" v-if="!isVinValid" alertClass="alert-danger" />
-        <alert class="my-3" :manualHeadline="MatchedDifferentVehicleAlertHeader" :manualCopy="MatchedDifferentVehicleAlertBody" v-if="isCarIdDifferent" alertClass="alert-warning" />
-        <funnelFooter ref="funnelFooter" cmsWidgetName="FunnelFooterWidget" :isForwardActionDisabled="!meta.valid" @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" />
+      </div>
+      <alert
+        class="my-3"
+        cmsWidgetName="NoMatchAlertWidget"
+        v-if="!isVinValid"
+        alertClass="alert-danger"
+      />
+      <alert
+        class="my-3"
+        :manualHeadline="MatchedDifferentVehicleAlertHeader"
+        :manualCopy="MatchedDifferentVehicleAlertBody"
+        v-if="isCarIdDifferent"
+        alertClass="alert-warning"
+      />
+      <funnelFooter
+        ref="funnelFooter"
+        cmsWidgetName="FunnelFooterWidget"
+        :isForwardActionDisabled="!meta.valid"
+        @back-clicked="backButtonAction"
+        @ForwardClicked="forwardButtonAction"
+      />
     </div>
-</Form>
+  </Form>
 </template>
 
 <script>
@@ -131,46 +187,6 @@ export default {
   mounted() {
     this.attachCustomEvents();
   },
-  computed: {
-    MatchedDifferentVehicleAlertHeader() {
-      let text = this.getCmsContent(
-        "MatchedDifferentVehicleAlertWidget",
-        "HeadlineText"
-      ).replaceAll("{custom:damage}", getDamageString());
-
-        // Settle promises and get results
-        const promiseResultMap = [{
-            resultKey: "cmsContent",
-            promise: cmsContentPromise,
-        }, ];
-
-        const resultMap = await settleAllPromises(promiseResultMap);
-
-        // Call the "next" function to complete the transition to this page.
-        next((vm) => {
-            vm.setCmsContent(resultMap.cmsContent);
-        });
-    },
-    props: {
-        validationRules: String,
-    },
-    data() {
-        return {
-            isRegistrationZipServicable: true,
-            isVinValid: true,
-            isCarIdDifferent: false,
-            licensePlate: this.getLicensePlateFromStore(),
-            registrationZip: this.getRegistrationZipFromStore(),
-            email: this.getEmailFromStore(),
-            serviceZip: this.getServiceZipFromStore(),
-            previouslyEnteredCarId: "",
-            customAlertData: {},
-            isSelectedGlassAvailableForVehicle: true,
-        };
-    },
-    mounted() {
-        this.attachCustomEvents();
-    },
     computed: {
         MatchedDifferentVehicleAlertHeader() {
             let text = this.getCmsContent(
@@ -382,5 +398,5 @@ export default {
         alert,
         funnelFooter,
     },
-};
+}
 </script>