diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7d07af3..31da6fd 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,13 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import { ShieldCheck, Sparkles, Car, Settings } from "lucide-react";
-import ContactText from '@/components/sections/contact/ContactText';
+import { ShieldCheck, Sparkles, Zap, Wrench } from "lucide-react";
+import ContactFaq from '@/components/sections/contact/ContactFaq';
 import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
 import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
 
 export default function LandingPage() {
@@ -26,95 +27,116 @@ export default function LandingPage() {
         headingFontWeight="normal"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleApple
-      navItems={[
-        { name: "Home", id: "hero" },
-        { name: "About", id: "about" },
-        { name: "Services", id: "features" },
-        { name: "Reviews", id: "testimonials" },
-        { name: "Contact", id: "contact" },
-      ]}
-      brandName="Elite Detailers"
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "hero" },
+              { name: "About", id: "about" },
+              { name: "Services", id: "features" },
+              { name: "Reviews", id: "testimonials" },
+              { name: "Contact", id: "contact" },
+            ]}
+            brandName="Elite Detailers"
+          />
+        </div>
 
-  <div id="hero" data-section="hero">
-      <HeroBillboardCarousel
-      title="20 Years of Professional Auto Care"
-      description="Experience the highest standard in automotive detailing. From thorough engine cleaning to ceramic coating, we bring your vehicle back to life."
-      background={{ variant: "gradient-bars" }}
-      buttons={[{ text: "Book Appointment", href: "#contact" }]}
-      mediaItems={[
-        { imageSrc: "http://img.b2bpic.net/free-photo/man-car-clean-vacuuming-car-inside_1303-30580.jpg?_wi=1", imageAlt: "Car interior detailing" },
-        { imageSrc: "http://img.b2bpic.net/free-photo/close-up-car-care-process_23-2149193144.jpg", imageAlt: "Exterior washing" }
-      ]}
-    />
-  </div>
+        <div id="hero" data-section="hero">
+          <HeroBillboardCarousel
+            title="Premium Auto Detailing"
+            description="Over 20 years of experience serving the Medley community with veteran-owned perfection."
+            background={{ variant: "gradient-bars" }}
+            buttons={[{ text: "Book Your Service", href: "#contact" }]}
+            mediaItems={[
+              { imageSrc: "http://img.b2bpic.net/free-photo/man-car-clean-vacuuming-car-inside_1303-30580.jpg?_wi=1", imageAlt: "Detailing process" }
+            ]}
+          />
+        </div>
 
-  <div id="about" data-section="about">
-      <TestimonialAboutCard
-      tag="Our Legacy"
-      title="20+ Years in Business"
-      description="Since 2004, we have provided premium detailing services to the Medley community. We are proud to serve those who serve with special military discounts on all packages."
-      subdescription="We treat every vehicle as if it were our own, ensuring meticulous attention to every detail."
-      icon={ShieldCheck}
-      videoSrc="https://www.w3schools.com/html/mov_bbb.mp4"
-      mediaAnimation="blur-reveal"
-    />
-  </div>
+        <div id="about" data-section="about">
+          <TestimonialAboutCard
+            tag="20+ Years Experience"
+            title="Veteran-Owned Excellence"
+            description="We specialize in precision care for your vehicle, offering everything from engine bay degreasing to luxury ceramic coatings."
+            subdescription="Ask us about our special military discounts for active duty and veterans."
+            icon={ShieldCheck}
+            imageSrc="http://img.b2bpic.net/free-photo/close-up-car-care-process_23-2149193144.jpg"
+          />
+        </div>
 
