diff --git a/src/app/page.tsx b/src/app/page.tsx
index bc74906..fcaa04c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
@@ -13,7 +13,7 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
-import { Box, Briefcase, Building2, CheckCircle, Clock, Database, Settings, Wrench } from "lucide-react";
+import { Box, CheckCircle, Clock, Briefcase, Building2, Settings, Wrench } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -33,26 +33,11 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
-          name: "Home",
-          id: "hero",
-        },
-        {
-          name: "About",
-          id: "about",
-        },
-        {
-          name: "Services",
-          id: "services",
-        },
-        {
-          name: "Products",
-          id: "products",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
+        { name: "Home", id: "hero" },
+        { name: "About", id: "about" },
+        { name: "Services", id: "services" },
+        { name: "Products", id: "products" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="Babber Engineering"
     />
@@ -60,67 +45,14 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroBillboard
-      background={{
-        variant: "gradient-bars",
-      }}
+      background={{ variant: "gradient-bars" }}
       title="Precision Engineering & Manufacturing Solutions"
       description="Babber Engineering Works delivers high-performance industrial components and bespoke manufacturing services with unmatched accuracy and reliability."
       buttons={[
-        {
-          text: "Request Quote",
-          href: "#contact",
-        },
-        {
-          text: "View Products",
-          href: "#products",
-        },
+        { text: "Request Quote", href: "#contact" },
+        { text: "View Products", href: "#products" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/mature-craftsman-working-his-workspace-man-wearing-apron-using-special-machine-man-wearing-eyeglasses_1157-51611.jpg"
-      mediaAnimation="slide-up"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/mid-section-craftswoman-working-machine_107420-65173.jpg",
-          alt: "Craftswoman working",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/row-equipment-producing-metal-parts-works-photo-with-depth-field_645730-72.jpg",
-          alt: "Equipment producing metal",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/engineer-factory_1098-14007.jpg",
-          alt: "Engineer at factory",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/inside-factory-unit-with-new-modern-computerized-equipment-mechanisms-box-with-swarf-photo-with-depth-field_645730-62.jpg",
-          alt: "Modern factory unit",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/focused-male-plant-manager-operating-industrial-machine-pushing-buttons-control-panel_74855-16377.jpg",
-          alt: "Plant manager operating",
-        },
-      ]}
-      marqueeItems={[
-        {
-          type: "text",
-          text: "ISO 9001:2015 Certified",
-        },
-        {
-          type: "text",
-          text: "25+ Years Experience",
-        },
-        {
-          type: "text",
-          text: "Advanced CNC Machining",
-        },
-        {
-          type: "text",
-          text: "Global Supply Chain",
-        },
-        {
-          type: "text",
-          text: "Industrial 4.0 Ready",
-        },
-      ]}
     />
   </div>
 
@@ -130,18 +62,9 @@ export default function LandingPage() {
       title="Driving Industrial Excellence"
       description="With over two decades of experience, Babber Engineering Works is a leader in large-scale fabrication, combining cutting-edge technology with artisanal precision to power global manufacturing."
       metrics={[
-        {
-          value: "500+",
-          title: "Projects Completed",
-        },
-        {
-          value: "150+",
-          title: "Clients Served",
-        },
-        {
-          value: "25+",
-          title: "Years Experience",
-        },
+        { value: "500+", title: "Projects Completed" },
+        { value: "150+", title: "Clients Served" },
+        { value: "25+", title: "Years Experience" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/woodworker-black-businesswoman-examining-blueprints-factory-coronavirus-pandemic_637285-11917.jpg"
       mediaAnimation="blur-reveal"
@@ -155,31 +78,11 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={true}
       features={[
-        {
-          icon: Wrench,
-          title: "Custom Fabrication",
-          description: "Tailor-made fabrication for specific industrial needs.",
-        },
-        {
-          icon: Database,
-          title: "Precision Machining",
-          description: "High-accuracy machining with state-of-the-art CNC.",
-        },
-        {
-          icon: Building2,
-          title: "Industrial Components",
-          description: "High-durability components for heavy equipment.",
-        },
-        {
-          icon: Briefcase,
-          title: "Heavy Engineering",
-          description: "Complex engineering for massive infrastructure.",
-        },
-        {
-          icon: Settings,
-          title: "OEM Manufacturing",
-          description: "Seamless OEM integration and manufacturing.",
-        },
+        { icon: Wrench, title: "Custom Fabrication", description: "Tailor-made fabrication for specific industrial needs." },
+        { icon: Database, title: "Precision Machining", description: "High-accuracy machining with state-of-the-art CNC." },
+        { icon: Building2, title: "Industrial Components", description: "High-durability components for heavy equipment." },
+        { icon: Briefcase, title: "Heavy Engineering", description: "Complex engineering for massive infrastructure." },
+        { icon: Settings, title: "OEM Manufacturing", description: "Seamless OEM integration and manufacturing." },
       ]}
       title="Our Specialized Engineering Services"
       description="Comprehensive manufacturing solutions tailored for heavy industry requirements."
@@ -193,60 +96,10 @@ export default function LandingPage() {
       gridVariant="four-items-2x2-equal-grid"
       useInvertedBackground={false}
       products={[
-        {
-          id: "p1",
-          brand: "Babber",
-          name: "Heavy Duty Shafts",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "24",
-          imageSrc: "http://img.b2bpic.net/free-photo/factory-workshop-interior-machines-glass-industry-background-process-production_645730-471.jpg",
-        },
-        {
-          id: "p2",
-          brand: "Babber",
-          name: "Hydraulic Casings",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "18",
-          imageSrc: "http://img.b2bpic.net/free-photo/worker-hard-hat-conducts-system-inspections-offshore-drilling-rig-from-industrial-platform_482257-135940.jpg",
-        },
-        {
-          id: "p3",
-          brand: "Babber",
-          name: "Precision Gears",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "42",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-machine-mechanisms-processing-metal-product-photo-with-depth-field_645730-129.jpg",
-        },
-        {
-          id: "p4",
-          brand: "Babber",
-          name: "Structural Frameworks",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "12",
-          imageSrc: "http://img.b2bpic.net/free-photo/female-electrician-profile-checks-tablet-schematic-by-switchboard-blue-tech_169016-71486.jpg",
-        },
-        {
-          id: "p5",
-          brand: "Babber",
-          name: "Industrial Fasteners",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "89",
-          imageSrc: "http://img.b2bpic.net/free-photo/metal-factory-operator-is-controlling-machine-tool-cutting-steel_613910-5236.jpg",
-        },
-        {
-          id: "p6",
-          brand: "Babber",
-          name: "Engine Blocks",
-          price: "Quote Required",
-          rating: 5,
-          reviewCount: "33",
-          imageSrc: "http://img.b2bpic.net/free-photo/view-male-engineer-work-engineers-day-celebration_23-2151615163.jpg",
-        },
+        { id: "p1", brand: "Babber", name: "Heavy Duty Shafts", price: "Quote Required", rating: 5, reviewCount: "24", imageSrc: "http://img.b2bpic.net/free-photo/factory-workshop-interior-machines-glass-industry-background-process-production_645730-471.jpg" },
+        { id: "p2", brand: "Babber", name: "Hydraulic Casings", price: "Quote Required", rating: 5, reviewCount: "18", imageSrc: "http://img.b2bpic.net/free-photo/worker-hard-hat-conducts-system-inspections-offshore-drilling-rig-from-industrial-platform_482257-135940.jpg" },
+        { id: "p3", brand: "Babber", name: "Precision Gears", price: "Quote Required", rating: 5, reviewCount: "42", imageSrc: "http://img.b2bpic.net/free-photo/close-up-machine-mechanisms-processing-metal-product-photo-with-depth-field_645730-129.jpg" },
+        { id: "p4", brand: "Babber", name: "Structural Frameworks", price: "Quote Required", rating: 5, reviewCount: "12", imageSrc: "http://img.b2bpic.net/free-photo/female-electrician-profile-checks-tablet-schematic-by-switchboard-blue-tech_169016-71486.jpg" },
       ]}
       title="Industrial Product Portfolio"
       description="Quality-assured products built to withstand the harshest environments."
@@ -257,15 +110,7 @@ export default function LandingPage() {
       <SocialProofOne
       textboxLayout="default"
       useInvertedBackground={true}
-      names={[
-        "Automotive",
-        "Construction",
-        "Manufacturing",
-        "Industrial Plants",
-        "Aviation",
-        "Energy",
-        "Infrastructure",
-      ]}
+      names={["Automotive", "Construction", "Manufacturing", "Industrial Plants", "Aviation", "Energy", "Infrastructure"]}
       title="Industries We Serve"
       description="Trusted partner for critical infrastructure and manufacturing sectors worldwide."
     />
@@ -278,27 +123,9 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       metrics={[
-        {
-          id: "m1",
-          value: "99.9%",
-          title: "Quality Acceptance",
-          description: "Zero-defect guarantee on delivery.",
-          icon: CheckCircle,
-        },
-        {
-          id: "m2",
-          value: "24/7",
-          title: "Production Capacity",
-          description: "Operating around the clock.",
-          icon: Clock,
-        },
-        {
-          id: "m3",
-          value: "5k+",
-          title: "Tons Fabricated",
-          description: "Annual throughput capability.",
-          icon: Box,
-        },
+        { id: "m1", value: "99.9%", title: "Quality Acceptance", description: "Zero-defect guarantee on delivery.", icon: CheckCircle },
+        { id: "m2", value: "24/7", title: "Production Capacity", description: "Operating around the clock.", icon: Clock },
+        { id: "m3", value: "5k+", title: "Tons Fabricated", description: "Annual throughput capability.", icon: Box },
       ]}
       title="Quality Performance Indicators"
       description="Continuous improvement and excellence built into every process."
@@ -312,46 +139,8 @@ export default function LandingPage() {
       gridVariant="bento-grid"
       useInvertedBackground={true}
       testimonials={[
-        {
-          id: "1",
-          name: "John Doe",
-          role: "CEO",
-          company: "AutoDrive Corp",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/female-engineers-working_23-2151657880.jpg",
-        },
-        {
-          id: "2",
-          name: "Jane Smith",
-          role: "Plant Manager",
-          company: "BuildRight",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/small-equipments-details-produced-factory-machines_114579-2838.jpg",
-        },
-        {
-          id: "3",
-          name: "Mike Ross",
-          role: "Engineer",
-          company: "Global Power",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/mature-experienced-worker-is-cutting-metal-using-special-machine-tool_613910-17184.jpg",
-        },
-        {
-          id: "4",
-          name: "Sarah Lee",
-          role: "Purchasing",
-          company: "Tech Manufacturing",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-attractive-lady-blue-construction-suit-helmet-controlling-machines-hangar-daytime-buildings-architecture-construction_140725-16222.jpg",
-        },
-        {
-          id: "5",
-          name: "David Kim",
-          role: "Director",
-          company: "Urban Infrastructure",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/man-uniform-protective-mask-is-working-metal-factory_613910-17206.jpg",
-        },
+        { id: "1", name: "John Doe", role: "CEO", company: "AutoDrive Corp", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/female-engineers-working_23-2151657880.jpg" },
+        { id: "2", name: "Jane Smith", role: "Plant Manager", company: "BuildRight", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/small-equipments-details-produced-factory-machines_114579-2838.jpg" },
       ]}
       title="What Our Clients Say"
       description="Trusted by industry leaders for our unwavering commitment to quality."
@@ -359,62 +148,35 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitMedia
-      textboxLayout="split"
-      useInvertedBackground={false}
-      faqs={[
-        {
-          id: "1",
-          title: "How do I request a quote?",
-          content: "Submit your requirements via our RFQ form, and our sales team will process it.",
-        },
-        {
-          id: "2",
-          title: "What is the lead time?",
-          content: "Lead times vary based on component complexity and material availability.",
-        },
-        {
-          id: "3",
-          title: "Do you offer OEM services?",
-          content: "Yes, we specialize in high-volume OEM manufacturing.",
-        },
-        {
-          id: "4",
-          title: "What is your quality guarantee?",
-          content: "All products undergo rigorous inspection before dispatch.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/photovoltaics-factory-worker-uses-tracking-software-tablet-diagnose-system_482257-119776.jpg"
+      <FaqBase
       title="Frequently Asked Questions"
-      description="Answers to common inquiries about our manufacturing process."
-      faqsAnimation="blur-reveal"
-      mediaAnimation="blur-reveal"
+      description="Common inquiries regarding our manufacturing processes."
+      textboxLayout="split"
+      faqsAnimation="slide-up"
+      faqs={[
+        { id: "1", title: "How do I request a quote?", content: "Submit your requirements via our contact form." },
+        { id: "2", title: "What is the typical lead time?", content: "Dependent on technical complexity and material availability." },
+        { id: "3", title: "Do you support OEM orders?", content: "Yes, we are highly experienced in OEM partnerships." },
+      ]}
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCenter
-      useInvertedBackground={true}
-      background={{
-        variant: "rotated-rays-animated-grid",
-      }}
-      tag="Inquiry"
-      title="Ready to Start Your Project?"
-      description="Get in touch with our expert engineering team for custom manufacturing requests."
+      <ContactCTA
+      tag="Contact"
+      title="Connect With Us"
+      description="Reach out to discuss your manufacturing requirements and partnership opportunities."
+      buttons={[{ text: "Get In Touch", href: "#" }]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
-      logoText="Babber Engineering Works"
-      leftLink={{
-        text: "Privacy Policy",
-        href: "#",
-      }}
-      rightLink={{
-        text: "Terms of Service",
-        href: "#",
-      }}
+      <FooterBase
+      logoText="Babber Engineering"
+      columns={[
+        { title: "Services", items: [{ label: "Custom Fabrication", href: "#" }, { label: "Machining", href: "#" }] },
+        { title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "RFQ", href: "#" }] }
+      ]}
     />
   </div>
       </ReactLenis>