diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0ad9897..1b91064 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,16 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
-import FooterMedia from '@/components/sections/footer/FooterMedia';
-import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
-import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
+import { Cpu, Rocket, Zap, Target } from "lucide-react";
+import FaqBase from '@/components/sections/faq/FaqBase';
+import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import HeroBillboardDashboard from '@/components/sections/hero/HeroBillboardDashboard';
+import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
-import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
-import TeamCardSix from '@/components/sections/team/TeamCardSix';
-import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
-import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
+import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 
 export default function LandingPage() {
   return (
@@ -31,359 +29,92 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleCentered
       navItems={[
-        {
-          name: "Evolution",
-          id: "about",
-        },
-        {
-          name: "Ventures",
-          id: "features",
-        },
-        {
-          name: "Impact",
-          id: "metrics",
-        },
-        {
-          name: "Vision",
-          id: "faq",
-        },
+        { name: "Evolution", id: "about" },
+        { name: "Ventures", id: "features" },
+        { name: "Impact", id: "metrics" },
+        { name: "Vision", id: "faq" },
       ]}
       brandName="ELON MUSK"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroSplitKpi
-      background={{
-        variant: "sparkles-gradient",
-      }}
+      <HeroBillboardDashboard
       title="Engineering Tomorrow, Reshaping Humanity Today"
-      description="Explore the evolution of transformative ventures spanning electric mobility, space exploration, neural interfaces, and sustainable energy. A visual journey through past breakthroughs, present momentum, and future possibilities."
-      kpis={[
-        {
-          value: "20+",
-          label: "Years Visionary Execution",
-        },
-        {
-          value: "6",
-          label: "Transformative Ventures",
-        },
-        {
-          value: "100K+",
-          label: "Humanity Impact Factor",
-        },
-      ]}
-      enableKpiAnimation={true}
-      buttons={[
-        {
-          text: "Begin the Journey",
-          href: "#about",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/ski-tracks-le-tours-chamonix_181624-27328.jpg?_wi=1"
-      mediaAnimation="blur-reveal"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/aesthetic-planet-ocean-background-galaxy-nature-remix_53876-129796.jpg",
-          alt: "Astronaut exploration",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/still-life-space-assortment-with-astronaut_23-2149101766.jpg",
-          alt: "Space technology",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/still-life-space-arrangement-with-astronaut_23-2149101750.jpg",
-          alt: "Scientific innovation",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/beautiful-desert-nature-background-with-dark-planet-galaxy-remix_53876-125214.jpg",
-          alt: "Planetary vision",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/ski-tracks-le-tours-chamonix_181624-27328.jpg",
-          alt: "Falcon 9 launch",
-        },
-      ]}
-      marqueeItems={[
-        {
-          type: "text",
-          text: "Sustainability",
-        },
-        {
-          type: "text",
-          text: "Multi-Planetary",
-        },
-        {
-          type: "text",
-          text: "Neural Innovation",
-        },
-        {
-          type: "text",
-          text: "First Principles",
-        },
-        {
-          type: "text",
-          text: "Advanced Engineering",
-        },
-      ]}
+      description="A visual journey through the first-principles engineering and transformative ventures defining our future."
+      dashboard={{
+        title: "Ventures Performance Dashboard",        stats: [
+          { title: "Scale", values: [20, 15, 10], description: "Years of iterative disruption" },
+          { title: "Reach", values: [90, 80, 70], description: "Global operational footprint" },
+          { title: "Impact", values: [100, 95, 99], description: "Sustainability factor" }
+        ],
+        logoIcon: Rocket,
+        sidebarItems: [{ icon: Rocket, active: true }, { icon: Cpu }, { icon: Zap }],
+        imageSrc: "http://img.b2bpic.net/free-photo/ski-tracks-le-tours-chamonix_181624-27328.jpg?_wi=1"
+      }}
     />
   </div>
 
   <div id="about" data-section="about">
-      <TextSplitAbout
-      useInvertedBackground={false}
+      <MetricSplitMediaAbout
       title="A Legacy of Disruption"
-      description={[
-        "From pioneering sustainable energy with Tesla to pushing the boundaries of interplanetary travel with SpaceX, Elon Musk's journey is defined by a singular focus: solving humanity's most critical challenges.",
-        "Every venture represents an evolution in strategic thinking, technical execution, and the courage to iterate in the face of impossible odds.",
+      description="From sustainable energy to multi-planetary systems, we prioritize first-principles thinking to solve the impossible."
+      metrics={[
+        { title: "Disruptive Ventures", value: "6+" },
+        { title: "Global Impact", value: "1M+" }
       ]}
     />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureCardTwentyThree
-      animationType="slide-up"
-      textboxLayout="split"
-      useInvertedBackground={true}
-      features={[
-        {
-          id: "f1",
-          title: "Electric Mobility",
-          tags: [
-            "Automotive",
-            "Innovation",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/man-using-digital-tablet-while-charging-electric-car_107420-94887.jpg?_wi=1",
-        },
-        {
-          id: "f2",
-          title: "Neural Interfaces",
-          tags: [
-            "Biotech",
-            "Future",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-render-abstract-background-with-digital-cyber-particles-design_1048-13025.jpg?_wi=1",
-        },
-        {
-          id: "f3",
-          title: "Sustainable Energy",
-          tags: [
-            "Renewable",
-            "Scalability",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/teamworking-factory-colleagues-researching-new-photovoltaics-materials_482257-126774.jpg?_wi=1",
-        },
-      ]}
+      <FeatureBorderGlow
       title="Core Foundations"
       description="Technological pillars driving innovation and planetary transition."
+      useInvertedBackground={true}
+      animationType="blur-reveal"
+      textboxLayout="split"
+      features={[
+        { icon: Zap, title: "Electric Mobility", description: "Redefining the automotive industry through sustainable scale." },
+        { icon: Rocket, title: "Aerospace Engineering", description: "Making life multi-planetary with reusable launch vehicles." },
+        { icon: Cpu, title: "Neural Interfaces", description: "Advancing human capability through symbiotic integration." }
+      ]}
     />
   </div>
 
   <div id="metrics" data-section="metrics">
-      <MetricCardFourteen
-      useInvertedBackground={false}
+      <MetricCardThree
       title="Global Impact Metrics"
-      tag="Performance Data"
+      animationType="blur-reveal"
+      textboxLayout="split"
       metrics={[
-        {
-          id: "m1",
-          value: "2M+",
-          description: "Electric Vehicles Delivered",
-        },
-        {
-          id: "m2",
-          value: "300+",
-          description: "Rocket Missions Successful",
-        },
-        {
-          id: "m3",
-          value: "100+",
-          description: "Gigawatt Scale Energy Installed",
-        },
+        { id: "m1", icon: Zap, title: "EVs Delivered", value: "2M+" },
+        { id: "m2", icon: Rocket, title: "Successful Launches", value: "300+" },
+        { id: "m3", icon: Target, title: "Gigawatt Scale", value: "100+" }
       ]}
-      metricsAnimation="slide-up"
-    />
-  </div>
-
-  <div id="team" data-section="team">
-      <TeamCardSix
-      animationType="slide-up"
-      textboxLayout="split"
-      gridVariant="three-columns-all-equal-width"
-      useInvertedBackground={true}
-      members={[
-        {
-          id: "t1",
-          name: "Elon Musk",
-          role: "CEO & Chief Engineer",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-brutal-bearded-macho-male-dressed-suit-dark-grey-background_613910-1524.jpg",
-        },
-        {
-          id: "t2",
-          name: "Gwynne Shotwell",
-          role: "President & COO",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-middle-aged-businesswoman_23-2148204386.jpg",
-        },
-        {
-          id: "t3",
-          name: "Franz von Holzhausen",
-          role: "Chief Designer",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-confident-successful-businesswoman-suit-cross-arms-chest-standing_1258-118021.jpg",
-        },
-      ]}
-      title="The Execution Core"
-      description="Leading global teams towards an accelerated future."
-    />
-  </div>
-
-  <div id="testimonials" data-section="testimonials">
-      <TestimonialCardFive
-      textboxLayout="split"
-      useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "1",
-          name: "Sarah Johnson",
-          date: "2024",
-          title: "Lead Investor",
-          quote: "His vision is essentially re-writing the future of human energy consumption.",
-          tag: "Investor",
-          avatarSrc: "http://img.b2bpic.net/free-photo/side-view-smiley-modern-female_23-2148415853.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/ski-tracks-le-tours-chamonix_181624-27328.jpg?_wi=2",
-          imageAlt: "business executive headshot",
-        },
-        {
-          id: "2",
-          name: "Michael Chen",
-          date: "2024",
-          title: "Tech Pioneer",
-          quote: "Execution capability unmatched in the modern industry.",
-          tag: "Tech",
-          avatarSrc: "http://img.b2bpic.net/free-photo/portrait-brutal-bearded-macho-male-dressed-suit-dark-grey-background_613910-9486.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/minimal-digital-futuristic-technology-background_53876-102622.jpg",
-          imageAlt: "business executive headshot",
-        },
-        {
-          id: "3",
-          name: "Emily Rodriguez",
-          date: "2023",
-          title: "Strategy Lead",
-          quote: "Unparalleled focus on first-principles thinking.",
-          tag: "Strategy",
-          avatarSrc: "http://img.b2bpic.net/free-photo/middle-age-businessman-smiling-happy-standing-city_839833-25759.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-using-digital-tablet-while-charging-electric-car_107420-94887.jpg?_wi=2",
-          imageAlt: "business executive headshot",
-        },
-        {
-          id: "4",
-          name: "David Kim",
-          date: "2023",
-          title: "Energy Analyst",
-          quote: "Setting the bar for global sustainable infrastructure.",
-          tag: "Energy",
-          avatarSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-holding-jacket-shoulder_1262-3853.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-render-abstract-background-with-digital-cyber-particles-design_1048-13025.jpg?_wi=2",
-          imageAlt: "business executive headshot",
-        },
-        {
-          id: "5",
-          name: "Elena Rossi",
-          date: "2024",
-          title: "Aerospace Fellow",
-          quote: "Redefining aerospace engineering economics.",
-          tag: "Aerospace",
-          avatarSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/teamworking-factory-colleagues-researching-new-photovoltaics-materials_482257-126774.jpg?_wi=2",
-          imageAlt: "business executive headshot",
-        },
-      ]}
-      title="Industry Perspectives"
-      description="Insights from leaders shaping the technology landscape."
-    />
-  </div>
-
-  <div id="socialProof" data-section="socialProof">
-      <SocialProofOne
-      textboxLayout="split"
-      useInvertedBackground={true}
-      names={[
-        "SpaceX",
-        "Tesla",
-        "Neuralink",
-        "The Boring Company",
-        "X Corp",
-        "Starlink",
-        "xAI",
-      ]}
-      title="Affiliated Ventures"
-      description="A ecosystem of companies building the future."
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitMedia
-      textboxLayout="split"
-      useInvertedBackground={false}
-      faqs={[
-        {
-          id: "q1",
-          title: "What is the ultimate mission?",
-          content: "To ensure humanity's long-term survival by accelerating the transition to sustainable energy and establishing a multi-planetary presence.",
-        },
-        {
-          id: "q2",
-          title: "How does technology integration work?",
-          content: "By leveraging first-principles thinking to optimize systems engineering across diverse, highly complex domains.",
-        },
-        {
-          id: "q3",
-          title: "What's the next frontier?",
-          content: "Expanding neuro-technological capacity and establishing permanent infrastructure on Mars.",
-        },
-      ]}
+      <FaqBase
       title="Strategic Vision"
       description="Common inquiries on the trajectory of the ventures."
       faqsAnimation="blur-reveal"
-      imageSrc="http://img.b2bpic.net/free-photo/woman-orbital-station-analyzing-mars-planetary-information-tablet_482257-126233.jpg"
-      mediaAnimation="blur-reveal"
+      faqs={[
+        { id: "q1", title: "What is the ultimate mission?", content: "Accelerating the transition to sustainable energy and establishing a multi-planetary presence." },
+        { id: "q2", title: "How does technology integration work?", content: "Leveraging first-principles thinking to optimize complex systems engineering." },
+        { id: "q3", title: "What's the next frontier?", content: "Expanding neuro-technological capacity and permanent Mars infrastructure." }
+      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterMedia
-      imageSrc="http://img.b2bpic.net/free-photo/abstract-geometric-twisted-folds-background_1048-15994.jpg"
+      <FooterLogoReveal
       logoText="ELON MUSK"
-      columns={[
-        {
-          title: "Ventures",
-          items: [
-            {
-              label: "Tesla",
-              href: "#",
-            },
-            {
-              label: "SpaceX",
-              href: "#",
-            },
-          ],
-        },
-        {
-          title: "Company",
-          items: [
-            {
-              label: "X Corp",
-              href: "#",
-            },
-            {
-              label: "Neuralink",
-              href: "#",
-            },
-          ],
-        },
-      ]}
+      leftLink={{ text: "Privacy Policy", href: "#" }}
+      rightLink={{ text: "Terms of Service", href: "#" }}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file