diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue
index 36f072c6..c37fde79 100644
--- a/src/layouts/payment-page/payment-page.vue
+++ b/src/layouts/payment-page/payment-page.vue
@@ -38,71 +38,192 @@
     </Form>
 
     <form
-        ref="hopForm"
         id="card-data"
+        ref="hopForm"
         :target="isPaypal ? '_top' : 'card-frame'"
         method="POST"
         :action="checkoutUrl">
-        <input type="hidden" name="paymentType" :value="paymentType" />
-        <input type="hidden" name="sgSessionId" :value="authToken" />
-        <input type="hidden" name="sgAuthToken" :value="authToken" />
-        <input type="hidden" name="sgSignaturePublic" :value="authSignature" />
-        <input type="hidden" name="sgSignatureStartDate" :value="authSignatureStart" />
-        <input type="hidden" name="referralSeqNum" :value="referralSequenceNumber" />
-
-        <input type="hidden" name="sge_commerce_indicator_isinternet" value="true" />
-        <input type="hidden" name="sghopsource" value="Safelite.com" />
-        <input type="hidden" name="sgHtmlStyle" value="ResourceSafeliteHtml" />
-        <input type="hidden" name="sgErrorMessagesEmbedded" value="true" />
-
-        <input type="hidden" name="sgNoKeystrokeProcessing" value="false" />
-
-        <input type="hidden" name="maskCharacter" value="*" />
-        <input type="hidden" name="styleSheetCode" :value="dynamicCSSUrl" />
-        <input type="hidden" name="styleSheetCode2" :value="dynamicHopCSSUrl" />
-
-        <input type="hidden" name="sgReceiptResponseURL" :value="payInAdvanceResponseUrl" />
-        <input type="hidden" name="sgDeclineResponseURL" :value="payInAdvanceResponseUrl" />
-        <input type="hidden" name="sgErrorResponseURL" :value="payInAdvanceResponseUrl" />
-
-        <input type="hidden" name="sgheaderline1" :value="getHeaderLine1" />
-        <input type="hidden" name="sgHeader1subtitle" value="" />
-        <input type="hidden" name="sgheaderline2" :value="getHeaderLine2" />
-        <input type="hidden" name="sgheaderline3" value="" />
-        <input type="hidden" name="sgheaderline4" value="" />
-        <input type="hidden" name="sgheaderline5" value="*Required information" />
-
-        <input type="hidden" name="billTo_firstName" :value="firstName" />
-        <input type="hidden" name="billTo_firstNameShow" value="true" />
-        <input type="hidden" name="sghopmiddleInitialShow" value="false" />
-        <input type="hidden" name="billTo_lastName" :value="lastName" />
-        <input type="hidden" name="billTo_lastNameShow" value="true" />
-
-        <input type="hidden" name="billTo_street1" value="" />
-        <input type="hidden" name="billTo_street2" value="" />
-        <input type="hidden" name="billTo_city" value="" />
-        <input type="hidden" name="billTo_state" value="" />
-
-        <input type="hidden" name="billTo_postalCode" value="" />
-        <input type="hidden" name="billTo_postalCodeShow" value="true" />
-        <input type="hidden" name="billTo_postalCodeEnable" value="true" />
-        <input type="hidden" name="sgLabelPostalCode" value="Billing ZIP" />
-
-        <input type="hidden" name="sgtotalamount" :value="displayAmount" />
-        <input type="hidden" name="totalAmountDecimal" :value="totalAmount" />
-        <input type="hidden" name="lineItems" :value="payInAdvanceLineItems" />
-
-        <input type="hidden" name="sgdiscountstrikethruamount" value="" />
-
-        <input type="hidden" name="callerDisplayText" value="" />
+        <input
+            type="hidden"
+            name="paymentType"
+            :value="paymentType" />
+        <input
+            type="hidden"
+            name="sgSessionId"
+            :value="authToken" />
+        <input
+            type="hidden"
+            name="sgAuthToken"
+            :value="authToken" />
+        <input
+            type="hidden"
+            name="sgSignaturePublic"
+            :value="authSignature" />
+        <input
+            type="hidden"
+            name="sgSignatureStartDate"
+            :value="authSignatureStart" />
+        <input
+            type="hidden"
+            name="referralSeqNum"
+            :value="referralSequenceNumber" />
+        <input
+            type="hidden"
+            name="sge_commerce_indicator_isinternet"
+            value="true" />
+        <input
+            type="hidden"
+            name="sghopsource"
+            value="Safelite.com" />
+        <input
+            type="hidden"
+            name="sgHtmlStyle"
+            value="ResourceSafeliteHtml" />
+        <input
+            type="hidden"
+            name="sgErrorMessagesEmbedded"
+            value="true" />
+        <input
+            type="hidden"
+            name="sgNoKeystrokeProcessing"
+            value="false" />
 
