diff --git a/src/app/page.tsx b/src/app/page.tsx
index 195a463..be392e3 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -8,7 +8,9 @@ import FeatureCardTwelve from "@/components/sections/feature/FeatureCardTwelve";
 import SplitAbout from "@/components/sections/about/SplitAbout";
 import TestimonialCardTwelve from "@/components/sections/testimonial/TestimonialCardTwelve";
 import FaqSplitText from "@/components/sections/faq/FaqSplitText";
+import ContactFaq from "@/components/sections/contact/ContactFaq";
 import FooterBase from "@/components/sections/footer/FooterBase";
+import { Phone } from "lucide-react";
 import Link from "next/link";
 
 export default function HomePage() {
@@ -36,9 +38,7 @@ export default function HomePage() {
             { name: "Testimonials", id: "testimonials" },
           ]}
           button={{
-            text: "Call Now: 516-285-9879",
-            href: "tel:516-285-9879",
-          }}
+            text: "Call Now: 516-285-9879",            href: "tel:516-285-9879"}}
           animateOnLoad={true}
         />
       </div>
@@ -51,31 +51,20 @@ export default function HomePage() {
           background={{ variant: "downward-rays-static" }}
           avatars={[
             {
-              src: "http://img.b2bpic.net/free-vector/set-vintage-worker-day-stickers_23-2147616058.jpg",
-              alt: "professional plumber certificate license badge",
-            },
+              src: "http://img.b2bpic.net/free-vector/set-vintage-worker-day-stickers_23-2147616058.jpg",              alt: "professional plumber certificate license badge"},
             {
-              src: "http://img.b2bpic.net/free-vector/business-deal-with-umbrella-background_23-2147554511.jpg",
-              alt: "trusted service provider checkmark seal",
-            },
+              src: "http://img.b2bpic.net/free-vector/business-deal-with-umbrella-background_23-2147554511.jpg",              alt: "trusted service provider checkmark seal"},
             {
-              src: "http://img.b2bpic.net/free-vector/24-hour-timer-clock-dotted-arrow_78370-1096.jpg",
-              alt: "fast emergency response icon speed",
-            },
+              src: "http://img.b2bpic.net/free-vector/24-hour-timer-clock-dotted-arrow_78370-1096.jpg",              alt: "fast emergency response icon speed"},
           ]}
           avatarText="Serving Nassau County & Queens Since 2013"
           buttons={[
             {
-              text: "Emergency Call",
-              href: "tel:516-285-9879",
-            },
+              text: "Emergency Call",              href: "tel:516-285-9879"},
             {
-              text: "Book Service",
-              href: "#contact",
-            },
+              text: "Book Service",              href: "#contact"},
           ]}
           buttonAnimation="slide-up"
-          useInvertedBackground={false}
         />
       </div>
 
@@ -86,25 +75,13 @@ export default function HomePage() {
           tag="Credentials"
           metrics={[
             {
-              id: "1",
-              value: "12+",
-              description: "Years of professional plumbing and heating service excellence",
-            },
+              id: "1",              value: "12+",              description: "Years of professional plumbing and heating service excellence"},
             {
-              id: "2",
-              value: "100%",
-              description: "Fully licensed and insured for your complete peace of mind",
-            },
+              id: "2",              value: "100%",              description: "Fully licensed and insured for your complete peace of mind"},
             {
-              id: "3",
-              value: "24/7",
-              description: "Emergency response available any time, day or night",
-            },
+              id: "3",              value: "24/7",              description: "Emergency response available any time, day or night"},
             {
-              id: "4",
-              value: "$0",
-              description: "No hidden fees—transparent, upfront pricing always",
-            },
+              id: "4",              value: "$0",              description: "No hidden fees—transparent, upfront pricing always"},
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={true}
@@ -116,57 +93,27 @@ export default function HomePage() {
         <FeatureCardTwelve
           features={[
             {
-              id: "plumbing",
-              label: "Plumbing",
-              title: "Complete plumbing solutions for every need",
-              items: [
-                "Drain cleaning and unclogging",
-                "Water pressure repairs",
-                "Toilet and urinal repairs",
-                "Water filtration systems",
-                "Frozen pipe thawing",
-              ],
+              id: "plumbing",              label: "Plumbing",              title: "Complete plumbing solutions for every need",              items: [
+                "Drain cleaning and unclogging",                "Water pressure repairs",                "Toilet and urinal repairs",                "Water filtration systems",                "Frozen pipe thawing"],
               buttons: [
                 {
-                  text: "Learn More",
-                  href: "/services#plumbing-services",
-                },
+                  text: "Learn More",                  href: "#services"},
               ],
             },
             {
-              id: "heating",
-              label: "Heating",
-              title: "Professional heating system services",
-              items: [
-                "Boiler repair and service",
-                "Water heating solutions",
-                "Tankless water heaters",
-                "Radiant floor heating",
-                "Carbon monoxide detection",
-              ],
+              id: "heating",              label: "Heating",              title: "Professional heating system services",              items: [
+                "Boiler repair and service",                "Water heating solutions",                "Tankless water heaters",                "Radiant floor heating",                "Carbon monoxide detection"],
               buttons: [
                 {
-                  text: "Learn More",
-                  href: "/services#heating-services",
-                },
+                  text: "Learn More",                  href: "#services"},
               ],
             },
             {
-              id: "specialty",
-              label: "Specialty",
-              title: "Specialized installations and upgrades",
-              items: [
-                "Gas piping installation",
-                "Outdoor shower systems",
-                "Cabana and bathhouse plumbing",
-                "Custom water treatment",
-                "Emergency 24/7 response",
-              ],
+              id: "specialty",              label: "Specialty",              title: "Specialized installations and upgrades",              items: [
+                "Gas piping installation",                "Outdoor shower systems",                "Cabana and bathhouse plumbing",                "Custom water treatment",                "Emergency 24/7 response"],
               buttons: [
                 {
-                  text: "Learn More",
-                  href: "/services#specialty-services",
-                },
+                  text: "Learn More",                  href: "#services"},
               ],
             },
           ]}