-  <div id="features" data-section="features">
-      <FeatureCardTwentyFive
-      title="Comprehensive Detailing Services"
-      description="Expert care for every part of your vehicle, from engine bay to exterior paint."
-      animationType="blur-reveal"
-      textboxLayout="split"
-      useInvertedBackground={false}
-      features={[
-        { title: "Engine Detailing", description: "Advanced degreasing and cleaning for a pristine engine bay.", icon: Settings, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/high-angle-car-service-station_23-2148327584.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/man-leaning-car-with-open-hood_23-2148257995.jpg" }] },
-        { title: "Interior & Exterior", description: "Full interior deep clean plus expert exterior washing.", icon: Car, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/man-car-clean-vacuuming-car-inside_1303-30580.jpg?_wi=1" }, { imageSrc: "http://img.b2bpic.net/free-photo/woman-black-hat-standing-by-her-new-white-car_1303-28799.jpg" }] },
-        { title: "Ceramic & Wax", description: "Long-lasting shine with professional-grade ceramic coating and wax.", icon: Sparkles, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/close-up-car-care-process_23-2149193144.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/man-car-clean-vacuuming-car-inside_1303-30580.jpg?_wi=2" }] }
-      ]}
-    />
-  </div>
+        <div id="features" data-section="features">
+          <FeatureCardTwentyFive
+            title="Our Premium Services"
+            description="Complete interior and exterior solutions for your car's longevity and aesthetics."
+            useInvertedBackground={false}
+            animationType="slide-up"
+            textboxLayout="split"
+            features={[
+              { title: "Exterior & Interior", description: "Hand wash, interior deep cleaning, and vacuuming.", icon: Sparkles, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/man-car-clean-vacuuming-car-inside_1303-30580.jpg?_wi=1" }, { imageSrc: "http://img.b2bpic.net/free-photo/driver-gesture-rainy-drive-car-dashboard_169016-68038.jpg" }] },
+              { title: "Ceramic & Waxing", description: "High-grade ceramic coating and premium hand wax.", icon: Zap, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/close-up-car-care-process_23-2149193144.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/man-leaning-car-with-open-hood_23-2148257995.jpg" }] },
+              { title: "Engine Detailing", description: "Professional engine bay cleaning and protection.", icon: Wrench, mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/high-angle-car-service-station_23-2148327584.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/high-angle-car-service-station_23-2148327584.jpg" }] }
+            ]}
+          />
+        </div>
 
-  <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSixteen
-      title="Customer Success Stories"
-      description="We have built our reputation on quality, trust, and 20 years of experience."
-      animationType="blur-reveal"
-      textboxLayout="split"
-      useInvertedBackground={true}
-      kpiItems={[
-        { value: "5.0", label: "Average Rating" },
-        { value: "20+", label: "Years Serving" },
-        { value: "500+", label: "Vehicles Served" }
-      ]}
-      testimonials={[
-        { id: "1", name: "Sarah J.", role: "Regular Client", company: "Medley", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/happy-man-car-dealership_23-2148130220.jpg?_wi=2" },
-        { id: "2", name: "Mark D.", role: "Car Enthusiast", company: "Medley", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/man-talking-phone-medium-shot_23-2148320231.jpg" }
-      ]}
-    />
-  </div>
+        <div id="metrics" data-section="metrics">
+          <MetricCardOne
+            title="Our Impact"
+            description="Thousands of satisfied customers over two decades."
+            textboxLayout="split"
+            gridVariant="uniform-all-items-equal"
+            animationType="slide-up"
+            metrics={[
+              { id: "1", value: "20+", title: "Years", description: "Experience in business", icon: ShieldCheck },
+              { id: "2", value: "366+", title: "Reviews", description: "5-star average", icon: Sparkles },
+              { id: "3", value: "100%", title: "Satisfaction", description: "Guaranteed quality", icon: Zap }
+            ]}
+          />
+        </div>
 
-  <div id="contact" data-section="contact">
-      <ContactText
-      useInvertedBackground={false}
-      background={{ variant: "rotated-rays-animated" }}
-      text="Ready to restore your vehicle's shine? Contact us for a free estimate or to discuss our veteran/military discount programs."
-      buttons={[{ text: "Call Elite Detailers", href: "tel:8774343749" }]}
-    />
-  </div>
+        <div id="testimonials" data-section="testimonials">
+          <TestimonialCardSixteen
+            title="What Our Customers Say"
+            description="Hear from the people who trust us with their most valuable assets."
+            useInvertedBackground={true}
+            animationType="slide-up"
+            textboxLayout="split"
+            kpiItems={[
+              { value: "5.0", label: "Star Rating" },
+              { value: "20+", label: "Years Local" },
+              { value: "10k+", label: "Vehicles Served" }
+            ]}
+            testimonials={[
+              { id: "1", name: "Sarah J.", role: "Client", company: "Medley", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/happy-man-car-dealership_23-2148130220.jpg?_wi=2" },
+              { id: "2", name: "Mark D.", role: "Client", company: "Medley", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-black-hat-standing-by-her-new-white-car_1303-28799.jpg" },
+              { id: "3", name: "Elena R.", role: "Client", company: "Medley", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-office-with-tablet_1098-2077.jpg" }
+            ]}
+          />
+        </div>
 
-  <div id="footer" data-section="footer">
-      <FooterLogoReveal
-      logoText="Elite Detailers"
-      leftLink={{ text: "Terms of Service", href: "#" }}
-      rightLink={{ text: "Privacy Policy", href: "#" }}
-    />
-  </div>
+        <div id="contact" data-section="contact">
+          <ContactFaq
+            ctaTitle="Ready to get started?"
+            ctaDescription="Schedule your service today. Proud to offer military discounts."
+            ctaButton={{ text: "Get a Free Quote", href: "tel:8774343749" }}
+            ctaIcon={Zap}
+            useInvertedBackground={false}
+            animationType="slide-up"
+            faqs={[
+              { id: "1", title: "Do you offer military discounts?", content: "Yes, we proudly offer special pricing for all active-duty military and veterans as a thank you for your service." },
+              { id: "2", title: "What services do you provide?", content: "We cover everything from basic exterior washes to full ceramic coating and deep interior detailing." }
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterBase
+            columns={[
+              { title: "Services", items: [{ label: "Ceramic Coating", href: "#features" }, { label: "Detailing", href: "#features" }] },
+              { title: "Company", items: [{ label: "About", href: "#about" }, { label: "Reviews", href: "#testimonials" }] }
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file