diff --git a/src/app/page.tsx b/src/app/page.tsx
index 651582f..701c032 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,16 +2,16 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
-import FooterBase from '@/components/sections/footer/FooterBase';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
 import HeroLogo from '@/components/sections/hero/HeroLogo';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
-import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
+import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
 import { Award, Coffee, Sparkles } from "lucide-react";
 
 export default function LandingPage() {
@@ -32,22 +32,11 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleFullscreen
       navItems={[
-        {
-          name: "About",
-          id: "#about",
-        },
-        {
-          name: "Services",
-          id: "#services",
-        },
-        {
-          name: "Shop",
-          id: "#shop",
-        },
-        {
-          name: "Contact",
-          id: "#contact",
-        },
+        { name: "About", id: "#about" },
+        { name: "Services", id: "#features" },
+        { name: "Shop", id: "#shop" },
+        { name: "Testimonials", id: "#testimonials" },
+        { name: "Contact", id: "#contact" },
       ]}
       brandName="BeanCare"
     />
@@ -58,14 +47,8 @@ export default function LandingPage() {
       logoText="BeanCare Maintenance"
       description="Premium coffee machine service, expert repair, and the finest hand-roasted beans delivered to your doorstep."
       buttons={[
-        {
-          text: "Book Maintenance",
-          href: "#contact",
-        },
-        {
-          text: "Browse Shop",
-          href: "#shop",
-        },
+        { text: "Book Maintenance", href: "#contact" },
+        { text: "Browse Shop", href: "#shop" },
       ]}
       buttonAnimation="slide-up"
       imageSrc="http://img.b2bpic.net/free-photo/close-up-hands-holding-coffee-cup_23-2148865570.jpg"
@@ -78,18 +61,9 @@ export default function LandingPage() {
       title="We Keep Your Coffee Flowing"
       description="With over a decade of expertise, BeanCare ensures your machines work perfectly so you can focus on the perfect extraction every single day."
       metrics={[
-        {
-          value: "500+",
-          title: "Machines Serviced",
-        },
-        {
-          value: "2T",
-          title: "Beans Roasted",
-        },
-        {
-          value: "99%",
-          title: "Happy Baristas",
-        },
+        { value: "500+", title: "Machines Serviced" },
+        { value: "2T", title: "Beans Roasted" },
+        { value: "99%", title: "Happy Baristas" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/barista-preparing-beverage_23-2149458052.jpg"
       mediaAnimation="slide-up"
@@ -104,21 +78,9 @@ export default function LandingPage() {
       gridVariant="three-columns-all-equal-width"
       useInvertedBackground={false}
       features={[
-        {
-          title: "Machine Maintenance",
-          description: "Preventive servicing and deep cleaning for your commercial or home espresso gear.",
-          imageSrc: "http://img.b2bpic.net/free-photo/male-barista-preparing-coffee-coffee-shop_1303-29337.jpg",
-        },
-        {
-          title: "Custom Roast Beans",
-          description: "Small-batch roasted beans delivered fresh from our workshop to your cafe.",
-          imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-beans-beige-background_23-2148623198.jpg",
-        },
-        {
-          title: "Sales & Consultancy",
-          description: "Professional advice on machine selection tailored to your specific brewing needs.",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-empty-cup-coffee-machine_23-2148523017.jpg",
-        },
+        { title: "Machine Maintenance", description: "Preventive servicing and deep cleaning.", imageSrc: "http://img.b2bpic.net/free-photo/male-barista-preparing-coffee-coffee-shop_1303-29337.jpg" },
+        { title: "Custom Roast Beans", description: "Small-batch beans delivered fresh.", imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-beans-beige-background_23-2148623198.jpg" },
+        { title: "Sales & Consultancy", description: "Professional advice on machine selection.", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-empty-cup-coffee-machine_23-2148523017.jpg" },
       ]}
       title="Our Expert Services"
       description="We don't just fix machines; we curate your entire coffee experience."
@@ -132,51 +94,12 @@ export default function LandingPage() {
       gridVariant="three-columns-all-equal-width"
       useInvertedBackground={false}
       products={[
-        {
-          id: "1",
-          name: "Professional Espresso Rig",
-          price: "$1,200",
-          variant: "Stainless Steel",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-hand-mixing-coffee_23-2148892893.jpg",
-        },
-        {
-          id: "2",
-          name: "Burr Grinder Pro",
-          price: "$350",
-          variant: "Matte Black",
-          imageSrc: "http://img.b2bpic.net/free-photo/hand-installing-filter-espresso-machine_23-2147834505.jpg",
-        },
-        {
-          id: "3",
-          name: "Single Origin Ethiopia",
-          price: "$22",
-          variant: "250g Pack",
-          imageSrc: "http://img.b2bpic.net/free-photo/brown-coffee-beans-cup_114579-16758.jpg",
-        },
-        {
-          id: "4",
-          name: "House Blend Espresso",
-          price: "$18",
-          variant: "500g Pack",
-          imageSrc: "http://img.b2bpic.net/free-photo/sackcloth-full-coffee-beans-coffee-beans-surface_176474-495.jpg",
-        },
-        {
-          id: "5",
-          name: "Cold Brew Kit",
-          price: "$85",
-          variant: "Complete Set",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-male-barista-holding-professional-coffee-machine-cup_23-2148824394.jpg",
-        },
-        {
-          id: "6",
-          name: "Precision Tamper",
-          price: "$45",
-          variant: "Aluminum",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-process-making-espresso-professional-coffee-machine_169016-18058.jpg",
-        },
+        { id: "1", name: "Espresso Rig", price: "$1,200", variant: "Steel", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hand-mixing-coffee_23-2148892893.jpg" },
+        { id: "2", name: "Burr Grinder", price: "$350", variant: "Black", imageSrc: "http://img.b2bpic.net/free-photo/hand-installing-filter-espresso-machine_23-2147834505.jpg" },
+        { id: "3", name: "Ethiopian Origin", price: "$22", variant: "250g", imageSrc: "http://img.b2bpic.net/free-photo/brown-coffee-beans-cup_114579-16758.jpg" },
       ]}
-      title="Premium Equipment & Beans"
-      description="Browse our curated selection of top-tier machinery and freshly roasted specialty coffee beans."
+      title="Premium Gear"
+      description="Curated specialty equipment."
     />
   </div>
 
@@ -186,44 +109,11 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={false}
       plans={[
-        {
-          id: "basic",
-          badge: "Essential",
-          price: "$99",
-          subtitle: "Perfect for Home Users",
-          buttons: [
-            {
-              text: "Choose",
-              href: "#contact",
-            },
-          ],
-          features: [
-            "Annual Deep Clean",
-            "Calibration Check",
-            "Minor Repair",
-          ],
-        },
-        {
-          id: "pro",
-          badge: "Commercial",
-          price: "$249",
-          subtitle: "For High Volume Cafes",
-          buttons: [
-            {
-              text: "Choose",
-              href: "#contact",
-            },
-          ],
-          features: [
-            "Quarterly Service",
-            "Priority Support",
-            "Calibration Check",
-            "Descaling Treatment",
-          ],
-        },
+        { id: "basic", badge: "Essential", price: "$99", subtitle: "Home Users", buttons: [{ text: "Select", href: "#contact" }], features: ["Annual Deep Clean", "Calibration Check"] },
+        { id: "pro", badge: "Commercial", price: "$249", subtitle: "Cafes", buttons: [{ text: "Select", href: "#contact" }], features: ["Quarterly Service", "Priority Support"] },
       ]}
-      title="Service Packages"
-      description="Maintenance plans built for your coffee shop's daily operational success."
+      title="Service Plans"
+      description="Plans built for success."
     />
   </div>
 
@@ -234,160 +124,49 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       metrics={[
-        {
-          id: "m1",
-          value: "12",
-          title: "Years Experience",
-          description: "Deep industry knowledge.",
-          icon: Coffee,
-        },
-        {
-          id: "m2",
-          value: "250+",
-          title: "Cafes Partnered",
-          description: "Supporting local businesses.",
-          icon: Award,
-        },
-        {
-          id: "m3",
-          value: "15k+",
-          title: "Cups Brewed",
-          description: "Tested by our crew.",
-          icon: Sparkles,
-        },
+        { id: "m1", value: "12", title: "Years", description: "Industry experience", icon: Coffee },
+        { id: "m2", value: "250+", title: "Cafes", description: "Active partners", icon: Award },
+        { id: "m3", value: "15k+", title: "Cups", description: "Tested and tasted", icon: Sparkles },
       ]}
-      title="BeanCare By The Numbers"
-      description="Reliable data backing our dedication to the perfect cup of coffee."
+      title="BeanCare Impact"
+      description="Reliable dedication."
     />
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSixteen
+      <TestimonialCardSix
       animationType="slide-up"
       textboxLayout="split"
       useInvertedBackground={false}
+      title="Customer Stories"
+      description="Hear from the baristas we support daily."
       testimonials={[
-        {
-          id: "1",
-          name: "Alice M.",
-          role: "Owner",
-          company: "Brew Haven",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-asian-girl-apron-barista-coffee-shop-shows-thumbs-up-approve-recommend-smth_1258-199453.jpg",
-        },
-        {
-          id: "2",
-          name: "Bob R.",
-          role: "Manager",
-          company: "Morning Cup",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/coffee-break_1098-14791.jpg",
-        },
-        {
-          id: "3",
-          name: "Cathy W.",
-          role: "Barista",
-          company: "Roast Labs",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-plus-size-man-working-as-barista_23-2150754678.jpg",
-        },
-        {
-          id: "4",
-          name: "Dave L.",
-          role: "Owner",
-          company: "Daily Bean",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-girl-student-working-parttime-cafe-barista-shows-thumbs-up-wears-apron-stands-near-coffee_1258-134032.jpg",
-        },
-        {
-          id: "5",
-          name: "Eve K.",
-          role: "Enthusiast",
-          company: "Personal",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-blonde-woman-holding-coffee-cup-cafe_1170-692.jpg",
-        },
+        { id: "1", name: "Alice M.", handle: "@brewheaven", testimonial: "The best maintenance service in the city. Truly professionals.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-asian-girl-apron-barista-coffee-shop-shows-thumbs-up-approve-recommend-smth_1258-199453.jpg" },
+        { id: "2", name: "Bob R.", handle: "@morningcup", testimonial: "Our machines have never performed better. BeanCare is indispensable.", imageSrc: "http://img.b2bpic.net/free-photo/coffee-break_1098-14791.jpg" },
       ]}
-      kpiItems={[
-        {
-          value: "5.0",
-          label: "Avg Rating",
-        },
-        {
-          value: "100%",
-          label: "Retention",
-        },
-        {
-          value: "24/7",
-          label: "Support",
-        },
-      ]}
-      title="Loved By Baristas"
-      description="Don't just take our word for it—see what our community has to say about our maintenance and beans."
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactSplit
+      tag="Get in touch"
+      title="Book a Service"
+      description="Our experts are ready to visit your location. Tell us about your equipment needs."
+      background={{ variant: "gradient-bars" }}
       useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
-      text="Ready to get your coffee machine serviced or order fresh beans? Reach out today."
-      buttons={[
-        {
-          text: "Email Us",
-          href: "mailto:hello@beancare.com",
-        },
-      ]}
+      inputPlaceholder="Your email"
+      buttonText="Send Request"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBase
+      <FooterSimple
       columns={[
-        {
-          title: "Services",
-          items: [
-            {
-              label: "Maintenance",
-              href: "#services",
-            },
-            {
-              label: "Sales",
-              href: "#shop",
-            },
-          ],
-        },
-        {
-          title: "Shop",
-          items: [
-            {
-              label: "Machines",
-              href: "#shop",
-            },
-            {
-              label: "Beans",
-              href: "#shop",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-            {
-              label: "FAQs",
-              href: "#",
-            },
-          ],
-        },
+        { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "#features" }, { label: "Shop", href: "#shop" }] },
+        { title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "FAQ", href: "#" }] },
       ]}
-      logoText="BeanCare"
-      copyrightText="© 2025 BeanCare Maintenance."
+      bottomLeftText="© 2025 BeanCare"
+      bottomRightText="All rights reserved."
     />
   </div>
       </ReactLenis>