@@ -186,23 +133,15 @@ export default function HomePage() {
           tag="Our Promise"
           bulletPoints={[
             {
-              title: "Professional Licensed Plumbers",
-              description: "Every technician is fully licensed, insured, and trained to handle any plumbing or heating challenge with expertise.",
-            },
+              title: "Professional Licensed Plumbers",              description: "Every technician is fully licensed, insured, and trained to handle any plumbing or heating challenge with expertise."},
             {
-              title: "Same-Day Emergency Service",
-              description: "When you need us most, we're there. Our 24/7 emergency response team is ready to solve your problem fast.",
-            },
+              title: "Same-Day Emergency Service",              description: "When you need us most, we're there. Our 24/7 emergency response team is ready to solve your problem fast."},
             {
-              title: "Clean, Courteous Technicians",
-              description: "We respect your home. Our technicians arrive clean, professional, and ready to work with minimal disruption.",
-            },
+              title: "Clean, Courteous Technicians",              description: "We respect your home. Our technicians arrive clean, professional, and ready to work with minimal disruption."},
             {
-              title: "Upfront, Honest Pricing",
-              description: "No hidden fees. We provide clear estimates upfront so you know exactly what to expect before work begins.",
-            },
+              title: "Upfront, Honest Pricing",              description: "No hidden fees. We provide clear estimates upfront so you know exactly what to expect before work begins."},
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721551.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721551.jpg"
           imageAlt="professional plumber team working together"
           mediaAnimation="opacity"
           textboxLayout="default"
@@ -216,35 +155,17 @@ export default function HomePage() {
         <TestimonialCardTwelve
           testimonials={[
             {
-              id: "1",
-              name: "Michael Johnson",
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-senior-businessman-sitting-stairs_1262-3109.jpg?_wi=1",
-            },
+              id: "1",              name: "Michael Johnson",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-senior-businessman-sitting-stairs_1262-3109.jpg"},
             {
-              id: "2",
-              name: "Sarah Williams",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-co-worker-spending-time-office_23-2149328310.jpg?_wi=1",
-            },
+              id: "2",              name: "Sarah Williams",              imageSrc: "http://img.b2bpic.net/free-photo/young-co-worker-spending-time-office_23-2149328310.jpg"},
             {
-              id: "3",
-              name: "Robert Martinez",
-              imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-talking-phone_23-2148461401.jpg?_wi=1",
-            },
+              id: "3",              name: "Robert Martinez",              imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-talking-phone_23-2148461401.jpg"},
             {
-              id: "4",
-              name: "Jennifer Lee",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-photogenic-blonde-woman-wearing-headphones_23-2148397120.jpg?_wi=1",
-            },
+              id: "4",              name: "Jennifer Lee",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-photogenic-blonde-woman-wearing-headphones_23-2148397120.jpg"},
             {
-              id: "5",
-              name: "David Thompson",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-posing_23-2148920100.jpg?_wi=1",
-            },
+              id: "5",              name: "David Thompson",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-posing_23-2148920100.jpg"},
             {
-              id: "6",
-              name: "Patricia Davis",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-with-two-raised-fingers_1187-1103.jpg?_wi=1",
-            },
+              id: "6",              name: "Patricia Davis",              imageSrc: "http://img.b2bpic.net/free-photo/woman-with-two-raised-fingers_1187-1103.jpg"},
           ]}
           cardTitle="Thousands of satisfied customers across Nassau County trust Mako Plumbing for reliable, professional service"
           cardTag="Customer Reviews"
