diff --git a/src/app/page.tsx b/src/app/page.tsx
index 8bd27b6..42b8218 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,14 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
 import HeroSplit from '@/components/sections/hero/HeroSplit';
 import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
 
 export default function LandingPage() {
@@ -28,93 +28,50 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
-      navItems={[
-        {
-          name: "Accueil",
-          id: "hero",
-        },
-        {
-          name: "Services",
-          id: "features",
-        },
-        {
-          name: "Experts",
-          id: "about",
-        },
-        {
-          name: "Témoignages",
-          id: "testimonials",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
-      ]}
+      <NavbarStyleApple
       brandName="TT Plombier"
+      navItems={[
+        { name: "Accueil", id: "hero" },
+        { name: "Services", id: "features" },
+        { name: "Experts", id: "about" },
+        { name: "Témoignages", id: "testimonials" },
+        { name: "Contact", id: "contact" },
+      ]}
     />
   </div>
 
   <div id="hero" data-section="hero">
       <HeroSplit
       background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
       title="Experts en Plomberie et Chauffage à votre service"
       description="Chez TT Plombier, nous combinons expertise technique et ponctualité pour résoudre vos urgences avec professionnalisme. Plus qu'une réparation, nous garantissons votre confort durable."
       buttons={[
         {
-          text: "Contactez-nous",
-          href: "#contact",
-        },
+          text: "Contactez-nous",          href: "#contact"},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/medium-shot-jeweler-making-jewellery_23-2150931449.jpg"
       imageAlt="Expert plumber working"
       mediaAnimation="slide-up"
       avatars={[
         {
-          src: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990730.jpg",
-          alt: "Male plumber working to fix problems at client's house",
-        },
+          src: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990730.jpg",          alt: "Male plumber working to fix problems at client's house"},
         {
-          src: "http://img.b2bpic.net/free-photo/service-maintenance-worker-repairing_23-2149176721.jpg",
-          alt: "Service maintenance worker repairing",
-        },
+          src: "http://img.b2bpic.net/free-photo/service-maintenance-worker-repairing_23-2149176721.jpg",          alt: "Service maintenance worker repairing"},
         {
-          src: "http://img.b2bpic.net/free-photo/carpenter-craftsman-handicraft-wooden-workshop-concept_53876-30144.jpg",
-          alt: "Carpenter Craftsman Handicraft Wooden Workshop Concept",
-        },
+          src: "http://img.b2bpic.net/free-photo/carpenter-craftsman-handicraft-wooden-workshop-concept_53876-30144.jpg",          alt: "Carpenter Craftsman Handicraft Wooden Workshop Concept"},
         {
-          src: "http://img.b2bpic.net/free-photo/close-up-shot-tourist-securing-snowboarding-gear-hotel-foyer-prepared-winter-vacation-ski-resort-detailed-view-person-inspecting-snowboard-getting-ready-snowy-adventure_482257-72698.jpg",
-          alt: "Close up shot of tourist securing snowboarding gear in hotel foyer prepared for winter vacation at ski resort Detailed view of person inspecting a snowboard getting ready for snowy adventure",
-        },
+          src: "http://img.b2bpic.net/free-photo/close-up-shot-tourist-securing-snowboarding-gear-hotel-foyer-prepared-winter-vacation-ski-resort-detailed-view-person-inspecting-snowboard-getting-ready-snowy-adventure_482257-72698.jpg",          alt: "Close up shot of tourist securing snowboarding gear in hotel foyer prepared for winter vacation at ski resort Detailed view of person inspecting a snowboard getting ready for snowy adventure"},
         {
-          src: "http://img.b2bpic.net/free-photo/woman-inviting-man-house-with-tools_259150-58291.jpg",
-          alt: "Woman inviting man to the house with tools",
-        },
+          src: "http://img.b2bpic.net/free-photo/woman-inviting-man-house-with-tools_259150-58291.jpg",          alt: "Woman inviting man to the house with tools"},
       ]}
       avatarText="Nos experts dévoués"
       marqueeItems={[
-        {
-          type: "text",
-          text: "Réparation Rapide",
-        },
-        {
-          type: "text",
-          text: "Devis Gratuit",
-        },
-        {
-          type: "text",
-          text: "Intervention 24/7",
-        },
-        {
-          type: "text",
-          text: "Expertise Certifiée",
-        },
-        {
-          type: "text",
-          text: "Qualité Garantie",
-        },
+        { type: "text", text: "Réparation Rapide" },
+        { type: "text", text: "Devis Gratuit" },
+        { type: "text", text: "Intervention 24/7" },
+        { type: "text", text: "Expertise Certifiée" },
+        { type: "text", text: "Qualité Garantie" },
       ]}
     />
   </div>
