From 618fafe1d55f28248ca5980cb8242a8a92c81fa3 Mon Sep 17 00:00:00 2001
From: justin <justin@liquidator.optimal-reality.com>
Date: Thu, 25 Jun 2026 11:32:48 -0500
Subject: [PATCH] order: payment-first express checkout + fix dead Tawk chat
 widget

Conversion fix for the checkout drop-off (54 sessions reached an /order/ page
over 3 days, 0 advanced to payment). Root cause was friction, not a bug: every
order page dropped a cold email-click straight into a 28-field intake Wizard
before showing any payment option.

- New ExpressCheckout.astro: payment-first entry. Shows price + the minimal
  fields the API needs (prefilled from public records: ?dot= FMCSA census for
  trucking, ?npi= NPPES lookup for healthcare) + Continue to payment. Creates a
  single-service batch-of-one (POST /compliance-orders/batch, which does NOT
  gate Stripe on intake_data_validated) then create-session -> Stripe. Full
  intake is collected AFTER payment via the per-service 'Complete Your Intake
  Form' email the webhook already sends (links to /order/<slug>?order=CO-xxx,
  which re-enters the Wizard in paid-intake mode).

- New OrderFlow.astro: single source of truth replacing ~50 near-identical thin
  Wizard wrappers. Trucking + healthcare default to payment-first (express on
  top, marketing hero moved BELOW the CTA). Telecom + corporate keep Wizard-first
  (rich pre-payment FCC/499 intake, no public-records prefill). Paid-intake
  re-entry (?order=/?token=) always renders the full Wizard.