@@ -260,35 +181,17 @@ export default function HomePage() {
           sideDescription="Have questions about our services? Find answers to common inquiries about our plumbing and heating offerings."
           faqs={[
             {
-              id: "1",
-              title: "Do you offer emergency plumbing service?",
-              content: "Yes! We offer 24/7 emergency plumbing service for Nassau County and Queens. Call us immediately at 516-285-9879 for any emergency.",
-            },
+              id: "1",              title: "Do you offer emergency plumbing service?",              content: "Yes! We offer 24/7 emergency plumbing service for Nassau County and Queens. Call us immediately at 516-285-9879 for any emergency."},
             {
-              id: "2",
-              title: "Are your technicians licensed and insured?",
-              content: "Absolutely. All our technicians are fully licensed and insured. We are a fully licensed and insured plumbing service.",
-            },
+              id: "2",              title: "Are your technicians licensed and insured?",              content: "Absolutely. All our technicians are fully licensed and insured. We are a fully licensed and insured plumbing service."},
             {
-              id: "3",
-              title: "What service areas do you cover?",
-              content: "We provide comprehensive plumbing and heating services covering Nassau County and Queens, serving numerous local communities.",
-            },
+              id: "3",              title: "What service areas do you cover?",              content: "We provide comprehensive plumbing and heating services covering Nassau County and Queens, serving numerous local communities."},
             {
-              id: "4",
-              title: "How quickly can you respond to urgent calls?",
-              content: "We prioritize emergency calls and aim to respond quickly. Call us at 516-285-9879 to speak with our team about your urgent needs.",
-            },
+              id: "4",              title: "How quickly can you respond to urgent calls?",              content: "We prioritize emergency calls and aim to respond quickly. Call us at 516-285-9879 to speak with our team about your urgent needs."},
             {
-              id: "5",
-              title: "Do you provide upfront pricing?",
-              content: "Yes. We believe in transparent, upfront pricing with no hidden fees. We'll provide a clear estimate before work begins.",
-            },
+              id: "5",              title: "Do you provide upfront pricing?",              content: "Yes. We believe in transparent, upfront pricing with no hidden fees. We'll provide a clear estimate before work begins."},
             {
-              id: "6",
-              title: "What heating services do you offer?",
-              content: "We offer comprehensive heating services including boiler repair and service, water heating solutions, tankless water heaters, and radiant floor heating.",
-            },
+              id: "6",              title: "What heating services do you offer?",              content: "We offer comprehensive heating services including boiler repair and service, water heating solutions, tankless water heaters, and radiant floor heating."},
           ]}
           faqsAnimation="slide-up"
           textPosition="left"
@@ -297,14 +200,36 @@ export default function HomePage() {
         />
       </div>
 
+      {/* Contact Section */}
+      <div id="contact" data-section="contact">
+        <ContactFaq
+          faqs={[
+            {
+              id: "1",              title: "What payment methods do you accept?",              content: "We accept all major payment methods for your convenience. Contact us for specific payment options."},
+            {
+              id: "2",              title: "Do you provide service area coverage?",              content: "Yes, we cover Nassau County and Queens. We serve Woodmere, Hewlett, Lawrence, Cedarhurst, Valley Stream, and surrounding areas."},
+            {
+              id: "3",              title: "Can I get a quote before service?",              content: "Absolutely. We provide free estimates so you know the cost upfront. Call us or request a quote online."},
+            {
+              id: "4",              title: "How do I schedule a service appointment?",              content: "Call us directly at 516-285-9879 or use our online booking system. We'll find a time that works for your schedule."},
+          ]}
+          ctaTitle="Ready to Get Started?"
+          ctaDescription="Contact Mako Plumbing & Heating today for reliable service you can trust."
+          ctaButton={{ text: "Call Now: 516-285-9879", href: "tel:516-285-9879" }}
+          ctaIcon={Phone}
+          useInvertedBackground={true}
+          animationType="slide-up"
+          accordionAnimationType="smooth"
+        />
+      </div>
+
       {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterBase
           logoText="Mako Plumbing"
           columns={[
             {
-              title: "Services",
-              items: [
+              title: "Services",              items: [
                 { label: "Emergency Plumbing", href: "#services" },
                 { label: "Heating Systems", href: "#services" },
                 { label: "Water Filtration", href: "#services" },
@@ -312,8 +237,7 @@ export default function HomePage() {
               ],
             },
             {
-              title: "Company",
-              items: [
+              title: "Company",              items: [
                 { label: "About Us", href: "#about" },
                 { label: "Testimonials", href: "#testimonials" },
                 { label: "Local Areas", href: "#" },
@@ -321,8 +245,7 @@ export default function HomePage() {
               ],
             },
             {
-              title: "Contact",
-              items: [
+              title: "Contact",              items: [
                 { label: "Phone: 516-285-9879", href: "tel:516-285-9879" },
                 { label: "Email: office@makoplumbing.com", href: "mailto:office@makoplumbing.com" },
                 { label: "24/7 Emergency Service", href: "tel:516-285-9879" },