diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 4ab3878..65402cc 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -1,5 +1,5 @@
 import FooterSimpleMedia from '@/components/sections/footer/FooterSimpleMedia';
-import NavbarDropdown from '@/components/ui/NavbarDropdown';
+import NavbarFloatingLogo from '@/components/ui/NavbarFloatingLogo';
 import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 import SiteBackgroundSlot from "@/components/ui/SiteBackgroundSlot";
 import { Outlet } from 'react-router-dom';
@@ -41,8 +41,9 @@ export default function Layout() {
     <StyleProvider buttonVariant="expand" siteBackground="noise" heroBackground="lightRaysCenter">
       <SiteBackgroundSlot />
       <SectionErrorBoundary name="navbar">
-        <NavbarDropdown
+        <NavbarFloatingLogo
       logo="IR VELORA"
+      logoImageSrc="https://storage.googleapis.com/webild/users/user_3DzThbztU3c0W5HllLIQEYCVbtM/uploaded-1781597901438-2l3h5mru.png"
       ctaButton={{
         text: "Cart (0)",
         href: "#cart",
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 06d9667..a55b500 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,206 +1,33 @@
-import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSimple from '@/components/sections/faq/FaqSimple';
-import FeaturesComparison from '@/components/sections/features/FeaturesComparison';
-import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
-import TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+// AUTO-GENERATED shell by per-section-migrate.
+// Section bodies live in ./<PageBase>/sections/<X>.tsx. Edit the section
+// files directly. Non-block content (wrappers, non-inlinable sections) is
+// preserved inline; extracted section blocks become <XSection/> refs.
 
-export default function HomePage() {
+import React from 'react';
+import HeroSection from './HomePage/sections/Hero';
+import AboutSection from './HomePage/sections/About';
+import ShopSection from './HomePage/sections/Shop';
+import BestsellersSection from './HomePage/sections/Bestsellers';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import FaqSection from './HomePage/sections/Faq';
+import ContactSection from './HomePage/sections/Contact';
+
+export default function HomePage(): React.JSX.Element {
   return (
-    <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroBillboard
-      title="IR VELORA – Wear Your Identity"
-      description="Premium Streetwear Crafted for the Modern Generation. Elevate your presence with timeless, luxury aesthetics."
-      primaryButton={{
-        text: "Shop Now",
-        href: "#shop",
-      }}
-      secondaryButton={{
-        text: "Explore Collection",
-        href: "#collection",
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/stylish-woman-wearing-medical-mask-outside_23-2148777597.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutMediaOverlay
-      tag="Our Story"
-      title="IR VELORA Represents Confidence"
-      description="Every piece is designed to combine luxury aesthetics with everyday comfort. We believe that fashion is the ultimate expression of individuality and timeless street culture."
-      imageSrc="http://img.b2bpic.net/free-photo/portrait-stylish-woman-posing-fashionable-outfit_23-2149021799.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="shop" data-section="shop">
-    <SectionErrorBoundary name="shop">
-          <FeaturesRevealCardsBento
-      tag="Signature Collection"
-      title="Signature Graphic Tees"
-      description="Our core collection focusing on minimal, impactful graphics with superior quality fabrics."
-      items={[
-        {
-          title: "Velora Core Black",
-          description: "100% premium cotton oversized.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/paper-box-packaging-with-t-shirt-clothing-brands_53876-110832.jpg",
-        },
-        {
-          title: "Velora Core White",
-          description: "Heavyweight luxury construction.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/businesswoman-wearing-formal-white-t-shirt_53876-102929.jpg",
-        },
-        {
-          title: "Velora Classic",
-          description: "Perfect fit, timeless design.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-moving-her-body-full-shot_23-2149429033.jpg",
-        },
-        {
-          title: "Velora Midnight",
-          description: "Luxury dark streetwear edition.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-vector/black-lives-matter-message-lettering_52683-40167.jpg",
-        },
-        {
-          title: "Velora Urban",
-          description: "Architecture-inspired graphics.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-stylish-african-american-guy-white-jacket-looking-aggressive-camera-isolated-white-background_574295-4462.jpg",
-        },
-        {
-          title: "Velora Essential",
-          description: "The foundation of your wardrobe.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-adult-sleeping-stairs_23-2149355969.jpg",
-        },
-        {
-          title: "Velora Archive",
-          description: "Limited series exclusive drops.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/asian-man-holding-his-bike_23-2149003768.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ShopSection />
 
-  <div id="bestsellers" data-section="bestsellers">
-    <SectionErrorBoundary name="bestsellers">
-          <FeaturesComparison
-      tag="Best Sellers"
-      title="Why IR VELORA?"
-      description="We don't follow trends; we set the standards for modern streetwear."
-      negativeItems={[
-        "Fast-fashion low quality",
-        "Synthetic fabric blends",
-        "Disposable production methods",
-      ]}
-      positiveItems={[
-        "Premium heavyweight cotton",
-        "Ethically sourced materials",
-        "Artisan-level finishing",
-        "Timeless minimalist cuts",
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <BestsellersSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialOverlayCards
-      tag="Community"
-      title="Loved by the Bold"
-      description="Join our community of trendsetters and fashion connoisseurs."
-      testimonials={[
-        {
-          name: "Alex R.",
-          role: "Creative",
-          company: "Studio",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-african-american-man-posing-outdoors-paris-happy-smile-fashion-style_1321-3388.jpg",
-        },
-        {
-          name: "Elena M.",
-          role: "Fashion Editor",
-          company: "Vogue",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/stylish-girl-standing-summer-city_1157-21481.jpg",
-        },
-        {
-          name: "Marcus J.",
-          role: "Model",
-          company: "Agency",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-walks-paris-concept-happy-travel-photo_1321-3488.jpg",
-        },
-        {
-          name: "Sophie K.",
-          role: "Influencer",
-          company: "Social",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-teenage-girl-sunglasses-drinking-orange-juice_171337-7088.jpg",
-        },
-        {
-          name: "Liam T.",
-          role: "Artist",
-          company: "Gallery",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-looking-camera_197531-33408.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSimple
-      tag="Help"
-      title="Common Questions"
-      description="Find everything you need to know about our shopping policies."
-      items={[
-        {
-          question: "What is the return policy?",
-          answer: "We offer 30-day hassle-free returns on all unworn items.",
-        },
-        {
-          question: "How do I track my order?",
-          answer: "You will receive an automated tracking link once your order ships.",
-        },
-        {
-          question: "Is the checkout secure?",
-          answer: "Yes, we use industry-standard encryption for all transactions.",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Join Us"
-      text="Sign up for exclusive drops and early access to our premium collections."
-      primaryButton={{
-        text: "Subscribe",
-        href: "#",
-      }}
-      secondaryButton={{
-        text: "Contact Support",
-        href: "#",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ContactSection />
     </>
   );
 }
diff --git a/src/pages/HomePage/sections/About.tsx b/src/pages/HomePage/sections/About.tsx
new file mode 100644
index 0000000..4fdf8fe
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "about" section.
+
+import React from 'react';
+import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutMediaOverlay
+          tag="Our Story"
+          title="IR VELORA Represents Confidence"
+          description="Every piece is designed to combine luxury aesthetics with everyday comfort. We believe that fashion is the ultimate expression of individuality and timeless street culture."
+          imageSrc="http://img.b2bpic.net/free-photo/portrait-stylish-woman-posing-fashionable-outfit_23-2149021799.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Bestsellers.tsx b/src/pages/HomePage/sections/Bestsellers.tsx
new file mode 100644
index 0000000..57342a3
--- /dev/null
+++ b/src/pages/HomePage/sections/Bestsellers.tsx
@@ -0,0 +1,31 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "bestsellers" section.
+
+import React from 'react';
+import FeaturesComparison from '@/components/sections/features/FeaturesComparison';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function BestsellersSection(): React.JSX.Element {
+  return (
+    <div id="bestsellers" data-section="bestsellers">
+        <SectionErrorBoundary name="bestsellers">
+              <FeaturesComparison
+          tag="Best Sellers"
+          title="Why IR VELORA?"
+          description="We don't follow trends; we set the standards for modern streetwear."
+          negativeItems={[
+            "Fast-fashion low quality",
+            "Synthetic fabric blends",
+            "Disposable production methods",
+          ]}
+          positiveItems={[
+            "Premium heavyweight cotton",
+            "Ethically sourced materials",
+            "Artisan-level finishing",
+            "Timeless minimalist cuts",
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Contact.tsx b/src/pages/HomePage/sections/Contact.tsx
new file mode 100644
index 0000000..f2b76e2
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,27 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "contact" section.
+
+import React from 'react';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ContactSection(): React.JSX.Element {
+  return (
+    <div id="contact" data-section="contact">
+        <SectionErrorBoundary name="contact">
+              <ContactCta
+          tag="Join Us"
+          text="Sign up for exclusive drops and early access to our premium collections."
+          primaryButton={{
+            text: "Subscribe",
+            href: "#",
+          }}
+          secondaryButton={{
+            text: "Contact Support",
+            href: "#",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..4efbd81
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,34 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "faq" section.
+
+import React from 'react';
+import FaqSimple from '@/components/sections/faq/FaqSimple';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqSimple
+          tag="Help"
+          title="Common Questions"
+          description="Find everything you need to know about our shopping policies."
+          items={[
+            {
+              question: "What is the return policy?",
+              answer: "We offer 30-day hassle-free returns on all unworn items.",
+            },
+            {
+              question: "How do I track my order?",
+              answer: "You will receive an automated tracking link once your order ships.",
+            },
+            {
+              question: "Is the checkout secure?",
+              answer: "Yes, we use industry-standard encryption for all transactions.",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..59361f1
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,28 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "hero" section.
+
+import React from 'react';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroBillboard
+          title="IR VELORA – Wear Your Identity"
+          description="Premium Streetwear Crafted for the Modern Generation. Elevate your presence with timeless, luxury aesthetics."
+          primaryButton={{
+            text: "Shop Now",
+            href: "#shop",
+          }}
+          secondaryButton={{
+            text: "Explore Collection",
+            href: "#collection",
+          }}
+          imageSrc="http://img.b2bpic.net/free-photo/stylish-woman-wearing-medical-mask-outside_23-2148777597.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Shop.tsx b/src/pages/HomePage/sections/Shop.tsx
new file mode 100644
index 0000000..eef9dac
--- /dev/null
+++ b/src/pages/HomePage/sections/Shop.tsx
@@ -0,0 +1,64 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "shop" section.
+
+import React from 'react';
+import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ShopSection(): React.JSX.Element {
+  return (
+    <div id="shop" data-section="shop">
+        <SectionErrorBoundary name="shop">
+              <FeaturesRevealCardsBento
+          tag="Signature Collection"
+          title="Signature Graphic Tees"
+          description="Our core collection focusing on minimal, impactful graphics with superior quality fabrics."
+          items={[
+            {
+              title: "Velora Core Black",
+              description: "100% premium cotton oversized.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/paper-box-packaging-with-t-shirt-clothing-brands_53876-110832.jpg",
+            },
+            {
+              title: "Velora Core White",
+              description: "Heavyweight luxury construction.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/businesswoman-wearing-formal-white-t-shirt_53876-102929.jpg",
+            },
+            {
+              title: "Velora Classic",
+              description: "Perfect fit, timeless design.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-moving-her-body-full-shot_23-2149429033.jpg",
+            },
+            {
+              title: "Velora Midnight",
+              description: "Luxury dark streetwear edition.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-vector/black-lives-matter-message-lettering_52683-40167.jpg",
+            },
+            {
+              title: "Velora Urban",
+              description: "Architecture-inspired graphics.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/handsome-stylish-african-american-guy-white-jacket-looking-aggressive-camera-isolated-white-background_574295-4462.jpg",
+            },
+            {
+              title: "Velora Essential",
+              description: "The foundation of your wardrobe.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-adult-sleeping-stairs_23-2149355969.jpg",
+            },
+            {
+              title: "Velora Archive",
+              description: "Limited series exclusive drops.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/asian-man-holding-his-bike_23-2149003768.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Testimonials.tsx b/src/pages/HomePage/sections/Testimonials.tsx
new file mode 100644
index 0000000..134971f
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,57 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "testimonials" section.
+
+import React from 'react';
+import TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialOverlayCards
+          tag="Community"
+          title="Loved by the Bold"
+          description="Join our community of trendsetters and fashion connoisseurs."
+          testimonials={[
+            {
+              name: "Alex R.",
+              role: "Creative",
+              company: "Studio",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-african-american-man-posing-outdoors-paris-happy-smile-fashion-style_1321-3388.jpg",
+            },
+            {
+              name: "Elena M.",
+              role: "Fashion Editor",
+              company: "Vogue",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/stylish-girl-standing-summer-city_1157-21481.jpg",
+            },
+            {
+              name: "Marcus J.",
+              role: "Model",
+              company: "Agency",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-walks-paris-concept-happy-travel-photo_1321-3488.jpg",
+            },
+            {
+              name: "Sophie K.",
+              role: "Influencer",
+              company: "Social",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-teenage-girl-sunglasses-drinking-orange-juice_171337-7088.jpg",
+            },
+            {
+              name: "Liam T.",
+              role: "Artist",
+              company: "Gallery",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-looking-camera_197531-33408.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}