- Rewrote all 50 /order/*.astro pages to use OrderFlow (foreign-qualification
  keeps its multi-state toggle via slotted content).

- Fixed the dead Tawk.to live-chat widget site-wide: the snippet set an invalid
  crossorigin='*' attribute, forcing the browser into anonymous CORS mode and
  blocking the script (0 chat requests fired anywhere). Removed it to match
  Tawk's official snippet (footer partial + 73 static public/*.html files).

Verified: build clean; express on top with hero below; ?dot=/?npi= prefill;
paid-intake re-entry swaps to Wizard; telecom stays wizard-first; batch-of-one
-> live Stripe URL; both POST endpoints allow the prod origin via CORS.
---
 site/public/404.html                          |   2 +-
 site/public/about/index.html                  |   2 +-
 site/public/accessibility/index.html          |   2 +-
 site/public/account/reset-password/index.html |   2 +-
 site/public/admin/index.html                  |   2 +-
 site/public/contact/index.html                |   2 +-
 site/public/index.html                        |   2 +-
 site/public/order/canada-crtc/index.html      |   2 +-
 site/public/order/cancel/index.html           |   2 +-
 site/public/order/cancelled/index.html        |   2 +-
 site/public/order/crypto-pay/index.html       |   2 +-
 site/public/order/dot-compliance/index.html   |   2 +-
 site/public/order/fcc-499a/index.html         |   2 +-
 site/public/order/fcc-499q/index.html         |   2 +-
 .../order/fcc-carrier-registration/index.html |   2 +-
 site/public/order/fcc-compliance/index.html   |   2 +-
 site/public/order/formation/index.html        |   2 +-
 .../public/order/identity-complete/index.html |   2 +-
 site/public/order/neca-ocn/index.html         |   2 +-
 site/public/order/state-puc/index.html        |   2 +-
 site/public/order/success/index.html          |   2 +-
 .../order/trucking-new-carrier/index.html     |   2 +-
 site/public/portal/domain-search/index.html   |   2 +-
 site/public/portal/manage-services/index.html |   2 +-
 site/public/portal/setup/index.html           |   2 +-
 site/public/portal/sign/index.html            |   2 +-
 site/public/pricing/bundles/index.html        |   2 +-
 site/public/pricing/index.html                |   2 +-
 site/public/privacy/index.html                |   2 +-
 site/public/security/index.html               |   2 +-
 .../corporate/annual-reports/index.html       |   2 +-
 .../dexit-reincorporation/index.html          |   2 +-
 .../services/corporate/formation/index.html   |   2 +-
 site/public/services/corporate/index.html     |   2 +-
 .../corporate/registered-agent/index.html     |   2 +-
 .../corporate/state-registration/index.html   |   2 +-
 .../contractor-classification/index.html      |   2 +-
 .../services/employment/flsa-audit/index.html |   2 +-
 .../employment/handbook-review/index.html     |   2 +-
 site/public/services/employment/index.html    |   2 +-
 .../employment/policy-development/index.html  |   2 +-
 site/public/services/index.html               |   2 +-
 .../privacy/breach-response/index.html        |   2 +-
 .../services/privacy/ccpa-audit/index.html    |   2 +-
 .../services/privacy/data-mapping/index.html  |   2 +-
 site/public/services/privacy/index.html       |   2 +-
 .../privacy/privacy-policy/index.html         |   2 +-
 .../services/tcpa/campaign-review/index.html  |   2 +-
 .../services/tcpa/consent-audit/index.html    |   2 +-
 .../services/tcpa/dnc-compliance/index.html   |   2 +-
 site/public/services/tcpa/index.html          |   2 +-
 .../services/telecom/canada-crtc/index.html   |   2 +-
 site/public/services/telecom/cpni/index.html  |   2 +-
 .../telecom/database-management/index.html    |   2 +-
 .../services/telecom/fcc-499a/index.html      |   2 +-
 .../guides/cores-registration/index.html      |   2 +-
 .../guides/cpni-certification/index.html      |   2 +-
 .../telecom/guides/fcc-499a/index.html        |   2 +-
 .../telecom/guides/fcc-499q/index.html        |   2 +-
 .../telecom/guides/rmd-filing/index.html      |   2 +-
 .../guides/usac-account-setup/index.html      |   2 +-
 site/public/services/telecom/index.html       |   2 +-
 .../services/telecom/ipes-isp/index.html      |   2 +-
 .../services/telecom/state-puc/index.html     |   2 +-
 .../services/telecom/stir-shaken/index.html   |   2 +-
 site/public/terms/index.html                  |   2 +-
 site/public/tools/contractor-quiz/index.html  |   2 +-
 .../public/tools/corporation-check/index.html |   2 +-
 .../tools/dot-compliance-check/index.html     |   2 +-
 .../tools/fcc-compliance-check/index.html     |   2 +-
 site/public/tools/formation-guide/index.html  |   2 +-
 site/public/tools/privacy-check/index.html    |   2 +-
 site/public/tools/tcpa-check/index.html       |   2 +-
 .../components/intake/ExpressCheckout.astro   | 363 ++++++++++++++++++
 site/src/components/intake/OrderFlow.astro    | 157 ++++++++
 site/src/pages/order/bdc-broadband.astro      |  33 +-
 site/src/pages/order/bdc-filing.astro         |  33 +-
 site/src/pages/order/bdc-voice.astro          |  33 +-
 site/src/pages/order/boc3-filing.astro        |  31 +-
 site/src/pages/order/ca-mcp-carb.astro        |  30 +-
 site/src/pages/order/calea-ssi.astro          |  33 +-
 site/src/pages/order/cdr-analysis.astro       |  33 +-
 site/src/pages/order/clia-renewal.astro       |  27 +-
 .../pages/order/cores-frn-registration.astro  |  33 +-
 site/src/pages/order/cpni-certification.astro |  33 +-
 site/src/pages/order/ct-highway-use-fee.astro |  30 +-
 site/src/pages/order/dc-agent.astro           |  33 +-
 site/src/pages/order/dot-audit-prep.astro     |  31 +-
 site/src/pages/order/dot-drug-alcohol.astro   |  31 +-
 .../src/pages/order/dot-full-compliance.astro |  31 +-
 site/src/pages/order/dot-registration.astro   |  31 +-
 site/src/pages/order/fcc-499-initial.astro    |  33 +-
 site/src/pages/order/fcc-499a-499q.astro      |  33 +-
 site/src/pages/order/fcc-499a.astro           |  33 +-
 .../pages/order/fcc-63-11-notification.astro  |  33 +-
 .../pages/order/fcc-compliance-checkup.astro  |  33 +-
 .../src/pages/order/fcc-full-compliance.astro |  33 +-
 .../pages/order/foreign-qualification.astro   |  72 ++--
 site/src/pages/order/hazmat-phmsa.astro       |  30 +-
 site/src/pages/order/ifta-application.astro   |  30 +-
 site/src/pages/order/ifta-quarterly.astro     |  30 +-
 .../pages/order/intrastate-authority.astro    |  30 +-
 site/src/pages/order/irp-registration.astro   |  30 +-
 .../src/pages/order/ky-kyu-registration.astro |  30 +-
 site/src/pages/order/mc-authority.astro       |  31 +-
 site/src/pages/order/mcs150-update.astro      |  31 +-
 .../src/pages/order/medicare-enrollment.astro |  32 +-
 site/src/pages/order/new-carrier-bundle.astro |  35 +-
 site/src/pages/order/nm-weight-distance.astro |  30 +-
 site/src/pages/order/npi-reactivation.astro   |  32 +-
 site/src/pages/order/npi-revalidation.astro   |  32 +-
 site/src/pages/order/nppes-update.astro       |  32 +-
 .../src/pages/order/ny-hut-registration.astro |  30 +-
 site/src/pages/order/ocn-registration.astro   |  33 +-
 site/src/pages/order/oig-sam-screening.astro  |  32 +-
 site/src/pages/order/or-weight-mile-tax.astro |  30 +-
 site/src/pages/order/osow-permit.astro        |  30 +-
 .../order/provider-compliance-bundle.astro    |  32 +-
 site/src/pages/order/rmd-filing.astro         |  35 +-
 .../pages/order/state-dot-registration.astro  |  30 +-
 site/src/pages/order/state-emissions.astro    |  30 +-
 .../pages/order/state-trucking-bundle.astro   |  30 +-
 site/src/pages/order/stir-shaken.astro        |  33 +-
 site/src/pages/order/ucr-registration.astro   |  31 +-
 site/src/pages/order/usdot-reactivation.astro |  30 +-
 site/src/partials/footer.html                 |   1 -
 126 files changed, 766 insertions(+), 1518 deletions(-)
 create mode 100644 site/src/components/intake/ExpressCheckout.astro
 create mode 100644 site/src/components/intake/OrderFlow.astro

diff --git a/site/public/404.html b/site/public/404.html
index 5ba7ac9..1068d96 100644
--- a/site/public/404.html
+++ b/site/public/404.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> </body> </html>
\ No newline at end of file
diff --git a/site/public/about/index.html b/site/public/about/index.html
index e2a6c5e..06e2553 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -81,7 +81,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/accessibility/index.html b/site/public/accessibility/index.html
index 4d2d356..0e24a79 100644
--- a/site/public/accessibility/index.html
+++ b/site/public/accessibility/index.html
@@ -75,7 +75,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/account/reset-password/index.html b/site/public/account/reset-password/index.html
index f099099..7f05fd8 100644
--- a/site/public/account/reset-password/index.html
+++ b/site/public/account/reset-password/index.html
@@ -64,7 +64,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/admin/index.html b/site/public/admin/index.html
index 07c3d20..8fb49bc 100644
--- a/site/public/admin/index.html
+++ b/site/public/admin/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/contact/index.html b/site/public/contact/index.html
index 828d8b9..25968e0 100644
--- a/site/public/contact/index.html
+++ b/site/public/contact/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/index.html b/site/public/index.html
index ea2e4d4..39227f4 100644
--- a/site/public/index.html
+++ b/site/public/index.html
@@ -80,7 +80,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/order/canada-crtc/index.html b/site/public/order/canada-crtc/index.html
index 1689b4d..981e299 100644
--- a/site/public/order/canada-crtc/index.html
+++ b/site/public/order/canada-crtc/index.html
@@ -110,7 +110,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/order/cancel/index.html b/site/public/order/cancel/index.html
index 3a71910..f9b003c 100644
--- a/site/public/order/cancel/index.html
+++ b/site/public/order/cancel/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html> 
\ No newline at end of file
diff --git a/site/public/order/cancelled/index.html b/site/public/order/cancelled/index.html
index a3906cb..18bb114 100644
--- a/site/public/order/cancelled/index.html
+++ b/site/public/order/cancelled/index.html
@@ -64,7 +64,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html> 
\ No newline at end of file
diff --git a/site/public/order/crypto-pay/index.html b/site/public/order/crypto-pay/index.html
index b63bc20..e0a0b4a 100644
--- a/site/public/order/crypto-pay/index.html
+++ b/site/public/order/crypto-pay/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html> 
\ No newline at end of file
diff --git a/site/public/order/dot-compliance/index.html b/site/public/order/dot-compliance/index.html
index d2ec0f2..3c51c1d 100644
--- a/site/public/order/dot-compliance/index.html
+++ b/site/public/order/dot-compliance/index.html
@@ -753,7 +753,7 @@ document.getElementById("pw-batch-form").addEventListener("submit", function(e)
     });
 });
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/fcc-499a/index.html b/site/public/order/fcc-499a/index.html
index 11a501b..9096a20 100644
--- a/site/public/order/fcc-499a/index.html
+++ b/site/public/order/fcc-499a/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/order/fcc-499q/index.html b/site/public/order/fcc-499q/index.html
index 1f3b37b..0d57fb8 100644
--- a/site/public/order/fcc-499q/index.html
+++ b/site/public/order/fcc-499q/index.html
@@ -231,7 +231,7 @@ input:focus{outline:none;border-color:#1e3a5f;box-shadow:0 0 0 2px rgba(30,58,95
   });
 })();
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/fcc-carrier-registration/index.html b/site/public/order/fcc-carrier-registration/index.html
index 4b009ad..e955741 100644
--- a/site/public/order/fcc-carrier-registration/index.html
+++ b/site/public/order/fcc-carrier-registration/index.html
@@ -1050,7 +1050,7 @@ select:focus,input:focus{outline:none;border-color:#1e3a5f;box-shadow:0 0 0 2px
   })();
 })();
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/fcc-compliance/index.html b/site/public/order/fcc-compliance/index.html
index f8b8cbb..4219805 100644
--- a/site/public/order/fcc-compliance/index.html
+++ b/site/public/order/fcc-compliance/index.html
@@ -514,7 +514,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/order/formation/index.html b/site/public/order/formation/index.html
index d920789..f4f2a14 100644
--- a/site/public/order/formation/index.html
+++ b/site/public/order/formation/index.html
@@ -87,7 +87,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/order/identity-complete/index.html b/site/public/order/identity-complete/index.html
index 5deca1d..6dadd05 100644
--- a/site/public/order/identity-complete/index.html
+++ b/site/public/order/identity-complete/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html><html lang="en" data-astro-cid-bhlkm3xi> <head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Identity Verification — Performance West Inc.</title><meta name="robots" content="noindex, nofollow"><link rel="icon" type="image/svg+xml" href="/favicon.svg"><link rel="stylesheet" href="/_astro/about.DhmoKVOS.css">
 <style>body{font-family:system-ui,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#f9fafb}.card[data-astro-cid-bhlkm3xi]{background:#fff;border-radius:1rem;padding:2.5rem;max-width:28rem;width:100%;margin:1rem;text-align:center;box-shadow:0 1px 3px #0000001a}.spinner[data-astro-cid-bhlkm3xi]{width:2.5rem;height:2.5rem;border:3px solid #e5e7eb;border-top-color:#1e40af;border-radius:50%;animation:spin .8s linear infinite;margin:0 auto 1.5rem}@keyframes spin{to{transform:rotate(360deg)}}h1[data-astro-cid-bhlkm3xi]{font-size:1.125rem;font-weight:600;color:#111827;margin:0 0 .5rem}p[data-astro-cid-bhlkm3xi]{font-size:.875rem;color:#6b7280;margin:0}
 </style><script type="module">(function(){const e=new URLSearchParams(window.location.search),s=e.get("session_id")||e.get("VERIFICATION_SESSION_ID");s&&sessionStorage.setItem("pw_identity_session",s);const n=sessionStorage.getItem("pw_order_return_url")||"/order/canada-crtc";window.location.replace(n+(n.includes("?")?"&":"?")+"identity_return=1")})();
-</script></head> <body data-astro-cid-bhlkm3xi> <div class="card" data-astro-cid-bhlkm3xi> <div class="spinner" data-astro-cid-bhlkm3xi></div> <h1 data-astro-cid-bhlkm3xi>Returning to your order...</h1> <p data-astro-cid-bhlkm3xi>Processing your verification result. Please wait.</p> </div>  <!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+</script></head> <body data-astro-cid-bhlkm3xi> <div class="card" data-astro-cid-bhlkm3xi> <div class="spinner" data-astro-cid-bhlkm3xi></div> <h1 data-astro-cid-bhlkm3xi>Returning to your order...</h1> <p data-astro-cid-bhlkm3xi>Processing your verification result. Please wait.</p> </div>  <!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/neca-ocn/index.html b/site/public/order/neca-ocn/index.html
index 3906165..5812e1a 100644
--- a/site/public/order/neca-ocn/index.html
+++ b/site/public/order/neca-ocn/index.html
@@ -316,7 +316,7 @@ select:focus,input:focus{outline:none;border-color:#1e3a5f;box-shadow:0 0 0 2px
   });
 })();
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/state-puc/index.html b/site/public/order/state-puc/index.html
index e0af0c4..78bcf82 100644
--- a/site/public/order/state-puc/index.html
+++ b/site/public/order/state-puc/index.html
@@ -496,7 +496,7 @@ select:focus,input:focus{outline:none;border-color:#1e3a5f;box-shadow:0 0 0 2px
   function esc(s) { const d = document.createElement('div'); d.textContent = s; return d.innerHTML; }
 })();
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/order/success/index.html b/site/public/order/success/index.html
index db5ebc8..2cfd955 100644
--- a/site/public/order/success/index.html
+++ b/site/public/order/success/index.html
@@ -163,7 +163,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script>
diff --git a/site/public/order/trucking-new-carrier/index.html b/site/public/order/trucking-new-carrier/index.html
index 9374ffc..25cee27 100644
--- a/site/public/order/trucking-new-carrier/index.html
+++ b/site/public/order/trucking-new-carrier/index.html
@@ -1305,7 +1305,7 @@ document.getElementById("pw-batch-form").addEventListener("submit", function(e)
     });
 });
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/portal/domain-search/index.html b/site/public/portal/domain-search/index.html
index 19ac32d..beb46bd 100644
--- a/site/public/portal/domain-search/index.html
+++ b/site/public/portal/domain-search/index.html
@@ -66,7 +66,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/portal/manage-services/index.html b/site/public/portal/manage-services/index.html
index 7c7778f..fd3cb1e 100644
--- a/site/public/portal/manage-services/index.html
+++ b/site/public/portal/manage-services/index.html
@@ -90,7 +90,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/portal/setup/index.html b/site/public/portal/setup/index.html
index 39ccae8..9395bca 100644
--- a/site/public/portal/setup/index.html
+++ b/site/public/portal/setup/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html> 
\ No newline at end of file
diff --git a/site/public/portal/sign/index.html b/site/public/portal/sign/index.html
index a8bc27b..51a6d3a 100644
--- a/site/public/portal/sign/index.html
+++ b/site/public/portal/sign/index.html
@@ -85,7 +85,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/pricing/bundles/index.html b/site/public/pricing/bundles/index.html
index ee1e82c..6f62e65 100644
--- a/site/public/pricing/bundles/index.html
+++ b/site/public/pricing/bundles/index.html
@@ -87,7 +87,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/pricing/index.html b/site/public/pricing/index.html
index 6808227..49ffa2a 100644
--- a/site/public/pricing/index.html
+++ b/site/public/pricing/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/privacy/index.html b/site/public/privacy/index.html
index ccbb35d..42c8e12 100644
--- a/site/public/privacy/index.html
+++ b/site/public/privacy/index.html
@@ -86,7 +86,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/security/index.html b/site/public/security/index.html
index cd112c4..25bde6a 100644
--- a/site/public/security/index.html
+++ b/site/public/security/index.html
@@ -81,7 +81,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/annual-reports/index.html b/site/public/services/corporate/annual-reports/index.html
index 0275864..3ee1a14 100644
--- a/site/public/services/corporate/annual-reports/index.html
+++ b/site/public/services/corporate/annual-reports/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/dexit-reincorporation/index.html b/site/public/services/corporate/dexit-reincorporation/index.html
index 7d826dd..a636258 100644
--- a/site/public/services/corporate/dexit-reincorporation/index.html
+++ b/site/public/services/corporate/dexit-reincorporation/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script><script>document.addEventListener('DOMContentLoaded',function(){var b=document.getElementById('dexit-questions-btn');if(b){b.addEventListener('click',function(){var f=document.getElementById('support-fab');if(f)f.click();});}});</script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/formation/index.html b/site/public/services/corporate/formation/index.html
index cc3f2e6..93d8ab8 100644
--- a/site/public/services/corporate/formation/index.html
+++ b/site/public/services/corporate/formation/index.html
@@ -78,7 +78,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/index.html b/site/public/services/corporate/index.html
index db7415c..771f611 100644
--- a/site/public/services/corporate/index.html
+++ b/site/public/services/corporate/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/registered-agent/index.html b/site/public/services/corporate/registered-agent/index.html
index f02079e..4035007 100644
--- a/site/public/services/corporate/registered-agent/index.html
+++ b/site/public/services/corporate/registered-agent/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/corporate/state-registration/index.html b/site/public/services/corporate/state-registration/index.html
index 00ac54a..d78f099 100644
--- a/site/public/services/corporate/state-registration/index.html
+++ b/site/public/services/corporate/state-registration/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/employment/contractor-classification/index.html b/site/public/services/employment/contractor-classification/index.html
index 9f8b4c8..9889d51 100644
--- a/site/public/services/employment/contractor-classification/index.html
+++ b/site/public/services/employment/contractor-classification/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/employment/flsa-audit/index.html b/site/public/services/employment/flsa-audit/index.html
index d81a6b4..bf73e63 100644
--- a/site/public/services/employment/flsa-audit/index.html
+++ b/site/public/services/employment/flsa-audit/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/employment/handbook-review/index.html b/site/public/services/employment/handbook-review/index.html
index ca41210..c8c28b9 100644
--- a/site/public/services/employment/handbook-review/index.html
+++ b/site/public/services/employment/handbook-review/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/employment/index.html b/site/public/services/employment/index.html
index d681df9..b2fc24f 100644
--- a/site/public/services/employment/index.html
+++ b/site/public/services/employment/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/employment/policy-development/index.html b/site/public/services/employment/policy-development/index.html
index 673eff3..703fece 100644
--- a/site/public/services/employment/policy-development/index.html
+++ b/site/public/services/employment/policy-development/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/index.html b/site/public/services/index.html
index 06894a5..6841d0b 100644
--- a/site/public/services/index.html
+++ b/site/public/services/index.html
@@ -82,7 +82,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/privacy/breach-response/index.html b/site/public/services/privacy/breach-response/index.html
index 3656dfa..fd95e66 100644
--- a/site/public/services/privacy/breach-response/index.html
+++ b/site/public/services/privacy/breach-response/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/privacy/ccpa-audit/index.html b/site/public/services/privacy/ccpa-audit/index.html
index 2f099ca..aaafb6a 100644
--- a/site/public/services/privacy/ccpa-audit/index.html
+++ b/site/public/services/privacy/ccpa-audit/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/privacy/data-mapping/index.html b/site/public/services/privacy/data-mapping/index.html
index 4d6d4a4..044f394 100644
--- a/site/public/services/privacy/data-mapping/index.html
+++ b/site/public/services/privacy/data-mapping/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/privacy/index.html b/site/public/services/privacy/index.html
index 2413a84..930b5b4 100644
--- a/site/public/services/privacy/index.html
+++ b/site/public/services/privacy/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/privacy/privacy-policy/index.html b/site/public/services/privacy/privacy-policy/index.html
index 0f9602b..d31e6fd 100644
--- a/site/public/services/privacy/privacy-policy/index.html
+++ b/site/public/services/privacy/privacy-policy/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/tcpa/campaign-review/index.html b/site/public/services/tcpa/campaign-review/index.html
index 1125c30..96ae3f9 100644
--- a/site/public/services/tcpa/campaign-review/index.html
+++ b/site/public/services/tcpa/campaign-review/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/tcpa/consent-audit/index.html b/site/public/services/tcpa/consent-audit/index.html
index 47deb90..157e6ad 100644
--- a/site/public/services/tcpa/consent-audit/index.html
+++ b/site/public/services/tcpa/consent-audit/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/tcpa/dnc-compliance/index.html b/site/public/services/tcpa/dnc-compliance/index.html
index b0e26e6..d4eadaf 100644
--- a/site/public/services/tcpa/dnc-compliance/index.html
+++ b/site/public/services/tcpa/dnc-compliance/index.html
@@ -72,7 +72,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/tcpa/index.html b/site/public/services/tcpa/index.html
index 8fe1ee2..97fcff2 100644
--- a/site/public/services/tcpa/index.html
+++ b/site/public/services/tcpa/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/canada-crtc/index.html b/site/public/services/telecom/canada-crtc/index.html
index 5d99b73..6e47020 100644
--- a/site/public/services/telecom/canada-crtc/index.html
+++ b/site/public/services/telecom/canada-crtc/index.html
@@ -145,7 +145,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script><script defer src="/js/pw-crtc-collapse.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/cpni/index.html b/site/public/services/telecom/cpni/index.html
index 01c9152..fd1dd02 100644
--- a/site/public/services/telecom/cpni/index.html
+++ b/site/public/services/telecom/cpni/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/database-management/index.html b/site/public/services/telecom/database-management/index.html
index e589290..fa0c256 100644
--- a/site/public/services/telecom/database-management/index.html
+++ b/site/public/services/telecom/database-management/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/fcc-499a/index.html b/site/public/services/telecom/fcc-499a/index.html
index 6e53044..940b11d 100644
--- a/site/public/services/telecom/fcc-499a/index.html
+++ b/site/public/services/telecom/fcc-499a/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/cores-registration/index.html b/site/public/services/telecom/guides/cores-registration/index.html
index 6d0161c..9ab047d 100644
--- a/site/public/services/telecom/guides/cores-registration/index.html
+++ b/site/public/services/telecom/guides/cores-registration/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/cpni-certification/index.html b/site/public/services/telecom/guides/cpni-certification/index.html
index f180a8c..52fea11 100644
--- a/site/public/services/telecom/guides/cpni-certification/index.html
+++ b/site/public/services/telecom/guides/cpni-certification/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/fcc-499a/index.html b/site/public/services/telecom/guides/fcc-499a/index.html
index 5ecc158..e64d3b4 100644
--- a/site/public/services/telecom/guides/fcc-499a/index.html
+++ b/site/public/services/telecom/guides/fcc-499a/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/fcc-499q/index.html b/site/public/services/telecom/guides/fcc-499q/index.html
index 9f0d0f1..68df93e 100644
--- a/site/public/services/telecom/guides/fcc-499q/index.html
+++ b/site/public/services/telecom/guides/fcc-499q/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/rmd-filing/index.html b/site/public/services/telecom/guides/rmd-filing/index.html
index 3e5986f..506ac28 100644
--- a/site/public/services/telecom/guides/rmd-filing/index.html
+++ b/site/public/services/telecom/guides/rmd-filing/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/guides/usac-account-setup/index.html b/site/public/services/telecom/guides/usac-account-setup/index.html
index 732fd29..8f009ab 100644
--- a/site/public/services/telecom/guides/usac-account-setup/index.html
+++ b/site/public/services/telecom/guides/usac-account-setup/index.html
@@ -62,7 +62,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/index.html b/site/public/services/telecom/index.html
index 489d8e0..4ffa522 100644
--- a/site/public/services/telecom/index.html
+++ b/site/public/services/telecom/index.html
@@ -67,7 +67,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/ipes-isp/index.html b/site/public/services/telecom/ipes-isp/index.html
index 7887199..4207fd8 100644
--- a/site/public/services/telecom/ipes-isp/index.html
+++ b/site/public/services/telecom/ipes-isp/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/state-puc/index.html b/site/public/services/telecom/state-puc/index.html
index 847eb6f..ee8b51f 100644
--- a/site/public/services/telecom/state-puc/index.html
+++ b/site/public/services/telecom/state-puc/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/services/telecom/stir-shaken/index.html b/site/public/services/telecom/stir-shaken/index.html
index e503b11..9a30529 100644
--- a/site/public/services/telecom/stir-shaken/index.html
+++ b/site/public/services/telecom/stir-shaken/index.html
@@ -70,7 +70,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/terms/index.html b/site/public/terms/index.html
index a26eadb..2c9fa5c 100644
--- a/site/public/terms/index.html
+++ b/site/public/terms/index.html
@@ -84,7 +84,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/tools/contractor-quiz/index.html b/site/public/tools/contractor-quiz/index.html
index cdb1480..9184be8 100644
--- a/site/public/tools/contractor-quiz/index.html
+++ b/site/public/tools/contractor-quiz/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/tools/corporation-check/index.html b/site/public/tools/corporation-check/index.html
index d08d274..aafea60 100644
--- a/site/public/tools/corporation-check/index.html
+++ b/site/public/tools/corporation-check/index.html
@@ -226,7 +226,7 @@ function renderResult(data, state) {
 }
 })();
 </script>
-<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s1.setAttribute("crossorigin","*");s0.parentNode.insertBefore(s1,s0);})();</script>
+<!-- Tawk.to Live Chat --><script>var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();(function(){var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];s1.async=true;s1.src="https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph";s1.charset="UTF-8";s0.parentNode.insertBefore(s1,s0);})();</script>
 <script defer src="/js/pw-cookie-consent.js"></script><!-- Floating help button --><button type="button" id="support-fab" aria-label="Open support" class="fixed bottom-6 left-6 z-[9999] w-14 h-14 rounded-full bg-pw-700 text-white shadow-lg hover:bg-pw-800 transition-all hover:scale-105 flex items-center justify-center"> <svg id="support-fab-icon-open" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path> </svg> <svg id="support-fab-icon-close" class="w-6 h-6 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path> </svg> </button> <!-- Slide-out panel --> <div id="support-panel" class="fixed bottom-24 left-6 z-[9998] w-[380px] max-w-[calc(100vw-2rem)] bg-white rounded-xl shadow-2xl border border-gray-200 transform translate-y-4 opacity-0 pointer-events-none transition-all duration-200 ease-out"> <div class="px-5 py-4 border-b border-gray-100 bg-gray-50 rounded-t-xl"> <h3 class="text-base font-semibold text-gray-900">How can we help?</h3> <p class="text-xs text-gray-500 mt-0.5">Choose a category and tell us what you need.</p> </div> <!-- Category selector (step 1) --> <div id="support-step-categories" class="p-4 space-y-2"> <button type="button" data-category="question" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Ask a Question</span> <span class="block text-xs text-gray-500">About our compliance services or process</span> </div> </div> </button> <button type="button" data-category="support" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-green-100 text-green-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Get Support</span> <span class="block text-xs text-gray-500">Help with an ongoing engagement</span> </div> </div> </button> <button type="button" data-category="issue" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-red-100 text-red-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Report an Issue</span> <span class="block text-xs text-gray-500">Something isn't right with a deliverable</span> </div> </div> </button> <button type="button" data-category="service_request" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-purple-100 text-purple-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Service</span> <span class="block text-xs text-gray-500">Start a new compliance engagement</span> </div> </div> </button> <button type="button" data-category="quote" class="support-cat-btn w-full text-left px-4 py-3 rounded-lg border border-gray-200 hover:border-pw-300 hover:bg-pw-50 transition-colors group"> <div class="flex items-center gap-3"> <span class="flex-shrink-0 w-8 h-8 rounded-full bg-amber-100 text-amber-600 flex items-center justify-center"> <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> </span> <div> <span class="text-sm font-medium text-gray-900 group-hover:text-pw-700">Request a Quote</span> <span class="block text-xs text-gray-500">Get pricing for a complex engagement</span> </div> </div> </button> <!-- Sign-in link (hidden when logged in) --> <div id="support-signin-link" class="pt-2 border-t border-gray-100 mt-2"> <button type="button" id="support-signin-btn" class="w-full flex items-center justify-center gap-2 px-4 py-2 text-xs text-gray-500 hover:text-pw-700 transition-colors"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg>
 Already a client? <span class="font-medium text-pw-600">Sign in</span> </button> </div> </div> <!-- Ticket form — Report an Issue + guest fallback (step 2a) --> <form id="support-step-form" class="hidden p-4"> <button type="button" id="support-back-btn" class="inline-flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700 mb-3"> <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"></path></svg>
 Back
diff --git a/site/public/tools/dot-compliance-check/index.html b/site/public/tools/dot-compliance-check/index.html
index 0b6bbe9..ca0437c 100644
--- a/site/public/tools/dot-compliance-check/index.html
+++ b/site/public/tools/dot-compliance-check/index.html
@@ -74,7 +74,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script>
diff --git a/site/public/tools/fcc-compliance-check/index.html b/site/public/tools/fcc-compliance-check/index.html
index 90f790a..0857b27 100644
--- a/site/public/tools/fcc-compliance-check/index.html
+++ b/site/public/tools/fcc-compliance-check/index.html
@@ -85,7 +85,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script>
diff --git a/site/public/tools/formation-guide/index.html b/site/public/tools/formation-guide/index.html
index 1c0bc62..9db4040 100644
--- a/site/public/tools/formation-guide/index.html
+++ b/site/public/tools/formation-guide/index.html
@@ -82,7 +82,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/tools/privacy-check/index.html b/site/public/tools/privacy-check/index.html
index d502b00..f39a1ec 100644
--- a/site/public/tools/privacy-check/index.html
+++ b/site/public/tools/privacy-check/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/public/tools/tcpa-check/index.html b/site/public/tools/tcpa-check/index.html
index 72553fa..139cfda 100644
--- a/site/public/tools/tcpa-check/index.html
+++ b/site/public/tools/tcpa-check/index.html
@@ -68,7 +68,7 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
+        
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script> <script defer src="/js/pw-cookie-consent.js"></script></body> </html>
\ No newline at end of file
diff --git a/site/src/components/intake/ExpressCheckout.astro b/site/src/components/intake/ExpressCheckout.astro
new file mode 100644
index 0000000..9942c54
--- /dev/null
+++ b/site/src/components/intake/ExpressCheckout.astro
@@ -0,0 +1,363 @@
+---
+/**
+ * ExpressCheckout — payment-first order entry.
+ *
+ * The high-friction problem this solves: every /order/<slug> page used to drop a
+ * cold email-click straight into a 28-field intake Wizard BEFORE the visitor
+ * saw a payment option. Funnel data showed 100% drop at that step (54 reached
+ * the order page over 3 days, 0 advanced to payment). Asking a stranger to do
+ * 10 minutes of data entry before earning the sale is the classic conversion
+ * killer.
+ *
+ * The fix (modeled on the batch / compliance-check flow): collect only the
+ * minimal fields the API needs to CREATE the order + charge, then go straight to
+ * Stripe. The full intake is collected AFTER payment via the per-service
+ * "Complete Your Intake Form" email the webhook already sends (links back into
+ * the Wizard in paid-intake mode at /order/<slug>?order=CO-xxx).
+ *
+ * Implementation: creates a single-service "batch of one" via
+ * POST /api/v1/compliance-orders/batch (which, unlike the single-order create +
+ * /validate path, does NOT gate Stripe checkout on intake_data_validated), then
+ * POST /api/v1/checkout/create-session with order_type=compliance_batch and
+ * redirects to the returned checkout_url.
+ *
+ * Prefill: the minimal fields auto-populate from public records exactly like the
+ * Wizard does — ?dot=NNNN pulls the FMCSA census (trucking), ?npi=NNNN runs an
+ * NPPES lookup (healthcare). The visitor confirms a couple of numbers and pays.
+ *
+ * Verticals with rich pre-payment intake that the API genuinely needs up front
+ * (telecom 499 / corporate, which have no public-records prefill and many
+ * conditional fields) keep the Wizard-first flow — those are gated by the
+ * `express` prop the page sets (see OrderFlow.astro).
+ */
+import { SERVICE_META, formatUSD, slugVertical } from "../../lib/intake_manifest";
+import OrderPriceBanner from "../OrderPriceBanner.astro";
+import CheckoutTrustBand from "../CheckoutTrustBand.astro";
+
+export interface Props {
+  service_slug: string;
+  /** Optional override of the human service name (e.g. foreign-qualification). */
+  name?: string;
+}
+
+const { service_slug, name } = Astro.props;
+const meta = SERVICE_META[service_slug];
+const vertical = slugVertical(service_slug);
+const serviceName = name || meta?.name || service_slug;
+
+// Which minimal fields to show, per vertical. These are the smallest set the
+// API's create-order path needs; everything else is collected after payment.
+type FieldKind = "trucking" | "healthcare" | "generic";
+const kind: FieldKind =
+  vertical === "trucking" ? "trucking"
+  : vertical === "healthcare" ? "healthcare"
+  : "generic";
+
+const interval = meta?.billing_interval;
+const intervalLabel = interval === "month" ? "month" : interval === "year" ? "year" : null;
+
+const ALL_METHODS = [
+  { value: "card",   label: "Credit / Debit card" },
+  { value: "ach",    label: "ACH (US bank)" },
+  { value: "paypal", label: "PayPal" },
+  { value: "klarna", label: "Klarna (pay over time)" },
+  { value: "crypto", label: "Cryptocurrency" },
+];
+const allowed = meta?.allowed_methods;
+const methods = allowed ? ALL_METHODS.filter(m => allowed.includes(m.value as any)) : ALL_METHODS;
+---
+
+<section
+  class="pw-express"
+  data-slug={service_slug}
+  data-vertical={vertical}
+  data-kind={kind}
+  data-price-cents={meta?.price_cents ?? ""}
+>
+  <OrderPriceBanner
+    priceCents={meta?.price_cents}
+    govFeeLabel={meta?.gov_fee_label}
+    serviceSlug={service_slug}
+    note={kind === "trucking"
+      ? "Pay now and we'll email you a short form to finish the details. Choose card, ACH, or PayPal at payment."
+      : kind === "healthcare"
+      ? "Pay now and we'll email you a quick form to finish the details. Choose card, ACH, or PayPal at payment."
+      : "Choose card, ACH, or PayPal at payment."}
+  />
+
+  <form class="pw-express-form" id="pw-express-form" novalidate>
+    <h2 class="pw-express-h2">Start your {serviceName}</h2>
+    <p class="pw-express-sub">
+      Just a few details to get started — you'll complete the full intake form
+      after payment (we'll email you a link).
+    </p>
+
+    {kind === "trucking" && (
+      <div class="pw-express-grid">
+        <label class="pw-xf">Business name <span class="pw-req">*</span>
+          <input type="text" id="xf-legal-name" autocomplete="organization" required placeholder="As registered with FMCSA" /></label>
+        <label class="pw-xf">USDOT number <span class="pw-req">*</span>
+          <input type="text" id="xf-dot" inputmode="numeric" required placeholder="e.g. 1234567" /></label>
+        <label class="pw-xf">Email <span class="pw-req">*</span>
+          <input type="email" id="xf-email" autocomplete="email" required placeholder="you@company.com" /></label>
+        <label class="pw-xf">Phone
+          <input type="tel" id="xf-phone" autocomplete="tel" placeholder="(555) 123-4567" /></label>
+        <label class="pw-xf">Base state <span class="pw-req">*</span>
+          <select id="xf-base-state" required>
+            <option value="">Select…</option>
+            {["AL","AK","AZ","AR","CA","CO","CT","DE","FL","GA","HI","ID","IL","IN","IA","KS","KY","LA","ME","MD","MA","MI","MN","MS","MO","MT","NE","NV","NH","NJ","NM","NY","NC","ND","OH","OK","OR","PA","RI","SC","SD","TN","TX","UT","VT","VA","WA","WV","WI","WY","DC"].map(s => <option value={s}>{s}</option>)}
+          </select></label>
+        <label class="pw-xf">Power units (trucks) <span class="pw-req">*</span>
+          <input type="number" id="xf-power-units" min="0" required placeholder="e.g. 5" /></label>
+      </div>
+    )}
+
+    {kind === "healthcare" && (
+      <div class="pw-express-grid">
+        <label class="pw-xf">Provider / practice name <span class="pw-req">*</span>
+          <input type="text" id="xf-provider-name" autocomplete="organization" required placeholder="As registered in NPPES" /></label>
+        <label class="pw-xf">NPI number <span class="pw-req">*</span>
+          <input type="text" id="xf-npi" inputmode="numeric" maxlength="10" required placeholder="e.g. 1234567893" />
+          <span id="xf-npi-status" class="pw-xf-status" hidden></span></label>
+        <label class="pw-xf">Email <span class="pw-req">*</span>
+          <input type="email" id="xf-email" autocomplete="email" required placeholder="you@practice.com" /></label>
+        <label class="pw-xf">Phone
+          <input type="tel" id="xf-phone" autocomplete="tel" placeholder="(555) 123-4567" /></label>
+      </div>
+    )}
+
+    {kind === "generic" && (
+      <div class="pw-express-grid">
+        <label class="pw-xf">Business / legal name <span class="pw-req">*</span>
+          <input type="text" id="xf-legal-name" autocomplete="organization" required placeholder="Your legal entity name" /></label>
+        <label class="pw-xf">Email <span class="pw-req">*</span>
+          <input type="email" id="xf-email" autocomplete="email" required placeholder="you@company.com" /></label>
+        <label class="pw-xf">Phone
+          <input type="tel" id="xf-phone" autocomplete="tel" placeholder="(555) 123-4567" /></label>
+      </div>
+    )}
+
+    <label class="pw-xf pw-xf-method">Payment method
+      <select id="xf-pay-method">
+        {methods.map(m => <option value={m.value}>{m.label}</option>)}
+      </select></label>
+
+    <div id="pw-express-error" class="pw-express-error" hidden></div>
+
+    <button type="submit" id="pw-express-submit" class="pw-express-btn">
+      Continue to payment{meta ? ` — ${intervalLabel ? `${formatUSD(meta.price_cents)}/${intervalLabel}` : formatUSD(meta.price_cents)}` : ""} &rarr;
+    </button>
+    <p class="pw-express-fineprint">
+      Secure checkout by Stripe. You'll review the total before you pay.
+      {kind !== "generic" && " The full intake form is emailed to you after payment."}
+    </p>
+
+    <CheckoutTrustBand variant="compact" vertical={vertical} />
+  </form>
+</section>
+
+<style>
+  .pw-express { max-width: 820px; margin: 0 auto; }
+  .pw-express-form {
+    background: #fff; border: 1px solid #e2e8f0; border-radius: 12px;
+    padding: 1.5rem 1.5rem 1.75rem; margin-top: 0.5rem;
+    box-shadow: 0 10px 30px rgba(15, 23, 42, 0.06);
+  }
+  .pw-express-h2 { margin: 0 0 0.35rem; color: var(--pw-navy, #1a2744); font-size: 1.35rem; }
+  .pw-express-sub { margin: 0 0 1.25rem; color: var(--pw-muted, #64748b); font-size: 0.95rem; line-height: 1.5; }
+  .pw-express-grid {
+    display: grid; grid-template-columns: 1fr 1fr; gap: 0.9rem 1.1rem;
+  }
+  .pw-xf { display: flex; flex-direction: column; gap: 0.3rem; font-size: 0.85rem; font-weight: 600; color: #334155; }
+  .pw-xf input, .pw-xf select {
+    padding: 0.6rem 0.7rem; border: 1px solid #cbd5e1; border-radius: 7px;
+    font-size: 0.95rem; font-weight: 400; color: #0f172a; background: #fff;
+  }
+  .pw-xf input:focus, .pw-xf select:focus { outline: 2px solid #2563eb; outline-offset: 0; border-color: #2563eb; }
+  .pw-req { color: #dc2626; }
+  .pw-xf-status { font-size: 0.78rem; font-weight: 500; color: #059669; }
+  .pw-xf-status[data-state="error"] { color: #b45309; }
+  .pw-xf-method { margin-top: 1.1rem; max-width: 22rem; }
+  .pw-express-error {
+    margin: 1rem 0 0; padding: 0.7rem 0.9rem; border-radius: 8px;
+    background: #fef2f2; border: 1px solid #fecaca; color: #b91c1c; font-size: 0.88rem;
+  }
+  .pw-express-btn {
+    margin-top: 1.25rem; width: 100%; padding: 0.95rem 1.4rem; border: 0;
+    border-radius: 9px; background: #059669; color: #fff; font-weight: 800;
+    font-size: 1.05rem; cursor: pointer; transition: background 0.15s;
+  }
+  .pw-express-btn:hover { background: #047857; }
+  .pw-express-btn:disabled { opacity: 0.6; cursor: not-allowed; }
+  .pw-express-fineprint { margin: 0.7rem 0 0; text-align: center; color: #94a3b8; font-size: 0.78rem; line-height: 1.5; }
+  @media (max-width: 560px) {
+    .pw-express-grid { grid-template-columns: 1fr; }
+  }
+</style>
+
+<script>
+  // ── ExpressCheckout client logic ────────────────────────────────────────
+  const root = document.querySelector<HTMLElement>(".pw-express");
+  if (root) {
+    const slug = root.dataset.slug!;
+    const kind = root.dataset.kind!;
+    const API = (window as any).__PW_API || "";
+    const form = document.getElementById("pw-express-form") as HTMLFormElement;
+    const errBox = document.getElementById("pw-express-error")!;
+    const submitBtn = document.getElementById("pw-express-submit") as HTMLButtonElement;
+    const params = new URLSearchParams(location.search);
+
+    const $ = (id: string) => document.getElementById(id) as HTMLInputElement | HTMLSelectElement | null;
+    const val = (id: string) => ($(id)?.value || "").trim();
+    const setVal = (id: string, v: string) => { const el = $(id); if (el && !el.value && v) el.value = v; };
+
+    // ── Public-records prefill (same sources the Wizard uses) ──────────────
+    async function prefill() {
+      if (kind === "trucking") {
+        const dot = (params.get("dot") || "").replace(/\D/g, "");
+        if (dot) {
+          setVal("xf-dot", dot);
+          try {
+            const r = await fetch(`${API}/api/v1/dot/census?dot=${dot}`);
+            if (r.ok) {
+              const c = await r.json();
+              setVal("xf-legal-name", c.legal_name || "");
+              setVal("xf-email", (c.email || "").toLowerCase());
+              setVal("xf-phone", c.telephone || "");
+              setVal("xf-base-state", c.phy_state || "");
+              setVal("xf-power-units", c.power_units != null ? String(c.power_units) : "");
+            }
+          } catch { /* prefill is best-effort */ }
+        }
+      } else if (kind === "healthcare") {
+        const npi = (params.get("npi") || "").replace(/\D/g, "").slice(0, 10);
+        if (npi) {
+          setVal("xf-npi", npi);
+          await npiLookup(npi);
+        }
+      }
+    }
+
+    async function npiLookup(npi: string) {
+      const status = document.getElementById("xf-npi-status");
+      if (status) { status.hidden = false; status.removeAttribute("data-state"); status.textContent = "Looking up NPI…"; }
+      try {
+        const r = await fetch(`${API}/api/v1/npi/lookup?npi=${encodeURIComponent(npi)}`, { headers: { Accept: "application/json" } });
+        if (r.ok) {
+          const d = await r.json();
+          const nm = d.provider_name || d.organization_name || d.name || "";
+          setVal("xf-provider-name", nm);
+          if (status) { status.removeAttribute("data-state"); status.textContent = nm ? `\u2713 ${nm}` : "Found"; }
+        } else {
+          if (status) { status.setAttribute("data-state", "error"); status.textContent = "NPI not found — you can still continue"; }
+        }
+      } catch {
+        if (status) { status.hidden = true; }
+      }
+    }
+
+    // Re-run NPI lookup when the user edits the field manually.
+    if (kind === "healthcare") {
+      const npiEl = document.getElementById("xf-npi") as HTMLInputElement | null;
+      npiEl?.addEventListener("blur", () => {
+        const n = (npiEl.value || "").replace(/\D/g, "").slice(0, 10);
+        if (n.length === 10) npiLookup(n);
+      });
+    }
+
+    function collect(): { ok: boolean; email: string; name: string; phone: string; intake: Record<string, any>; missing: string[] } {
+      const email = val("xf-email");
+      const phone = val("xf-phone");
+      const missing: string[] = [];
+      let name = "", intake: Record<string, any> = {};
+      if (kind === "trucking") {
+        name = val("xf-legal-name");
+        intake = {
+          legal_name: name, entity_name: name, dot_number: val("xf-dot").replace(/\D/g, ""),
+          email, phone, base_state: val("xf-base-state"), power_units: val("xf-power-units"),
+        };
+        if (!name) missing.push("Business name");
+        if (!intake.dot_number) missing.push("USDOT number");
+        if (!email) missing.push("Email");
+        if (!intake.base_state) missing.push("Base state");
+        if (!intake.power_units) missing.push("Power units");
+      } else if (kind === "healthcare") {
+        name = val("xf-provider-name");
+        intake = {
+          provider_name: name, organization_name: name, npi: val("xf-npi").replace(/\D/g, ""),
+          email, phone,
+        };
+        if (!name) missing.push("Provider / practice name");
+        if (!intake.npi || intake.npi.length !== 10) missing.push("Valid 10-digit NPI");
+        if (!email) missing.push("Email");
+      } else {
+        name = val("xf-legal-name");
+        intake = { legal_name: name, entity_name: name, email, phone };
+        if (!name) missing.push("Business / legal name");
+        if (!email) missing.push("Email");
+      }
+      if (email && !/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email)) missing.push("Valid email address");
+      return { ok: missing.length === 0, email, name, phone, intake, missing };
+    }
+
+    form.addEventListener("submit", async (e) => {
+      e.preventDefault();
+      errBox.hidden = true;
+      const c = collect();
+      if (!c.ok) {
+        errBox.hidden = false;
+        errBox.textContent = "Please complete: " + c.missing.join(", ") + ".";
+        return;
+      }
+      submitBtn.disabled = true;
+      const origLabel = submitBtn.innerHTML;
+      submitBtn.textContent = "Starting secure checkout…";
+      try {
+        const code = (params.get("code") || "").toUpperCase().trim();
+        // 1) Create a single-service "batch of one" — this path does NOT gate
+        //    Stripe checkout on intake_data_validated, so we can charge first
+        //    and collect the full intake after payment.
+        const createResp = await fetch(`${API}/api/v1/compliance-orders/batch`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            services: [slug],
+            customer_email: c.email,
+            customer_name: c.name,
+            customer_phone: c.phone || undefined,
+            intake_data: c.intake,
+            discount_code: code || undefined,
+          }),
+        });
+        if (!createResp.ok) {
+          const err = await createResp.json().catch(() => ({}));
+          throw new Error(err.error || `Could not create order (HTTP ${createResp.status})`);
+        }
+        const created = await createResp.json();
+        const batchId = created.batch_id;
+        if (!batchId) throw new Error("Order created but no batch id returned.");
+
+        // 2) Start checkout for the batch.
+        const paymentMethod = ($("xf-pay-method") as HTMLSelectElement)?.value || "card";
+        const checkoutResp = await fetch(`${API}/api/v1/checkout/create-session`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ order_id: batchId, order_type: "compliance_batch", payment_method: paymentMethod }),
+        });
+        if (!checkoutResp.ok) throw new Error(`Could not start checkout (HTTP ${checkoutResp.status})`);
+        const { checkout_url } = await checkoutResp.json();
+        if (!checkout_url) throw new Error("No checkout URL returned.");
+        // Fire a funnel event so we can see express conversions in Umami.
+        try { (window as any).pwTrack?.("express-checkout-start", { slug, method: paymentMethod }); } catch {}
+        window.location.href = checkout_url;
+      } catch (e: any) {
+        errBox.hidden = false;
+        errBox.textContent = e?.message || "Could not start checkout. Please try again or call (888) 411-0383.";
+        submitBtn.disabled = false;
+        submitBtn.innerHTML = origLabel;
+      }
+    });
+
+    prefill();
+  }
+</script>
diff --git a/site/src/components/intake/OrderFlow.astro b/site/src/components/intake/OrderFlow.astro
new file mode 100644
index 0000000..307b4a7
--- /dev/null
+++ b/site/src/components/intake/OrderFlow.astro
@@ -0,0 +1,157 @@
+---
+/**
+ * OrderFlow — the single source of truth for every /order/<slug> page.
+ *
+ * Replaces ~50 near-identical thin Wizard wrappers. It picks the right flow:
+ *
+ *   1. PAYMENT-FIRST (default for trucking + healthcare): show ExpressCheckout
+ *      (price + minimal prefillable fields + "Continue to payment") at the TOP,
+ *      with the marketing hero BELOW it. The full intake is collected after
+ *      payment via the per-service email link the webhook already sends.
+ *
+ *   2. WIZARD-FIRST (telecom / corporate, express=false): these have rich
+ *      pre-payment intake the API genuinely needs up front (FCC 499 conditional
+ *      fields, de minimis, LNPA) and no public-records prefill, so the full
+ *      Wizard stays first. Hero stays on top as before.
+ *
+ *   3. PAID-INTAKE re-entry (?order=CO-xxx or ?token=JWT): ALWAYS render the
+ *      full Wizard (it self-detects paid-intake mode, strips the payment step,
+ *      and hides the price). This is where the post-payment email lands so the
+ *      customer finishes the details. Detected client-side; both the express UI
+ *      and the wizard are rendered, and a tiny inline script shows the right one
+ *      (avoids a server round-trip / flash since Astro is static-built).
+ */
+import VerticalOrderHeader from "../VerticalOrderHeader.astro";
+import Wizard from "./Wizard.astro";
+import TaxDeductibilityNotice from "../TaxDeductibilityNotice.astro";
+import TruckingValueNotice from "../TruckingValueNotice.astro";
+import ExpressCheckout from "./ExpressCheckout.astro";
+import { INTAKE_MANIFEST, SERVICE_META, slugVertical } from "../../lib/intake_manifest";
+
+export interface Props {
+  slug: string;
+  /** Human title + description for the intro + <Base>. */
+  title?: string;
+  description?: string;
+  /** Override the service display name passed to ExpressCheckout. */
+  name?: string;
+  /** Fallback step list when the manifest has none. */
+  fallbackSteps?: string[];
+  /**
+   * Force the flow. Default: trucking + healthcare = payment-first ("express"),
+   * telecom + corporate = wizard-first ("wizard"). Pages can override.
+   */
+  flow?: "express" | "wizard";
+  /** Which value-notice to show below the hero. */
+  notice?: "tax" | "trucking" | "none";
+}
+
+const {
+  slug,
+  title,
+  description,
+  name,
+  fallbackSteps,
+  flow,
+  notice,
+} = Astro.props;
+
+const meta = SERVICE_META[slug];
+const steps = INTAKE_MANIFEST[slug] ?? fallbackSteps ?? ["review", "payment"];
+const vertical = slugVertical(slug) ?? "telecom";
+const displayName = name || meta?.name || slug;
+const introTitle = title || (meta ? meta.name : "Order");
+
+// Default flow per vertical. Trucking + healthcare go payment-first because they
+// prefill from public records (DOT census / NPPES) and the rest of the intake
+// can be finished after payment. Telecom + corporate keep the Wizard first.
+const resolvedFlow: "express" | "wizard" =
+  flow ?? (vertical === "trucking" || vertical === "healthcare" ? "express" : "wizard");
+
+// Default notice per vertical (matches the previous per-page choices).
+const resolvedNotice: "tax" | "trucking" | "none" =
+  notice ?? (vertical === "trucking"
+    ? (slug.startsWith("dot-") || slug === "state-trucking-bundle" || slug === "state-dot-registration"
+       || slug === "intrastate-authority" || slug === "mc-authority" || slug === "boc3-filing"
+       || slug === "osow-permit" || slug === "dot-audit-prep"
+        ? "tax" : "trucking")
+    : "none");
+---
+
+<main class="pw-order-main" data-flow={resolvedFlow}>
+  {resolvedFlow === "express" ? (
+    <>
+      {/* PAYMENT-FIRST: express checkout on top, hero + details below. */}
+      <section class="pw-order-intro">
+        <h1>{introTitle}</h1>
+        {description && <p class="pw-desc">{description}</p>}
+      </section>
+
+      <div id="pw-express-region">
+        <ExpressCheckout service_slug={slug} name={displayName} />
+      </div>
+
+      {/* Marketing hero + value notice moved BELOW the CTA. */}
+      <div class="pw-below-fold">
+        <VerticalOrderHeader vertical={vertical} />
+        {resolvedNotice === "tax" && <TaxDeductibilityNotice />}
+        {resolvedNotice === "trucking" && <TruckingValueNotice slug={slug} />}
+      </div>
+
+      {/* PAID-INTAKE re-entry: full wizard, hidden until ?order=/?token= detected. */}
+      <div id="pw-wizard-region" hidden>
+        <Wizard service_slug={slug} steps={steps} title={displayName} />
+      </div>
+    </>
+  ) : (
+    <>
+      {/* WIZARD-FIRST (telecom / corporate). */}
+      <section class="pw-order-intro">
+        <h1>{introTitle}</h1>
+        {description && <p class="pw-desc">{description}</p>}
+      </section>
+
+      <VerticalOrderHeader vertical={vertical} />
+      {resolvedNotice === "tax" && <TaxDeductibilityNotice />}
+      {resolvedNotice === "trucking" && <TruckingValueNotice slug={slug} />}
+
+      <Wizard service_slug={slug} steps={steps} title={displayName} />
+    </>
+  )}
+
+  <slot />
+</main>
+
+<script>
+  // In paid-intake re-entry (?order=CO-xxx or ?token=JWT), the customer arrived
+  // from the post-payment "Complete Your Intake Form" email. Swap the express
+  // CTA for the full Wizard so they finish the details. Only relevant on
+  // express-flow pages (wizard-flow pages already render the Wizard first; the
+  // Wizard itself strips the payment step + price in paid-intake mode).
+  (function () {
+    const main = document.querySelector<HTMLElement>(".pw-order-main");
+    if (!main || main.dataset.flow !== "express") return;
+    const p = new URLSearchParams(location.search);
+    const paidIntake = p.has("order") || p.has("token");
+    if (!paidIntake) return;
+    const express = document.getElementById("pw-express-region");
+    const below = main.querySelector<HTMLElement>(".pw-below-fold");
+    const wizard = document.getElementById("pw-wizard-region");
+    if (express) express.hidden = true;
+    if (below) below.hidden = true;
+    if (wizard) wizard.hidden = false;
+  })();
+</script>
+
+<style>
+  .pw-order-main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
+  .pw-order-intro { margin-bottom: 1.25rem; }
+  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
+  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
+  .pw-below-fold { margin-top: 2.5rem; padding-top: 1.5rem; border-top: 1px solid #eef2f7; }
+  .pw-below-fold::before {
+    content: "Why Performance West";
+    display: block; font-size: 0.75rem; font-weight: 800; letter-spacing: 0.08em;
+    text-transform: uppercase; color: #94a3b8; margin-bottom: 1rem; text-align: center;
+  }
+</style>
diff --git a/site/src/pages/order/bdc-broadband.astro b/site/src/pages/order/bdc-broadband.astro
index ed2069c..9ba4624 100644
--- a/site/src/pages/order/bdc-broadband.astro
+++ b/site/src/pages/order/bdc-broadband.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "bdc-broadband";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Availability data only (no voice subscription). For broadband-focused ISPs and fixed wireless providers.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/bdc-filing.astro b/site/src/pages/order/bdc-filing.astro
index f41d4c9..a7015d4 100644
--- a/site/src/pages/order/bdc-filing.astro
+++ b/site/src/pages/order/bdc-filing.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "bdc-filing";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Both BDC blocks in one order — broadband deployment + voice subscription. For carriers with both.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/bdc-voice.astro b/site/src/pages/order/bdc-voice.astro
index be67c45..7977d7b 100644
--- a/site/src/pages/order/bdc-voice.astro
+++ b/site/src/pages/order/bdc-voice.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "bdc-voice";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Voice subscriber counts only — the part of the legacy Form 477 that now files through BDC. For VoIP resellers + CLECs.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/boc3-filing.astro b/site/src/pages/order/boc3-filing.astro
index 2953748..2c51c4c 100644
--- a/site/src/pages/order/boc3-filing.astro
+++ b/site/src/pages/order/boc3-filing.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "boc3-filing";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Designate a process agent in all 48 states plus DC.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ca-mcp-carb.astro b/site/src/pages/order/ca-mcp-carb.astro
index 96c5601..b4943e7 100644
--- a/site/src/pages/order/ca-mcp-carb.astro
+++ b/site/src/pages/order/ca-mcp-carb.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ca-mcp-carb";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "California Motor Carrier Permit (MCP) plus CARB Clean Truck Check compliance for carriers operating in California.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/calea-ssi.astro b/site/src/pages/order/calea-ssi.astro
index 0ff38fb..f9e4263 100644
--- a/site/src/pages/order/calea-ssi.astro
+++ b/site/src/pages/order/calea-ssi.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "calea-ssi";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "System Security and Integrity plan required of every common carrier under 47 USC § 229 / 47 CFR § 1.20003. Kept internally, provided to DOJ on subpoena.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/cdr-analysis.astro b/site/src/pages/order/cdr-analysis.astro
index c7e4f65..44ae15b 100644
--- a/site/src/pages/order/cdr-analysis.astro
+++ b/site/src/pages/order/cdr-analysis.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "cdr-analysis";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Classified traffic study from your CDRs — feeds the 499-A with actual interstate/international percentages instead of the 64.9% safe harbor.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/clia-renewal.astro b/site/src/pages/order/clia-renewal.astro
index 53165b4..643ac96 100644
--- a/site/src/pages/order/clia-renewal.astro
+++ b/site/src/pages/order/clia-renewal.astro
@@ -1,35 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "clia-renewal";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Renew your CLIA laboratory certificate with CMS before it expires. CLIA certificates run on a 2-year cycle; an expired certificate stops you from legally performing or billing for lab testing.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/cores-frn-registration.astro b/site/src/pages/order/cores-frn-registration.astro
index dfea358..0cac84a 100644
--- a/site/src/pages/order/cores-frn-registration.astro
+++ b/site/src/pages/order/cores-frn-registration.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "cores-frn-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Register your carrier in FCC CORES and obtain your FRN. Required before any other FCC filing.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/cpni-certification.astro b/site/src/pages/order/cpni-certification.astro
index 7fde3ab..782668e 100644
--- a/site/src/pages/order/cpni-certification.astro
+++ b/site/src/pages/order/cpni-certification.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "cpni-certification";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "47 CFR § 64.2009 annual CPNI certification filed at FCC ECFS docket 06-36. Due March 1.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Always hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ct-highway-use-fee.astro b/site/src/pages/order/ct-highway-use-fee.astro
index 623b58a..0a5f4ec 100644
--- a/site/src/pages/order/ct-highway-use-fee.astro
+++ b/site/src/pages/order/ct-highway-use-fee.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ct-highway-use-fee";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Connecticut Highway Use Fee registration for heavy multi-unit carriers operating in Connecticut.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/dc-agent.astro b/site/src/pages/order/dc-agent.astro
index 3f4f67c..0a0af31 100644
--- a/site/src/pages/order/dc-agent.astro
+++ b/site/src/pages/order/dc-agent.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "dc-agent";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Your required D.C. registered agent for service of process (47 CFR § 413). Uses Northwest Registered Agent wholesale.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="corporate" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/dot-audit-prep.astro b/site/src/pages/order/dot-audit-prep.astro
index cdd6e56..cb4c59c 100644
--- a/site/src/pages/order/dot-audit-prep.astro
+++ b/site/src/pages/order/dot-audit-prep.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "dot-audit-prep";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Prepare for your 18-month FMCSA safety audit.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/dot-drug-alcohol.astro b/site/src/pages/order/dot-drug-alcohol.astro
index 42429c0..486080d 100644
--- a/site/src/pages/order/dot-drug-alcohol.astro
+++ b/site/src/pages/order/dot-drug-alcohol.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "dot-drug-alcohol";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Consortium enrollment, written policy, and DER designation.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/dot-full-compliance.astro b/site/src/pages/order/dot-full-compliance.astro
index 4d60ce7..0a3cf73 100644
--- a/site/src/pages/order/dot-full-compliance.astro
+++ b/site/src/pages/order/dot-full-compliance.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "dot-full-compliance";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "MCS-150 + BOC-3 + UCR + Drug & Alcohol + Audit Prep.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/dot-registration.astro b/site/src/pages/order/dot-registration.astro
index 077ea80..7e881f8 100644
--- a/site/src/pages/order/dot-registration.astro
+++ b/site/src/pages/order/dot-registration.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "dot-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Register a new USDOT number with FMCSA.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-499-initial.astro b/site/src/pages/order/fcc-499-initial.astro
index c778037..0d14f72 100644
--- a/site/src/pages/order/fcc-499-initial.astro
+++ b/site/src/pages/order/fcc-499-initial.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-499-initial";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "New carrier registration with USAC — obtain your Filer ID (812xxx) and unlock all future 499-A filings.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-499a-499q.astro b/site/src/pages/order/fcc-499a-499q.astro
index 24314b2..93d7bc2 100644
--- a/site/src/pages/order/fcc-499a-499q.astro
+++ b/site/src/pages/order/fcc-499a-499q.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-499a-499q";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Annual 499-A plus the four quarterly 499-Q filings — one bundle, full year covered.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-499a.astro b/site/src/pages/order/fcc-499a.astro
index 9495109..85bbc45 100644
--- a/site/src/pages/order/fcc-499a.astro
+++ b/site/src/pages/order/fcc-499a.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-499a";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Annual Telecommunications Reporting Worksheet. Due April 1 for the prior year's revenue.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-63-11-notification.astro b/site/src/pages/order/fcc-63-11-notification.astro
index 1c16fd5..3c2fde0 100644
--- a/site/src/pages/order/fcc-63-11-notification.astro
+++ b/site/src/pages/order/fcc-63-11-notification.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-63-11-notification";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "47 CFR § 63.11 notification filed with the FCC International Bureau. Required when U.S. carriers are affiliated with a foreign carrier serving the same route.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-compliance-checkup.astro b/site/src/pages/order/fcc-compliance-checkup.astro
index 8bb551d..03e13db 100644
--- a/site/src/pages/order/fcc-compliance-checkup.astro
+++ b/site/src/pages/order/fcc-compliance-checkup.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-compliance-checkup";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Diagnostic check — CORES, RMD, STIR/SHAKEN, CPNI, 499-A status. No filing, just a report.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/fcc-full-compliance.astro b/site/src/pages/order/fcc-full-compliance.astro
index 0395366..22a4074 100644
--- a/site/src/pages/order/fcc-full-compliance.astro
+++ b/site/src/pages/order/fcc-full-compliance.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "fcc-full-compliance";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "RMD + CPNI + STIR/SHAKEN + 499-A + 499-Q in one order. Every annual filing, 15% bundle discount.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/foreign-qualification.astro b/site/src/pages/order/foreign-qualification.astro
index e7646df..96d0ec1 100644
--- a/site/src/pages/order/foreign-qualification.astro
+++ b/site/src/pages/order/foreign-qualification.astro
@@ -1,14 +1,11 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 // URL param ?multi=1 selects the multi-state discounted SKU.
 const isMulti = Astro.url.searchParams.get("multi") === "1";
 const slug = isMulti ? "foreign-qualification-multi" : "foreign-qualification-single";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = "Foreign Qualification (Certificate of Authority)";
 const description =
@@ -18,49 +15,32 @@ const description =
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{title}</h1>
-      <p class="pw-desc">{description}</p>
-
-      {!isMulti && (
-        <p class="pw-multi-cta">
-          Registering in multiple states?
-          <a href="/order/foreign-qualification?multi=1">
-            Switch to multi-state pricing ($99/state)
-          </a>
-        </p>
-      )}
-      {isMulti && (
-        <p class="pw-multi-cta">
-          Only need one state?
-          <a href="/order/foreign-qualification">
-            Switch to single-state pricing ($149)
-          </a>
-        </p>
-      )}
-    </section>
-
-    <VerticalOrderHeader vertical="corporate" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "foreign_qual", "review", "payment"]} title={title} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow
+    slug={slug}
+    title={title}
+    description={description}
+    fallbackSteps={["entity", "foreign_qual", "review", "payment"]}
+  >
+    {!isMulti && (
+      <p class="pw-multi-cta">
+        Registering in multiple states?
+        <a href="/order/foreign-qualification?multi=1">
+          Switch to multi-state pricing ($99/state)
+        </a>
+      </p>
+    )}
+    {isMulti && (
+      <p class="pw-multi-cta">
+        Only need one state?
+        <a href="/order/foreign-qualification">
+          Switch to single-state pricing ($149)
+        </a>
+      </p>
+    )}
+  </OrderFlow>
 </Base>
 
 <style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.5rem; }
-  .pw-price-note { font-size: 0.9rem; font-weight: 400; color: #64748b; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-  .pw-multi-cta { font-size: 0.9rem; color: #475569; margin-top: 0.5rem; }
+  .pw-multi-cta { font-size: 0.9rem; color: #475569; margin-top: 1rem; }
   .pw-multi-cta a { color: #2563eb; text-decoration: underline; }
 </style>
diff --git a/site/src/pages/order/hazmat-phmsa.astro b/site/src/pages/order/hazmat-phmsa.astro
index ebc2d4d..966fba7 100644
--- a/site/src/pages/order/hazmat-phmsa.astro
+++ b/site/src/pages/order/hazmat-phmsa.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "hazmat-phmsa";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "PHMSA hazardous-materials registration for carriers transporting placardable quantities of hazmat.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ifta-application.astro b/site/src/pages/order/ifta-application.astro
index 819df47..0540722 100644
--- a/site/src/pages/order/ifta-application.astro
+++ b/site/src/pages/order/ifta-application.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ifta-application";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "International Fuel Tax Agreement (IFTA) license and decals — one fuel-tax credential covering all your operating jurisdictions.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ifta-quarterly.astro b/site/src/pages/order/ifta-quarterly.astro
index 9ee9c1a..e1d8857 100644
--- a/site/src/pages/order/ifta-quarterly.astro
+++ b/site/src/pages/order/ifta-quarterly.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ifta-quarterly";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Quarterly IFTA fuel-tax return preparation and filing through your base state.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/intrastate-authority.astro b/site/src/pages/order/intrastate-authority.astro
index 7921777..1a40c32 100644
--- a/site/src/pages/order/intrastate-authority.astro
+++ b/site/src/pages/order/intrastate-authority.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "intrastate-authority";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Intrastate operating authority application for carriers hauling for-hire within their home state.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/irp-registration.astro b/site/src/pages/order/irp-registration.astro
index 8f307ea..dc392fc 100644
--- a/site/src/pages/order/irp-registration.astro
+++ b/site/src/pages/order/irp-registration.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "irp-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Apportioned (IRP) registration for interstate carriers — we file with your base state and obtain your apportioned plates and cab cards.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ky-kyu-registration.astro b/site/src/pages/order/ky-kyu-registration.astro
index d3a4eb3..082ab18 100644
--- a/site/src/pages/order/ky-kyu-registration.astro
+++ b/site/src/pages/order/ky-kyu-registration.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ky-kyu-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Kentucky KYU weight-distance tax license for carriers operating in Kentucky.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/mc-authority.astro b/site/src/pages/order/mc-authority.astro
index 6647a2a..1d56097 100644
--- a/site/src/pages/order/mc-authority.astro
+++ b/site/src/pages/order/mc-authority.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "mc-authority";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Apply for common or contract carrier operating authority.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/mcs150-update.astro b/site/src/pages/order/mcs150-update.astro
index 355b232..78d85c9 100644
--- a/site/src/pages/order/mcs150-update.astro
+++ b/site/src/pages/order/mcs150-update.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "mcs150-update";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "FMCSA biennial update of company profile, fleet size, and mileage.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/medicare-enrollment.astro b/site/src/pages/order/medicare-enrollment.astro
index 7bb3d2b..3bceddd 100644
--- a/site/src/pages/order/medicare-enrollment.astro
+++ b/site/src/pages/order/medicare-enrollment.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "medicare-enrollment";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Complete your Medicare enrollment in PECOS (CMS-855), including taxonomy, practice location, and authorized official.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/new-carrier-bundle.astro b/site/src/pages/order/new-carrier-bundle.astro
index 8c58f44..e28205e 100644
--- a/site/src/pages/order/new-carrier-bundle.astro
+++ b/site/src/pages/order/new-carrier-bundle.astro
@@ -1,43 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "new-carrier-bundle";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Start-to-finish for a brand-new VoIP carrier: FRN + 499 Initial + RMD + CPNI + CALEA SSI. Everything you need to legally start billing customers.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/nm-weight-distance.astro b/site/src/pages/order/nm-weight-distance.astro
index 934b3ca..3de4bf5 100644
--- a/site/src/pages/order/nm-weight-distance.astro
+++ b/site/src/pages/order/nm-weight-distance.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "nm-weight-distance";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "New Mexico Weight-Distance Tax permit and account setup.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/npi-reactivation.astro b/site/src/pages/order/npi-reactivation.astro
index ab2bc88..0db8ef2 100644
--- a/site/src/pages/order/npi-reactivation.astro
+++ b/site/src/pages/order/npi-reactivation.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "npi-reactivation";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Reactivate a deactivated NPI in NPPES so you can resume billing, with a full record re-certification.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/npi-revalidation.astro b/site/src/pages/order/npi-revalidation.astro
index 712b25a..f471a0c 100644
--- a/site/src/pages/order/npi-revalidation.astro
+++ b/site/src/pages/order/npi-revalidation.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "npi-revalidation";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Prepare and file your Medicare revalidation in CMS PECOS. Revalidation is required every 5 years; missing it deactivates your billing privileges.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/nppes-update.astro b/site/src/pages/order/nppes-update.astro
index 2ffef39..744fcd8 100644
--- a/site/src/pages/order/nppes-update.astro
+++ b/site/src/pages/order/nppes-update.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "nppes-update";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Update and re-attest your NPPES record. CMS requires updates within 30 days of any change.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ny-hut-registration.astro b/site/src/pages/order/ny-hut-registration.astro
index 4d91615..addfe59 100644
--- a/site/src/pages/order/ny-hut-registration.astro
+++ b/site/src/pages/order/ny-hut-registration.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ny-hut-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "New York Highway Use Tax (HUT) registration and decal for carriers operating in New York.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ocn-registration.astro b/site/src/pages/order/ocn-registration.astro
index 59ef7eb..8f32cfa 100644
--- a/site/src/pages/order/ocn-registration.astro
+++ b/site/src/pages/order/ocn-registration.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ocn-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Obtain an Operating Company Number from NECA. Required for STIR/SHAKEN signing authority and direct numbering access.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/oig-sam-screening.astro b/site/src/pages/order/oig-sam-screening.astro
index d3ee3a1..a807a5d 100644
--- a/site/src/pages/order/oig-sam-screening.astro
+++ b/site/src/pages/order/oig-sam-screening.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "oig-sam-screening";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Monthly OIG LEIE and SAM exclusion screening for you and your staff, with an audit-ready compliance certificate each month. $79/month, cancel anytime.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/or-weight-mile-tax.astro b/site/src/pages/order/or-weight-mile-tax.astro
index fd087eb..16bbef7 100644
--- a/site/src/pages/order/or-weight-mile-tax.astro
+++ b/site/src/pages/order/or-weight-mile-tax.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "or-weight-mile-tax";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Oregon Weight-Mile Tax enrollment and account setup for carriers operating in Oregon.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/osow-permit.astro b/site/src/pages/order/osow-permit.astro
index a4ccd97..57f210f 100644
--- a/site/src/pages/order/osow-permit.astro
+++ b/site/src/pages/order/osow-permit.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "osow-permit";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Oversize / Overweight (OS/OW) trip permit acquisition for non-standard loads.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/provider-compliance-bundle.astro b/site/src/pages/order/provider-compliance-bundle.astro
index a9acf1d..d25ca1b 100644
--- a/site/src/pages/order/provider-compliance-bundle.astro
+++ b/site/src/pages/order/provider-compliance-bundle.astro
@@ -1,40 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "provider-compliance-bundle";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Annual provider compliance bundle: revalidation monitoring & filing, NPPES upkeep, and your first OIG/SAM exclusion screening in one package.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="healthcare" />
-    <Wizard service_slug={slug} steps={steps ?? ["npi-intake", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Hide price + tax on intake pages — if the user is here, they've
-    // already paid via the order page or batch checkout.
-    const price = document.getElementById("pw-price");
-    const tax = document.getElementById("pw-tax-notice");
-    if (price) price.style.display = "none";
-    if (tax) tax.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["npi-intake", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/rmd-filing.astro b/site/src/pages/order/rmd-filing.astro
index 0628f5c..763a81f 100644
--- a/site/src/pages/order/rmd-filing.astro
+++ b/site/src/pages/order/rmd-filing.astro
@@ -1,43 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "rmd-filing";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Robocall Mitigation Database filing. Annual recertification required March 1 (March 2 in 2026).";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    // Always hide price + tax + FCC fee note on intake pages — if the user
-    // is here, they've already paid via the order page or batch checkout.
-    const p = document.getElementById("pw-price");
-    const t = document.getElementById("pw-tax-notice");
-    const f = document.querySelector(".pw-order-intro p[style*='fefce8']") as HTMLElement;
-    if (p) p.style.display = "none";
-    if (t) t.style.display = "none";
-    if (f) f.style.display = "none";
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/state-dot-registration.astro b/site/src/pages/order/state-dot-registration.astro
index 0072b59..5b2e808 100644
--- a/site/src/pages/order/state-dot-registration.astro
+++ b/site/src/pages/order/state-dot-registration.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "state-dot-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Intrastate (state) DOT number registration for carriers operating within a single state.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/state-emissions.astro b/site/src/pages/order/state-emissions.astro
index d976b19..4b013ff 100644
--- a/site/src/pages/order/state-emissions.astro
+++ b/site/src/pages/order/state-emissions.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "state-emissions";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "State clean-truck / emissions compliance (NY, CO, MD, NJ, MA Advanced Clean Trucks programs) — fleet reporting and certification.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/state-trucking-bundle.astro b/site/src/pages/order/state-trucking-bundle.astro
index 34750bb..e7cc715 100644
--- a/site/src/pages/order/state-trucking-bundle.astro
+++ b/site/src/pages/order/state-trucking-bundle.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "state-trucking-bundle";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "State Compliance Bundle — IRP, IFTA, state weight-distance taxes, and state permits handled together for one price.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TaxDeductibilityNotice />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/stir-shaken.astro b/site/src/pages/order/stir-shaken.astro
index 5a5fa47..672f181 100644
--- a/site/src/pages/order/stir-shaken.astro
+++ b/site/src/pages/order/stir-shaken.astro
@@ -1,41 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import TaxDeductibilityNotice from "../../components/TaxDeductibilityNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META, formatUSD } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "stir-shaken";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Posture update + RMD refresh + STI-CA vendor coordination. For carriers moving from robocall-mitigation to partial implementation.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="telecom" />
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
-  <script>
-    if (new URLSearchParams(window.location.search).has("token")) {
-      const p = document.getElementById("pw-price");
-      const t = document.getElementById("pw-tax-notice");
-      if (p) p.style.display = "none";
-      if (t) t.style.display = "none";
-    }
-  </script>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/ucr-registration.astro b/site/src/pages/order/ucr-registration.astro
index ef5fe2f..6c59788 100644
--- a/site/src/pages/order/ucr-registration.astro
+++ b/site/src/pages/order/ucr-registration.astro
@@ -1,39 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "ucr-registration";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Unified Carrier Registration for interstate carriers.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["entity", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["entity", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-price { font-size: 1.5rem; font-weight: 700; color: var(--pw-green, #059669); margin: 0 0 0.75rem; }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/pages/order/usdot-reactivation.astro b/site/src/pages/order/usdot-reactivation.astro
index 09eda05..b367eb4 100644
--- a/site/src/pages/order/usdot-reactivation.astro
+++ b/site/src/pages/order/usdot-reactivation.astro
@@ -1,38 +1,14 @@
 ---
 import Base from "../../layouts/Base.astro";
-import VerticalOrderHeader from "../../components/VerticalOrderHeader.astro";
-import Wizard from "../../components/intake/Wizard.astro";
-import OrderPriceBanner from "../../components/OrderPriceBanner.astro";
-
-import TruckingValueNotice from "../../components/TruckingValueNotice.astro";
-import { INTAKE_MANIFEST, SERVICE_META } from "../../lib/intake_manifest";
+import OrderFlow from "../../components/intake/OrderFlow.astro";
+import { SERVICE_META } from "../../lib/intake_manifest";
 
 const slug = "usdot-reactivation";
-const steps = INTAKE_MANIFEST[slug];
 const meta = SERVICE_META[slug];
 const title = meta ? `Order ${meta.name}` : "Order";
 const description = "Reactivate an inactive or revoked USDOT number and bring your registration back into good standing.";
 ---
 
 <Base title={title} description={description}>
-  <main>
-    <section class="pw-order-intro">
-      <h1>{meta?.name}</h1>
-      <p class="pw-desc">{description}</p>
-    </section>
-
-    <VerticalOrderHeader vertical="trucking" />
-
-    <OrderPriceBanner priceCents={meta?.price_cents} govFeeLabel={meta?.gov_fee_label} serviceSlug={slug} note="Choose card, ACH, or PayPal at payment." />
-    <TruckingValueNotice slug={slug} />
-
-    <Wizard service_slug={slug} steps={steps ?? ["state-trucking", "review", "payment"]} title={meta?.name ?? slug} />
-  </main>
+  <OrderFlow slug={slug} description={description} fallbackSteps={["state-trucking", "review", "payment"]} />
 </Base>
-
-<style>
-  main { max-width: 900px; margin: 0 auto; padding: 2rem 1.25rem 4rem; }
-  .pw-order-intro { margin-bottom: 1.5rem; }
-  .pw-order-intro h1 { margin: 0 0 0.25rem; color: var(--pw-navy, #1a2744); }
-  .pw-desc { color: var(--pw-muted, #64748b); max-width: 48rem; }
-</style>
diff --git a/site/src/partials/footer.html b/site/src/partials/footer.html
index 7fade07..049d069 100644
--- a/site/src/partials/footer.html
+++ b/site/src/partials/footer.html
@@ -46,7 +46,6 @@ Send reset link
         s1.async=true;
         s1.src='https://embed.tawk.to/69d5a9ca0d1c3f1c37998081/1jll9ufph';
         s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
         s0.parentNode.insertBefore(s1,s0);
       })();
     </script>