diff --git a/src/components/ui/NavbarFloatingLogo.tsx b/src/components/ui/NavbarFloatingLogo.tsx
index f4bcdba..4f9ddca 100644
--- a/src/components/ui/NavbarFloatingLogo.tsx
+++ b/src/components/ui/NavbarFloatingLogo.tsx
@@ -46,7 +46,7 @@ const NavbarFloatingLogo = ({ logo, logoImageSrc, navItems, ctaButton }: NavbarF
         )}
       </AnimatePresence>
 
-      <nav data-section="navbar" className="fixed md:absolute z-1000 top-5 left-1/2 -translate-x-1/2 w-content-width">
+      <nav data-section="navbar" className="fixed z-1000 top-5 left-1/2 -translate-x-1/2 w-content-width">
         <div className="mx-auto w-full md:w-1/2 overflow-hidden rounded backdrop-blur-sm card">
           <div className="relative z-10 flex items-center justify-between gap-3 xl:gap-4 2xl:gap-5 p-3 xl:p-4 2xl:p-5">
             <a href="/" className="flex items-center gap-2">
diff --git a/src/pages/AboutPage.tsx b/src/pages/AboutPage.tsx
index c71099c..c078e21 100644
--- a/src/pages/AboutPage.tsx
+++ b/src/pages/AboutPage.tsx
@@ -24,8 +24,8 @@ export default function AboutPage() {
             title="Evidence-based relief."
             description="Combining structural integrity with neurological regulation."
             features={[
-              { title: "Structural Focus", description: "Addressing the physical hardware to improve system throughput.", bentoComponent: "media-stack", mediaItems: [{ imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8" }, { imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8" }, { imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8" }] },
-              { title: "Neurological Mapping", description: "Understanding how your environment dictates your internal state.", bentoComponent: "media-stack", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg" }] }
+              { title: "Structural Focus", description: "Addressing the physical hardware to improve system throughput.", bentoComponent: "media-stack", mediaItems: [{ imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8&_wi=1" }, { imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8&_wi=2" }, { imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=ze9tj8&_wi=3" }] },
+              { title: "Neurological Mapping", description: "Understanding how your environment dictates your internal state.", bentoComponent: "media-stack", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg?_wi=1" }, { imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg?_wi=2" }, { imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg?_wi=3" }] }
             ]}
             textAnimation="slide-up"
           />
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 3fdc18f..39acf50 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,31 +1,108 @@
-// AUTO-GENERATED shell by per-section-migrate.
-// Section bodies live in the sibling sections/ folder (one file per section).
-// Edit those section files directly. Non-block content (wrappers,
-// non-inlinable sections) is preserved inline; extracted section blocks
-// become component refs.
+import HeroSplitVerticalMarqueeTall from '@/components/sections/hero/HeroSplitVerticalMarqueeTall';
+import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
+import FeaturesBento from '@/components/sections/features/FeaturesBento';
+import MetricsFeatureCards from '@/components/sections/metrics/MetricsFeatureCards';
+import TestimonialColumnMarqueeCards from '@/components/sections/testimonial/TestimonialColumnMarqueeCards';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 
-import React from 'react';
-import HeroSection from './HomePage/sections/Hero';
-import AboutSection from './HomePage/sections/About';
-import FeaturesSection from './HomePage/sections/Features';
-import MetricsSection from './HomePage/sections/Metrics';
-import TestimonialSection from './HomePage/sections/Testimonial';
-import ContactSection from './HomePage/sections/Contact';
-
-export default function HomePage(): React.JSX.Element {
+export default function HomePage() {
   return (
-<>
-      <HeroSection />
+    <>
+      <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+          <HeroSplitVerticalMarqueeTall
+            tag="Nervous System Regulation Expert"
+            title="There's no universal way to regulate a nervous system. There's yours."
+            description="Most nervous system advice is built for a system that isn't yours. Take the 2-minute quiz built by a practicing clinician — find out exactly which way your nervous system is stuck, and the protocol built for that, not someone else's."
+            primaryButton={{ text: "Take the Free Nervous System Quiz", href: "#" }}
+            secondaryButton={{ text: "Learn More", href: "/about" }}
+            leftItems={[
+              { imageSrc: "http://img.b2bpic.net/free-photo/attractive-smiling-doctor-holding-hand-heart-dreamily-looking-camera-isolated-tender-touched-expression_574295-2653.jpg?_wi=4" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/braille-alpahbet-pills-container-top-view_23-2148718145.jpg" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/pleased-young-male-doctor-wearing-medical-coat-stethoscope-around-his-neck-looking-side-isolated-blue-background_141793-133933.jpg" }
+            ]}
+            rightItems={[
+              { imageSrc: "http://img.b2bpic.net/free-photo/hand-holding-pills-container_23-2148718176.jpg" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-pills-containers-stethoscope_23-2148718178.jpg" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-joyful-male-doctor_171337-1489.jpg" }
+            ]}
+            textAnimation="slide-up"
+          />
+        </SectionErrorBoundary>
+      </div>
 
-      <AboutSection />
+      <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+          <AboutMediaOverlay
+            tag="The Framework"
+            title="You're not failing at regulation. You were given the wrong protocol."
+            description="The nervous system space is full of generic advice — breathe this way, cold plunge, 'just relax' — handed to everyone the same way. It fails constantly, because a system stuck in shutdown needs the opposite of one stuck in high-alert. Tell a wired system to slow down, it helps. Tell a shut-down system the same thing, it sinks deeper. Same advice, opposite result. That's not a personal failure. That's a category error in the advice itself."
+            textAnimation="slide-up"
+            imageSrc="https://storage.googleapis.com/webild/users/user_3FsC0wB8czDFk8S4DfiXOATKTCs/uploaded-1782927149388-8rsakfoc.jpg"
+          />
+        </SectionErrorBoundary>
+      </div>
 
-      <FeaturesSection />
+      <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+          <FeaturesBento
+            tag="The Three Types"
+            title="Every nervous system runs one of three ways."
+            description="Stop chasing generic health trends and understand your biological baseline."
+            features={[
+              { title: "Hyperactive", description: "Fight-or-Flight. Racing thoughts, anxious, 'tired but wired,' shallow sleep, jaw and neck tension.", bentoComponent: "info-card-marquee", infoCards: [{ icon: "Zap", label: "State", value: "High Alert" }] },
+              { title: "Hypoactive", description: "Freeze-Shutdown. Fatigue that sleep doesn't fix, brain fog, numbness, low motivation, checked out.", bentoComponent: "info-card-marquee", infoCards: [{ icon: "Snowflake", label: "State", value: "Shutdown" }] },
+              { title: "Regulated", description: "Flexible. Spikes under real stress, recovers, comes back to baseline.", bentoComponent: "info-card-marquee", infoCards: [{ icon: "CheckCircle", label: "State", value: "Baseline" }] }
+            ]}
+            textAnimation="slide-up"
+          />
+        </SectionErrorBoundary>
+      </div>
 
-      <MetricsSection />
+      <div id="metrics" data-section="metrics">
+        <SectionErrorBoundary name="metrics">
+          <MetricsFeatureCards
+            tag="Clinical Rigor"
+            title="Built by a clinician who sees this every day."
+            description="Dr. Cam Daniels uses objective metrics to guide care, not intuition."
+            metrics={[
+              { value: "80+", title: "Peer-Reviewed Studies", features: ["Advanced Neurological Research", "Validated Biomechanical Mapping", "System-Specific Protocols"] }
+            ]}
+            textAnimation="slide-up"
+          />
+        </SectionErrorBoundary>
+      </div>
 
-      <TestimonialSection />
+      <div id="testimonial" data-section="testimonial">
+        <SectionErrorBoundary name="testimonial">
+          <TestimonialColumnMarqueeCards
+            tag="Social Proof"
+            title="Real systems. Real results."
+            description="What our clients are saying about the regulation framework."
+            testimonials={[
+              { name: "Sarah J.", role: "Professional", quote: "Finally understood why my anxiety wouldn't subside. The protocol changed everything.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-senior-entrepreneur_1098-15359.jpg" },
+              { name: "Mark D.", role: "Entrepreneur", quote: "I was stuck in shutdown for years. Cam's clarity was the lever I needed.", imageSrc: "http://img.b2bpic.net/free-photo/smiling-female-doctor-medical-setting_23-2152005921.jpg" },
+              { name: "Emily R.", role: "Creative", quote: "Stop guessing. This framework actually works for my biology.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-beautiful-female-doctor-happily-looking-camera-smiling-white-background_574295-2641.jpg" },
+              { name: "David K.", role: "Developer", quote: "Data-backed, simple, and effective. The regulation protocol is genius.", imageSrc: "http://img.b2bpic.net/free-photo/physician-having-conversation-with-adult-medical-cabinet-taking-notes-about-health-care-diagnosis-general-practitioner-talking-mother-about-recovery-treatment-appointment_482257-41817.jpg" },
+              { name: "Lisa B.", role: "Teacher", quote: "Shifted my daily fatigue in weeks. I'm finally recovering.", imageSrc: "http://img.b2bpic.net/free-photo/closeup-patient-man-looking-into-camera-waiting-doctors-start-stomatology-surgery-sitting-dental-chair_482257-4877.jpg" }
+            ]}
+            textAnimation="slide-up"
+          />
+        </SectionErrorBoundary>
+      </div>
 
-      <ContactSection />
+      <div id="contact" data-section="contact">
+        <SectionErrorBoundary name="contact">
+          <ContactCta
+            tag="Pick your path"
+            text="Start your regulation journey today."
+            primaryButton={{ text: "Take the Quiz", href: "#" }}
+            secondaryButton={{ text: "Join the Blueprint", href: "/blueprint" }}
+            textAnimation="slide-up"
+          />
+        </SectionErrorBoundary>
+      </div>
     </>
   );
-}
+}
\ No newline at end of file