+        <input
+            type="hidden"
+            name="maskCharacter"
+            value="*" />
+        <input
+            type="hidden"
+            name="styleSheetCode"
+            :value="dynamicCSSUrl" />
+        <input
+            type="hidden"
+            name="styleSheetCode2"
+            :value="dynamicHopCSSUrl" />
+        <input
+            type="hidden"
+            name="sgReceiptResponseURL"
+            :value="payInAdvanceResponseUrl" />
+        <input
+            type="hidden"
+            name="sgDeclineResponseURL"
+            :value="payInAdvanceResponseUrl" />
+        <input
+            type="hidden"
+            name="sgErrorResponseURL"
+            :value="payInAdvanceResponseUrl" />
+        <input
+            type="hidden"
+            name="sgheaderline1"
+            :value="getHeaderLine1" />
+        <input
+            type="hidden"
+            name="sgHeader1subtitle"
+            value="" />
+        <input
+            type="hidden"
+            name="sgheaderline2"
+            :value="getHeaderLine2" />
+        <input
+            type="hidden"
+            name="sgheaderline3"
+            value="" />
+        <input
+            type="hidden"
+            name="sgheaderline4"
+            value="" />
+        <input
+            type="hidden"
+            name="sgheaderline5"
+            value="*Required information" />
+        <input
+            type="hidden"
+            name="billTo_firstName"
+            :value="firstName" />
+        <input
+            type="hidden"
+            name="billTo_firstNameShow"
+            value="true" />
+        <input
+            type="hidden"
+            name="sghopmiddleInitialShow"
+            value="false" />
+        <input
+            type="hidden"
+            name="billTo_lastName"
+            :value="lastName" />
+        <input
+            type="hidden"
+            name="billTo_lastNameShow"
+            value="true" />
+        <input
+            type="hidden"
+            name="billTo_street1"
+            value="" />
+        <input
+            type="hidden"
+            name="billTo_street2"
+            value="" />
+        <input
+            type="hidden"
+            name="billTo_city"
+            value="" />
+        <input
+            type="hidden"
+            name="billTo_state"
+            value="" />
+        <input
+            type="hidden"
+            name="billTo_postalCode"
+            value="" />
+        <input
+            type="hidden"
+            name="billTo_postalCodeShow"
+            value="true" />
+        <input
+            type="hidden"
+            name="billTo_postalCodeEnable"
+            value="true" />
+        <input
+            type="hidden"
+            name="sgLabelPostalCode"
+            value="Billing ZIP" />
+        <input
+            type="hidden"
+            name="sgtotalamount"
+            :value="displayAmount" />
+        <input
+            type="hidden"
+            name="totalAmountDecimal"
+            :value="totalAmount" />
+        <input
+            type="hidden"
+            name="lineItems"
+            :value="payInAdvanceLineItems" />
+        <input
+            type="hidden"
+            name="sgdiscountstrikethruamount"
+            value="" />
+        <input
+            type="hidden"
+            name="callerDisplayText"
+            value="" />
         <input
             type="hidden"
             name="sgtermsofusedisplaytext"
             value="By selecting submit, I agree to Safelite's" />
-        <input type="hidden" name="sgtermsofuseurl" value="http://www.safelite.com/terms-of-use/" />
-        <input type="hidden" name="sgtermsofuselinkdisplaytext" value="terms of use" />
-        <input type="hidden" name="sgtermsofcancelrefunddisplaytext" value="and" />
+        <input
+            type="hidden"
+            name="sgtermsofuseurl"
+            value="http://www.safelite.com/terms-of-use/" />
+        <input
+            type="hidden"
+            name="sgtermsofuselinkdisplaytext"
+            value="terms of use" />
+        <input
+            type="hidden"
+            name="sgtermsofcancelrefunddisplaytext"
+            value="and" />
         <input
             type="hidden"
             name="sgtermsofcancelrefundlinkdisplaytext"
@@ -111,7 +232,6 @@
             type="hidden"
             name="sgtermsofcancelrefundurl"
             value="http://www.safelite.com/cancellation-refund-policy" />
-
         <input
             type="hidden"
             name="sgErrorMessageCardVerification"
@@ -120,42 +240,122 @@
             type="hidden"
             name="sgErrorMessageTimeOut"
             value="For your security, this transaction has been timed out." />
