diff --git a/src/app/page.tsx b/src/app/page.tsx
index e5bc4eb..14ace6f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,12 +6,13 @@ import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNineteen';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroOverlay from '@/components/sections/hero/HeroOverlay';
+import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
+import SplitAbout from '@/components/sections/about/SplitAbout';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
+import { Dumbbell, Target, Users } from 'lucide-react';
 
 export default function LandingPage() {
   return (
@@ -31,84 +32,45 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
-          name: "About",
-          id: "about",
-        },
-        {
-          name: "Features",
-          id: "features",
-        },
-        {
-          name: "Pricing",
-          id: "pricing",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
+        { name: "About", id: "about" },
+        { name: "Features", id: "features" },
+        { name: "Pricing", id: "pricing" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="IronCore Gym"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroOverlay
+      <HeroBillboardRotatedCarousel
       title="Build Your Strength at IronCore"
       description="Premium training facility equipped with the latest technology to help you crush your personal goals."
-      buttons={[
-        {
-          text: "Start Training",
-          href: "#pricing",
-        },
+      background={{ variant: "rotated-rays-static" }}
+      buttons={[{ text: "Start Training", href: "#pricing" }]}
+      carouselItems={[
+        { id: "1", imageSrc: "http://img.b2bpic.net/free-photo/athletic-brunette-female-fitness-model-stretching-gym-club_613910-15588.jpg" },
+        { id: "2", imageSrc: "http://img.b2bpic.net/free-photo/young-pretty-woman-working-out-with-personal-weight-modern-gym_158595-2283.jpg" },
+        { id: "3", imageSrc: "http://img.b2bpic.net/free-photo/female-jumping-studio-near-gray-wall_158538-3669.jpg" },
+        { id: "4", imageSrc: "http://img.b2bpic.net/free-photo/fit-people-training-together-gym-full-shot_23-2149734678.jpg" },
+        { id: "5", imageSrc: "http://img.b2bpic.net/free-photo/full-shot-woman-training-abs_23-2149036404.jpg" },
+        { id: "6", imageSrc: "http://img.b2bpic.net/free-photo/people-sports-fitness-active-healthy-lifestyle-concept-attractive-fit-young-mixed-race-male-with-muscular-shoulders-posing-studio-keeping-arms-folded-his-look-expressing-confidence_343059-339.jpg" }
       ]}
-      imageSrc="http://img.b2bpic.net/free-photo/athletic-brunette-female-fitness-model-stretching-gym-club_613910-15588.jpg"
-      imageAlt="Modern gym interior"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/young-pretty-woman-working-out-with-personal-weight-modern-gym_158595-2283.jpg",
-          alt: "Young pretty woman working out",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/female-jumping-studio-near-gray-wall_158538-3669.jpg",
-          alt: "Female jumping in studio",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/fit-people-training-together-gym-full-shot_23-2149734678.jpg",
-          alt: "Fit people training together",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/full-shot-woman-training-abs_23-2149036404.jpg",
-          alt: "Woman training abs",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/people-sports-fitness-active-healthy-lifestyle-concept-attractive-fit-young-mixed-race-male-with-muscular-shoulders-posing-studio-keeping-arms-folded-his-look-expressing-confidence_343059-339.jpg",
-          alt: "Confident fit male posing",
-        },
-      ]}
-      avatarText="Join 10,000+ members"
     />
   </div>
 
   <div id="about" data-section="about">
-      <MetricSplitMediaAbout
-      useInvertedBackground={false}
+      <SplitAbout
       title="Experience Excellence"
-      description="At IronCore, we prioritize performance, hygiene, and community support in everything we do."
-      metrics={[
-        {
-          value: "10k+",
-          title: "Members Trained",
-        },
-        {
-          value: "50+",
-          title: "Pro Coaches",
-        },
+      description="At IronCore, we prioritize performance, hygiene, and community support in everything we do. Our state-of-the-art facility is designed for athletes of all levels, providing the tools and environment necessary for peak human performance."
+      bulletPoints={[
+        { title: "Professional Guidance", description: "Certified coaches to guide your training.", icon: Dumbbell },
+        { title: "Performance Focused", description: "Training programs built for results.", icon: Target },
+        { title: "Strong Community", description: "Join a tribe that pushes you forward.", icon: Users }
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/two-internationals-friends-is-engaged-gym_1157-32155.jpg"
-      imageAlt="About our gym"
-      mediaAnimation="slide-up"
-      metricsAnimation="slide-up"
+      imagePosition="right"
+      textboxLayout="split"
+      useInvertedBackground={false}
     />
   </div>
 
@@ -117,27 +79,9 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={false}
       features={[
-        {
-          tag: "Conditioning",
-          title: "State-of-the-art Gear",
-          subtitle: "High performance",
-          description: "Our machines are calibrated for maximum muscle engagement.",
-          imageSrc: "http://img.b2bpic.net/free-photo/sports-equipment-isolated-grey-pink-surface_176420-11908.jpg",
-        },
-        {
-          tag: "Cardio",
-          title: "Group Fitness Studios",
-          subtitle: "Community energy",
-          description: "Experience energy-packed spin and HIIT classes with expert instructors.",
-          imageSrc: "http://img.b2bpic.net/free-photo/men-women-gym-cycling-together-happily-generated-by-ai_188544-10868.jpg",
-        },
-        {
-          tag: "Recovery",
-          title: "Recovery Spa",
-          subtitle: "Peak performance",
-          description: "Relax your muscles in our premium sauna and cold plunge zone.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-having-rest-sauna-alone_169016-22235.jpg",
-        },
+        { tag: "Conditioning", title: "State-of-the-art Gear", subtitle: "High performance", description: "Our machines are calibrated for maximum muscle engagement.", imageSrc: "http://img.b2bpic.net/free-photo/sports-equipment-isolated-grey-pink-surface_176420-11908.jpg" },
+        { tag: "Cardio", title: "Group Fitness Studios", subtitle: "Community energy", description: "Experience energy-packed spin and HIIT classes with expert instructors.", imageSrc: "http://img.b2bpic.net/free-photo/men-women-gym-cycling-together-happily-generated-by-ai_188544-10868.jpg" },
+        { tag: "Recovery", title: "Recovery Spa", subtitle: "Peak performance", description: "Relax your muscles in our premium sauna and cold plunge zone.", imageSrc: "http://img.b2bpic.net/free-photo/young-woman-having-rest-sauna-alone_169016-22235.jpg" },
       ]}
       title="Advanced Fitness Solutions"
       description="We offer everything you need to succeed, from recovery to intense conditioning."
@@ -150,21 +94,9 @@ export default function LandingPage() {
       title="Performance at Scale"
       tag="IronCore Impact"
       metrics={[
-        {
-          id: "m1",
-          value: "24/7",
-          description: "Access to facilities",
-        },
-        {
-          id: "m2",
-          value: "99%",
-          description: "Equipment uptime",
-        },
-        {
-          id: "m3",
-          value: "500+",
-          description: "Classes per week",
-        },
+        { id: "m1", value: "24/7", description: "Access to facilities" },
+        { id: "m2", value: "99%", description: "Equipment uptime" },
+        { id: "m3", value: "500+", description: "Classes per week" },
       ]}
     />
   </div>
@@ -176,52 +108,19 @@ export default function LandingPage() {
       useInvertedBackground={false}
       plans={[
         {
-          id: "basic",
-          title: "Essentials",
-          price: "$39",
-          period: "/mo",
-          features: [
-            "Open access",
-            "Free weights",
-            "Cardio machines",
-          ],
-          button: {
-            text: "Get Started",
-            href: "#",
-          },
-          imageSrc: "http://img.b2bpic.net/free-vector/gradient-personal-trainer-labels-template_23-2149500600.jpg",
+          id: "basic",          title: "Essentials",          price: "$39",          period: "/mo",          features: ["Open access", "Free weights", "Cardio machines"],
+          button: { text: "Get Started", href: "#" },
+          imageSrc: "http://img.b2bpic.net/free-vector/gradient-personal-trainer-labels-template_23-2149500600.jpg"
         },
         {
-          id: "pro",
-          title: "Performance",
-          price: "$69",
-          period: "/mo",
-          features: [
-            "All Essentials",
-            "5 PT sessions",
-            "Sauna access",
-          ],
-          button: {
-            text: "Get Pro",
-            href: "#",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-black-man-lifting-barbell-with-personal-trainer_1262-16411.jpg",
+          id: "pro",          title: "Performance",          price: "$69",          period: "/mo",          features: ["All Essentials", "5 PT sessions", "Sauna access"],
+          button: { text: "Get Pro", href: "#" },
+          imageSrc: "http://img.b2bpic.net/free-photo/smiling-black-man-lifting-barbell-with-personal-trainer_1262-16411.jpg"
         },
         {
-          id: "elite",
-          title: "Elite Athlete",
-          price: "$99",
-          period: "/mo",
-          features: [
-            "Unlimited classes",
-            "10 PT sessions",
-            "Recovery lounge",
-          ],
-          button: {
-            text: "Go Elite",
-            href: "#",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/exhausted-woman-gym_23-2148111551.jpg",
+          id: "elite",          title: "Elite Athlete",          price: "$99",          period: "/mo",          features: ["Unlimited classes", "10 PT sessions", "Recovery lounge"],
+          button: { text: "Go Elite", href: "#" },
+          imageSrc: "http://img.b2bpic.net/free-photo/exhausted-woman-gym_23-2148111551.jpg"
         },
       ]}
       title="Membership Plans"
@@ -236,46 +135,11 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       testimonials={[
-        {
-          id: "1",
-          name: "John Smith",
-          role: "Crossfit Athlete",
-          company: "Elite Fit",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/joyful-smiling-afro-american-man-with-bushy-hairstyle-wearing-big-headphones_176420-19943.jpg",
-        },
-        {
-          id: "2",
-          name: "Jane Doe",
-          role: "Runner",
-          company: "Marathoners",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-fit-sporty-girl-woman-black-sportswear-demostrate-her-strong-muscular-body-stretching_231208-4090.jpg",
-        },
-        {
-          id: "3",
-          name: "Mike Ross",
-          role: "Bodybuilder",
-          company: "Iron Lift",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-happy-athletic-woman-doing-stretching-exercises-while-working-out-home_637285-5156.jpg",
-        },
-        {
-          id: "4",
-          name: "Sarah Lee",
-          role: "Yoga Instructor",
-          company: "Zen Flow",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-muscular-tattooed-strong-muscle-bearded-european-man-doing-hard-exercise_343596-1202.jpg",
-        },
-        {
-          id: "5",
-          name: "Chris P.",
-          role: "Weightlifter",
-          company: "Pro Lifters",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/fit-woman-gym-side-view_23-2149445952.jpg",
-        },
+        { id: "1", name: "John Smith", role: "Crossfit Athlete", company: "Elite Fit", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/joyful-smiling-afro-american-man-with-bushy-hairstyle-wearing-big-headphones_176420-19943.jpg" },
+        { id: "2", name: "Jane Doe", role: "Runner", company: "Marathoners", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-fit-sporty-girl-woman-black-sportswear-demostrate-her-strong-muscular-body-stretching_231208-4090.jpg" },
+        { id: "3", name: "Mike Ross", role: "Bodybuilder", company: "Iron Lift", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-happy-athletic-woman-doing-stretching-exercises-while-working-out-home_637285-5156.jpg" },
+        { id: "4", name: "Sarah Lee", role: "Yoga Instructor", company: "Zen Flow", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-muscular-tattooed-strong-muscle-bearded-european-man-doing-hard-exercise_343596-1202.jpg" },
+        { id: "5", name: "Chris P.", role: "Weightlifter", company: "Pro Lifters", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/fit-woman-gym-side-view_23-2149445952.jpg" },
       ]}
       title="Hear from Our Athletes"
       description="Trusted by hundreds of members who transformed their lifestyle."
@@ -287,21 +151,9 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
-        {
-          id: "1",
-          title: "Do I need an orientation?",
-          content: "Yes, our team will give you a full tour and machine setup session.",
-        },
-        {
-          id: "2",
-          title: "Can I bring a friend?",
-          content: "Our Elite plan includes guest passes.",
-        },
-        {
-          id: "3",
-          title: "How do I book classes?",
-          content: "Use our member portal app for easy scheduling.",
-        },
+        { id: "1", title: "Do I need an orientation?", content: "Yes, our team will give you a full tour and machine setup session." },
+        { id: "2", title: "Can I bring a friend?", content: "Our Elite plan includes guest passes." },
+        { id: "3", title: "How do I book classes?", content: "Use our member portal app for easy scheduling." },
       ]}
       title="Frequently Asked Questions"
       description="Everything you need to know about starting your fitness journey with us."
@@ -312,9 +164,7 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactCenter
       useInvertedBackground={false}
-      background={{
-        variant: "animated-grid",
-      }}
+      background={{ variant: "animated-grid" }}
       tag="Get Started"
       title="Join Today"
       description="Enter your email to receive a free day pass."
@@ -324,14 +174,8 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoReveal
       logoText="IronCore Gym"
-      leftLink={{
-        text: "Privacy Policy",
-        href: "#",
-      }}
-      rightLink={{
-        text: "Terms of Service",
-        href: "#",
-      }}
+      leftLink={{ text: "Privacy Policy", href: "#" }}
+      rightLink={{ text: "Terms of Service", href: "#" }}
     />
   </div>
       </ReactLenis>