diff --git a/src/layouts/tpa-confirmation/tpa-confirmation.vue b/src/layouts/tpa-confirmation/tpa-confirmation.vue
index 73e6c5cf..57f9e69d 100644
--- a/src/layouts/tpa-confirmation/tpa-confirmation.vue
+++ b/src/layouts/tpa-confirmation/tpa-confirmation.vue
@@ -6,7 +6,9 @@
         @invalidSubmit="onInvalidSubmit">
         <div class="page-container-grouped-styles">
             <div class="fade-on-route-transition position-relative">
-                <siteHeader cmsWidgetName="SiteHeaderWidget" />
+                <siteHeader
+                    ref="tpaConfirmationSiteHeader"
+                    cmsWidgetName="SiteHeaderWidget" />
                 <div class="container-fluid px-5 pb-2 confirmation">
                     <vehicleBanner
                         class="mb-4"
@@ -27,43 +29,27 @@
                         id="tpaConfirmationBodyTwo"
                         ref="tpaConfirmationBodyTwo"
                         :customText="tpaConfirmationBodyTwo"
-                        class="small text-color--darker-gray mb-4" />
+                        class="small mb-4" />
                     <textBlock
                         id="contactCarrierText"
                         ref="contactCarrierText"
                         :customText="contactCarrierText"
-                        class="small text-color--darker-gray"
+                        class="small"
                         @click="setBailoutInfo()" />
-                    <!-- <div class="contact-carrier">
-                        <span
-                        v-for="copy in splitContactCarrierText"
-                        :key="copy">
-                            <span v-if="doesCopyContainRouterLink(copy)">
-                                <routerLink
-                                    :to="{
-                                        query: { issPage: `${getRouterLinkRouteFromCopy(copy)}` },
-                                        name: 'root',
-                                }">{{ getRouterLinkDisplayTextFromCopy(copy) }}</routerLink>
-                        </span>
-                        <span
-                            v-else
-                            v-html="copy">
-                        </span>
-                    </span>
-                    </div> -->
-                    <div>
+                    <div
+                        id="confirmationOrderDetailsSection"
+                        ref="confirmationOrderDetailsSection">
                         <textBlock
                             id="tpaConfirmationOrderDetailsTitle"
                             ref="tpaConfirmationOrderDetailsTitle"
                             :customText="orderDetailsTitle"
-                            :marginTopSizeOverride="4"
-                            class="order-details" />
+                            :marginTopSizeOverride="4" />
                         <textBlock
                             id="tpaSubmitOrderDetailsBody"
                             ref="tpaSubmitOrderDetailsBody"
                             :customText="orderDetailsBody"
                             :marginTopSizeOverride="4"
-                            class="mb-4 small text-color--darker-gray" />
+                            class="mb-4 small" />
                         <deductibleBox
                             ref="deductibleBox"
                             :value="deductibleBoxValue" />
@@ -110,7 +96,6 @@ export default {
         siteHeader,
         siteFooter,
         vehicleBanner,
-        // siteSubHeader,
         textBlock,
         deductibleBox,
         // eslint-disable-next-line vue/no-reserved-component-names
@@ -137,25 +122,19 @@ export default {
         return { mainStore };
     },
     data() {
-        // const { companyName } = toTitleCase(useMainStore().order.serviceLocation.provider.companyName ?? '');
         return {
             widget: {
                 tpaConfirmation: 'TPAConfirmationContent',
                 orderDetails: 'OrderDetailsContent',
                 contactCarrier: 'ContactCarrierContent'
             }
-            // companyName,
-            // customValueMap: {
-            //     glassShop: companyName,
-            //     carrierPhoneNumber
-            // }
         };
     },
     computed: {
         tpaConfirmationBodyOne() {
             return this.getCmsContent(this.widget.tpaConfirmation, widgetFields.CONTENT_GROUP_WIDGET.BODY_TEXT)
-                .replaceAll('{custom:phoneNumber}', this.preferredShopPhoneNumber)
-                .replaceAll('{custom:glassShop}', this.preferredShopName);
+                ?.replaceAll('{custom:phoneNumber}', this.preferredShopPhoneNumber)
+                ?.replaceAll('{custom:glassShop}', this.preferredShopName);
         },
         tpaConfirmationBodyTwo() {
             return this.getCmsContent(this.widget.tpaConfirmation, widgetFields.CONTENT_GROUP_WIDGET.BODY_TEXT_2);
@@ -187,16 +166,16 @@ export default {
         },
         tpaConfirmationSubheaderText() {
             return this.getCmsContent('TPAConfirmationContent', 'SubheaderText')
-                .replaceAll('{custom:glassShop}', this.preferredShopName);
+                ?.replaceAll('{custom:glassShop}', this.preferredShopName);
         },
         tpaConfirmationImage() {
             return this.getCmsContent('TPAConfirmationContent', 'Image');
         },
         contactCarrierText() {
             return this.getCmsContent(this.widget.contactCarrier, widgetFields.TEXT_BLOCK_WIDGET.TEXT)
-                .replaceAll('{custom:carrierPhoneNumber}', this.carrierPhoneNumber);
+                ?.replaceAll('{custom:carrierPhoneNumber}', this.carrierPhoneNumber);
         },
-        // TODO: Replace with carrier number when account service is ready
+        // TODO: Replace with actual carrier number when account service is ready
         carrierPhoneNumber() {
             return '800-000-0000';
         },
@@ -205,7 +184,7 @@ export default {
         }
     },
     mounted() {
-        this.$refs.siteFooter.updateButtonText(`Go back to ${this.carrierName}`);
+        this.$refs.siteFooter?.updateButtonText(`Go back to ${this.carrierName}`);
     },
     methods:
         {
@@ -270,7 +249,6 @@ export default {
     margin-top: 0;
 
     :deep(p) {
-        color: $darker-gray;
         line-height: 1.5rem;
         font-size: 14px;
 
@@ -286,11 +264,11 @@ export default {
 }
 
 #tpaConfirmationOrderDetailsTitle {
-    font-weight: 500;
-    line-height: 1.25rem;
-    color: $black;
-    margin-bottom: 1rem;
-    margin-top: 2rem;
+   font-weight: 500;
+   line-height: 1.5rem;
+   color: $black;
+   margin-bottom: 1rem;
+   margin-top: 2rem;
 }
 
 #contactCarrierText {