-
-        <input type="hidden" name="sgLabelCardNumber" value="" />
-        <input type="hidden" name="sgLabelAddressLine1" :value="address1" />
-        <input type="hidden" name="sgLabelAddressLine2" :value="address2" />
-        <input type="hidden" name="sgLabelCity" :value="city" />
-        <input type="hidden" name="sgLabelState" :value="state" />
-
-        <input type="hidden" name="sgCtu" :value="ctu" />
-        <input type="hidden" name="sgWorkOrder" :value="workOrderNumber" />
-        <input type="hidden" name="sgEmailAddress" :value="emailAddress" />
-        <input type="hidden" name="paypalInvoiceNumber" :value="invoiceNumber" />
-        <input type="hidden" name="paypalSuccessUrl" :value="payInAdvanceResponseUrl" />
-        <input type="hidden" name="paypalCancelUrl" :value="payInAdvanceCancelUrl" />
-
-        <input type="hidden" name="sgCCDeclineURL" :value="payInAdvanceCancelUrl" />
-        <input type="hidden" name="sgCCTimeoutURL" :value="payInAdvanceCancelUrl" />
-
-        <input type="hidden" name="sgTransactionType" value="authorization" />
-        <input type="hidden" name="amount" :value="totalAmount" />
-        <input type="hidden" name="ctu" :value="ctu" />
-        <input type="hidden" name="orderNumber" :value="workOrderNumber" />
-
-        <input type="hidden" name="billTo_email" :value="emailAddress" />
-        <input type="hidden" name="useDecisionManager" value="True" />
-        <input type="hidden" name="correlationId" :value="referralCorrelationId" />
-        <input type="hidden" name="sgErrorMessageCard_CVN" value="Please enter a valid CVV" />
-
-        <input type="hidden" name="ship_to_address_line1" :value="address1" />
-        <input type="hidden" name="ship_to_address_line2" :value="address2" />
-        <input type="hidden" name="ship_to_address_city" :value="city" />
-        <input type="hidden" name="ship_to_address_state" :value="state" />
-        <input type="hidden" name="ship_to_address_country" value="US" />
-        <input type="hidden" name="ship_to_address_postal_code" :value="zipCode" />
-        <input type="hidden" name="ship_to_phone" :value="phoneNumber" />
-
-        <input type="hidden" name="calling_application" value="ISSNextGen" />
+        <input
+            type="hidden"
+            name="sgLabelCardNumber"
+            value="" />
+        <input
+            type="hidden"
+            name="sgLabelAddressLine1"
+            :value="address1" />
+        <input
+            type="hidden"
+            name="sgLabelAddressLine2"
+            :value="address2" />
+        <input
+            type="hidden"
+            name="sgLabelCity"
+            :value="city" />
+        <input
+            type="hidden"
+            name="sgLabelState"
+            :value="state" />
+        <input
+            type="hidden"
+            name="sgCtu"
+            :value="ctu" />
+        <input
+            type="hidden"
+            name="sgWorkOrder"
+            :value="workOrderNumber" />
+        <input
+            type="hidden"
+            name="sgEmailAddress"
+            :value="emailAddress" />
+        <input
+            type="hidden"
+            name="paypalInvoiceNumber"
+            :value="invoiceNumber" />
+        <input
+            type="hidden"
+            name="paypalSuccessUrl"
+            :value="payInAdvanceResponseUrl" />
+        <input
+            type="hidden"
+            name="paypalCancelUrl"
+            :value="payInAdvanceCancelUrl" />
+        <input
+            type="hidden"
+            name="sgCCDeclineURL"
+            :value="payInAdvanceCancelUrl" />
+        <input
+            type="hidden"
+            name="sgCCTimeoutURL"
+            :value="payInAdvanceCancelUrl" />
+        <input
+            type="hidden"
+            name="sgTransactionType"
+            value="authorization" />
+        <input
+            type="hidden"
+            name="amount"
+            :value="totalAmount" />
+        <input
+            type="hidden"
+            name="ctu"
+            :value="ctu" />
+        <input
+            type="hidden"
+            name="orderNumber"
+            :value="workOrderNumber" />
+        <input
+            type="hidden"
+            name="billTo_email"
+            :value="emailAddress" />
+        <input
+            type="hidden"
+            name="useDecisionManager"
+            value="True" />
+        <input
+            type="hidden"
+            name="correlationId"
+            :value="referralCorrelationId" />
+        <input
+            type="hidden"
+            name="sgErrorMessageCard_CVN"
+            value="Please enter a valid CVV" />
+        <input
+            type="hidden"
+            name="ship_to_address_line1"
+            :value="address1" />
+        <input
+            type="hidden"
+            name="ship_to_address_line2"
+            :value="address2" />
+        <input
+            type="hidden"
+            name="ship_to_address_city"
+            :value="city" />
+        <input
+            type="hidden"
+            name="ship_to_address_state"
+            :value="state" />
+        <input
+            type="hidden"
+            name="ship_to_address_country"
+            value="US" />
+        <input
+            type="hidden"
+            name="ship_to_address_postal_code"
+            :value="zipCode" />
+        <input
+            type="hidden"
+            name="ship_to_phone"
+            :value="phoneNumber" />
+        <input
+            type="hidden"
+            name="calling_application"
+            value="ISSNextGen" />
     </form>
 </template>
 <script>