@@ -125,18 +82,9 @@ export default function LandingPage() {
       title="Notre Engagement envers vous"
       description="L'excellence technique et le respect du client sont au cœur de TT Plombier. Notre équipe est formée pour intervenir rapidement sur chaudières, climatisation et fuites, avec une transparence totale."
       metrics={[
-        {
-          value: "15+",
-          title: "Ans d'expérience",
-        },
-        {
-          value: "98%",
-          title: "Clients satisfaits",
-        },
-        {
-          value: "24/7",
-          title: "Assistance urgente",
-        },
+        { value: "15+", title: "Ans d'expérience" },
+        { value: "98%", title: "Clients satisfaits" },
+        { value: "24/7", title: "Assistance urgente" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/side-view-travelers-filling-documents_23-2149986622.jpg"
       imageAlt="Plumbing expert consultation"
@@ -153,23 +101,11 @@ export default function LandingPage() {
       useInvertedBackground={true}
       features={[
         {
-          title: "Réparation Chaudière",
-          description: "Expertise certifiée sur tous types de modèles.",
-          imageSrc: "http://img.b2bpic.net/free-photo/worker-repairing-water-heater_23-2149334225.jpg",
-          imageAlt: "Chaudière",
-        },
+          title: "Réparation Chaudière",          description: "Expertise certifiée sur tous types de modèles.",          imageSrc: "http://img.b2bpic.net/free-photo/worker-repairing-water-heater_23-2149334225.jpg",          imageAlt: "Chaudière"},
         {
-          title: "Dépannage Clim",
-          description: "Maintenance et réparation pour un air pur et frais.",
-          imageSrc: "http://img.b2bpic.net/free-photo/electrician-is-mounting-electric-sockets-white-wall-indoors_169016-17659.jpg",
-          imageAlt: "Climatisation",
-        },
+          title: "Dépannage Clim",          description: "Maintenance et réparation pour un air pur et frais.",          imageSrc: "http://img.b2bpic.net/free-photo/electrician-is-mounting-electric-sockets-white-wall-indoors_169016-17659.jpg",          imageAlt: "Climatisation"},
         {
-          title: "Fuites & Urgences",
-          description: "Intervention rapide pour stopper tout dégât des eaux.",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-fixing-kitchen-sink_53876-13430.jpg",
-          imageAlt: "Fuite d'eau",
-        },
+          title: "Fuites & Urgences",          description: "Intervention rapide pour stopper tout dégât des eaux.",          imageSrc: "http://img.b2bpic.net/free-photo/man-fixing-kitchen-sink_53876-13430.jpg",          imageAlt: "Fuite d'eau"},
       ]}
       title="Services Spécialisés"
       description="Des interventions précises et des solutions durables pour chaque problème de plomberie."
@@ -183,21 +119,9 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       metrics={[
-        {
-          id: "1",
-          value: "5000+",
-          description: "Interventions réussies",
-        },
-        {
-          id: "2",
-          value: "30min",
-          description: "Temps de réponse moyen",
-        },
-        {
-          id: "3",
-          value: "100%",
-          description: "Engagement Qualité",
-        },
+        { id: "1", value: "5000+", description: "Interventions réussies" },
+        { id: "2", value: "30min", description: "Temps de réponse moyen" },
+        { id: "3", value: "100%", description: "Engagement Qualité" },
       ]}
       title="Nos Chiffres Clés"
       description="La preuve d'une efficacité reconnue par nos clients."
@@ -210,60 +134,16 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={true}
       testimonials={[
-        {
-          id: "1",
-          name: "Abdeljelil C.",
-          role: "Client",
-          company: "TT Plombier",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-smiling-woman-close-eyes-showing-okay-ok-sign-zero-gesture-no-proble-praise-awesome-good-thing-standing-stylish-outfit-against-white-background_176420-46697.jpg",
-        },
-        {
-          id: "2",
-          name: "Ahmed D.",
-          role: "Client",
-          company: "TT Plombier",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-female-photographer-standing-against-brick_613910-16208.jpg",
-        },
-        {
-          id: "3",
-          name: "Far K.",
-          role: "Client",
-          company: "TT Plombier",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1604.jpg",
-        },
-        {
-          id: "4",
-          name: "Dali L.",
-          role: "Client",
-          company: "TT Plombier",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/businessman-smiling-looking-camera_23-2148112827.jpg",
-        },
-        {
-          id: "5",
-          name: "Sarra B.",
-          role: "Client",
-          company: "TT Plombier",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17096.jpg",
-        },
+        { id: "1", name: "Abdeljelil C.", role: "Client", company: "TT Plombier", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/happy-smiling-woman-close-eyes-showing-okay-ok-sign-zero-gesture-no-proble-praise-awesome-good-thing-standing-stylish-outfit-against-white-background_176420-46697.jpg" },
+        { id: "2", name: "Ahmed D.", role: "Client", company: "TT Plombier", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-female-photographer-standing-against-brick_613910-16208.jpg" },
+        { id: "3", name: "Far K.", role: "Client", company: "TT Plombier", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1604.jpg" },
+        { id: "4", name: "Dali L.", role: "Client", company: "TT Plombier", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/businessman-smiling-looking-camera_23-2148112827.jpg" },
+        { id: "5", name: "Sarra B.", role: "Client", company: "TT Plombier", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17096.jpg" },
       ]}
       kpiItems={[
-        {
-          value: "4.9",
-          label: "Note moyenne",
-        },
-        {
-          value: "1.2k",
-          label: "Avis certifiés",
-        },
-        {
-          value: "95%",
-          label: "Recommandation",
-        },
+        { value: "4.9", label: "Note moyenne" },
+        { value: "1.2k", label: "Avis certifiés" },
+        { value: "95%", label: "Recommandation" },
       ]}
       title="Ce que disent nos clients"
       description="La satisfaction de nos clients est notre meilleure carte de visite."
@@ -275,21 +155,9 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
-        {
-          id: "1",
-          title: "Intervenez-vous le week-end ?",
-          content: "Oui, nous assurons des astreintes pour les urgences le samedi et dimanche.",
-        },
-        {
-          id: "2",
-          title: "Proposez-vous des devis gratuits ?",
-          content: "Nous étudions chaque projet avec transparence pour proposer un devis personnalisé.",
-        },
-        {
-          id: "3",
-          title: "Quelle est votre zone d'intervention ?",
-          content: "Nous intervenons sur tout le grand Tunis et ses environs.",
-        },
+        { id: "1", title: "Intervenez-vous le week-end ?", content: "Oui, nous assurons des astreintes pour les urgences le samedi et dimanche." },
+        { id: "2", title: "Proposez-vous des devis gratuits ?", content: "Nous étudions chaque projet avec transparence pour proposer un devis personnalisé." },
+        { id: "3", title: "Quelle est votre zone d'intervention ?", content: "Nous intervenons sur tout le grand Tunis et ses environs." },
       ]}
       title="Questions Fréquentes"
       description="Tout ce qu'il faut savoir avant de nous contacter."
@@ -298,55 +166,40 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
-      useInvertedBackground={true}
-      background={{
-        variant: "cell-wave",
-      }}
-      text="Prêt à retrouver votre tranquillité ? Nos experts sont à votre écoute pour toute urgence ou conseil."
+    <div className="w-full max-w-6xl mx-auto p-4">
+      <h2 className="text-3xl font-bold mb-6 text-center">Notre Localisation</h2>
+      <div className="aspect-video w-full rounded-2xl overflow-hidden shadow-lg">
+        <iframe 
+          src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d12774.887893976458!2d10.158302061291505!3d36.80649479999999!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12fd3479a0233481%3A0x6739097e8574f762!2sTunis!5e0!3m2!1sfr!2stn!4v1715694829341!5m2!1sfr!2stn" 
+          width="100%" 
+          height="100%" 
+          style={{ border: 0 }} 
+          allowFullScreen 
+          loading="lazy" 
+          referrerPolicy="no-referrer-when-downgrade" 
+          title="Google Maps Location"
+        />
+      </div>
+    </div>
+      <ContactCTA
+      tag="Contactez-nous"
+      title="Prêt à retrouver votre tranquillité ?"
+      description="Nos experts sont à votre écoute pour toute urgence ou conseil. Contactez-nous dès maintenant pour une intervention rapide."
       buttons={[
         {
-          text: "Appeler maintenant",
-          href: "tel:+21600000000",
-        },
+          text: "Appeler maintenant",          href: "tel:+21600000000"},
       ]}
+      background={{ variant: "sparkles-gradient" }}
+      useInvertedBackground={true}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBaseReveal
+      <FooterLogoEmphasis
       logoText="TT Plombier"
       columns={[
-        {
-          title: "Navigation",
-          items: [
-            {
-              label: "Accueil",
-              href: "#hero",
-            },
-            {
-              label: "Services",
-              href: "#features",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
-        },
-        {
-          title: "Legal",
-          items: [
-            {
-              label: "Privacy Policy",
-              href: "#",
-            },
-            {
-              label: "Terms of Service",
-              href: "#",
-            },
-          ],
-        },
+        { items: [{ label: "Accueil", href: "#hero" }, { label: "Services", href: "#features" }, { label: "À propos", href: "#about" }] },
+        { items: [{ label: "Confidentialité" }, { label: "CGU" }, { label: "Mentions Légales" }] }
       ]}
     />
   </div>