diff --git a/src/app/page.tsx b/src/app/page.tsx
index a0f3923..81204bc 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -8,9 +8,10 @@ import MetricCardThree from "@/components/sections/metrics/MetricCardThree";
 import TestimonialCardTen from "@/components/sections/testimonial/TestimonialCardTen";
 import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
 import FaqBase from "@/components/sections/faq/FaqBase";
+import ContactFaq from "@/components/sections/contact/ContactFaq";
 import FooterMedia from "@/components/sections/footer/FooterMedia";
 import Link from "next/link";
-import { Award, Star, MapPin, CheckCircle, TrendingUp, MessageCircle, HelpCircle, Phone, CheckCircle as CheckCircleIcon } from "lucide-react";
+import { Award, Star, MapPin, CheckCircle, TrendingUp, MessageCircle, HelpCircle, Phone, Wrench } from "lucide-react";
 
 export default function HomePage() {
   return (
@@ -20,7 +21,7 @@ export default function HomePage() {
       borderRadius="soft"
       contentWidth="mediumLarge"
       sizing="medium"
-      background="noise"
+      background="circleGradient"
       cardStyle="subtle-shadow"
       primaryButtonStyle="diagonal-gradient"
       secondaryButtonStyle="solid"
@@ -30,16 +31,14 @@ export default function HomePage() {
       <div id="nav" data-section="nav">
         <NavbarStyleCentered
           navItems={[
-            { name: "Home", id: "home" },
-            { name: "Services", id: "services" },
-            { name: "About", id: "about" },
-            { name: "Reviews", id: "testimonials" },
-            { name: "Contact", id: "contact" },
+            { name: "Home", id: "/" },
+            { name: "Services", id: "#services" },
+            { name: "About", id: "#about" },
+            { name: "Reviews", id: "#testimonials" },
+            { name: "Contact", id: "#contact" },
           ]}
           button={{
-            text: "Call (813) 479-5578",
-            href: "tel:+18134795578",
-          }}
+            text: "Call (813) 479-5578",            href: "tel:+18134795578"}}
           brandName="PB&J Plumbing"
         />
       </div>
@@ -54,83 +53,86 @@ export default function HomePage() {
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Call (813) 479-5578",
-              href: "tel:+18134795578",
-            },
+              text: "Call (813) 479-5578",              href: "tel:+18134795578"},
             {
-              text: "Get a Free Estimate",
-              href: "#contact",
-            },
+              text: "Get a Free Estimate",              href: "#contact"},
           ]}
           buttonAnimation="slide-up"
           background={{
-            variant: "noise",
-          }}
+            variant: "plain"}}
           carouselItems={[
             {
-              id: "1",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-cleaning-his-bathroom-talking-by-mobile-phone_329181-20780.jpg",
-              imageAlt: "Professional plumber at work",
-            },
+              id: "1",              imageSrc: "http://img.b2bpic.net/free-photo/man-cleaning-his-bathroom-talking-by-mobile-phone_329181-20780.jpg",              imageAlt: "Professional plumber at work"},
             {
-              id: "2",
-              imageSrc: "http://img.b2bpic.net/free-photo/empty-bathroom-with-hand-wash-basin_107420-63637.jpg?_wi=1",
-              imageAlt: "Bathroom plumbing renovation",
-            },
+              id: "2",              imageSrc: "http://img.b2bpic.net/free-photo/empty-bathroom-with-hand-wash-basin_107420-63637.jpg",              imageAlt: "Bathroom plumbing renovation"},
             {
-              id: "3",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746306.jpg?_wi=1",
-              imageAlt: "Full repipe system installation",
-            },
+              id: "3",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746306.jpg",              imageAlt: "Full repipe system installation"},
             {
-              id: "4",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-relaxing-spa_23-2148001076.jpg?_wi=1",
-              imageAlt: "Steam generator installation",
-            },
+              id: "4",              imageSrc: "http://img.b2bpic.net/free-photo/woman-relaxing-spa_23-2148001076.jpg",              imageAlt: "Steam generator installation"},
             {
-              id: "5",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-53677.jpg?_wi=1",
-              imageAlt: "General plumbing repair",
-            },
+              id: "5",              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-53677.jpg",              imageAlt: "General plumbing repair"},
             {
-              id: "6",
-              imageSrc: "http://img.b2bpic.net/free-photo/father-kid-taking-selfies_23-2148947322.jpg",
-              imageAlt: "PB&J Plumbing experienced team",
-            },
+              id: "6",              imageSrc: "http://img.b2bpic.net/free-photo/father-kid-taking-selfies_23-2148947322.jpg",              imageAlt: "PB&J Plumbing experienced team"},
           ]}
           autoPlay={true}
           autoPlayInterval={4000}
         />
       </div>
 
+      {/* Services Section */}
+      <div id="services" data-section="services">
+        <FeatureCardTwentyFour
+          title="Our Plumbing Services"
+          description="From emergency repairs to complete remodels, we handle all your plumbing needs with expertise and care."
+          tag="Professional Services"
+          tagIcon={Wrench}
+          tagAnimation="slide-up"
+          features={[
+            {
+              id: "repipe",              title: "Full Repipe Systems",              author: "Expert Installation",              description: "Complete home repiping with modern materials. We assess your system and replace outdated pipes with durable, high-quality alternatives to ensure lasting reliability.",              tags: ["Home Upgrade", "Quality Materials"],
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746306.jpg",              imageAlt: "Full repipe system installation"},
+            {
+              id: "bathroom",              title: "Bathroom Remodels",              author: "Design & Installation",              description: "Transform your bathroom with our comprehensive remodeling services. We handle plumbing layout, fixtures, and installations to create the bathroom of your dreams.",              tags: ["Design", "Installation"],
+              imageSrc: "http://img.b2bpic.net/free-photo/empty-bathroom-with-hand-wash-basin_107420-63637.jpg",              imageAlt: "Luxury bathroom remodel"},
+            {
+              id: "toilet",              title: "In-Wall Toilet Systems",              author: "Modern Installation",              description: "Sleek, space-saving in-wall toilet systems that give your bathroom a contemporary look. Expert installation with concealed tanks and smooth operation.",              tags: ["Modern Design", "Space Saving"],
+              imageSrc: "http://img.b2bpic.net/free-photo/toilet-seat_1203-3742.jpg",              imageAlt: "In-wall toilet system"},
+            {
+              id: "steam",              title: "Steam Generator Installation",              author: "Luxury Addition",              description: "Install a personal steam shower system for ultimate relaxation. Complete plumbing integration and professional setup for safe, reliable operation.",              tags: ["Luxury", "Wellness"],
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-relaxing-spa_23-2148001076.jpg",              imageAlt: "Steam shower installation"},
+            {
+              id: "master",              title: "Master Remodels",              author: "Full-Service Renovation",              description: "Complete master suite and bathroom renovations. We coordinate all plumbing aspects of your major remodel project with precision and professionalism.",              tags: ["Comprehensive", "Expert Coordination"],
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746322.jpg",              imageAlt: "Master bathroom renovation"},
+            {
+              id: "general",              title: "General Plumbing Repairs",              author: "Quick Solutions",              description: "Fast response to leaks, clogs, and emergency repairs. Available for residential plumbing issues—from minor fixes to urgent problems that can't wait.",              tags: ["Emergency", "Reliable"],
+              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-53677.jpg",              imageAlt: "General plumbing repair service"},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          buttons={[
+            {
+              text: "Request Free Estimate",              href: "#contact"},
+          ]}
+        />
+      </div>
+
       {/* Metrics Section */}
       <div id="metrics" data-section="metrics">
         <MetricCardThree
           metrics={[
             {
-              id: "1",
-              icon: Award,
-              title: "Years Experience",
-              value: "27+",
-            },
+              id: "1",              icon: Award,
+              title: "Years Experience",              value: "27+"},
             {
-              id: "2",
-              icon: Star,
-              title: "5-Star Rating",
-              value: "100%",
-            },
+              id: "2",              icon: Star,
+              title: "5-Star Rating",              value: "100%"},
             {
-              id: "3",
-              icon: MapPin,
-              title: "Service Area",
-              value: "Local",
-            },
+              id: "3",              icon: MapPin,
+              title: "Service Area",              value: "Local"},
             {
-              id: "4",
-              icon: CheckCircle,
-              title: "Licensed & Insured",
-              value: "Yes",
-            },
+              id: "4",              icon: CheckCircle,
+              title: "Licensed & Insured",              value: "Yes"},
           ]}
           title="Why Choose PB&J Plumbing"
           description="Proven expertise and customer satisfaction. Our numbers speak to our commitment to quality service."
@@ -148,59 +150,17 @@ export default function HomePage() {
         <TestimonialCardTen
           testimonials={[
             {
-              id: "1",
-              title: "Professional & Punctual",
-              quote: "PB&J Plumbing fixed our burst pipe in an emergency and did an excellent job. They were professional, on time, and fair priced. Highly recommend!",
-              name: "Robert Martinez",
-              role: "Homeowner, Spring Hill",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-woman-wearing-casual-blue-shirt-success-sign-doing-positive-gesture-with-hand-thumbs-up-smiling-happy-cheerful-expression-winner-gesture_839833-2022.jpg?_wi=1",
-              imageAlt: "Robert Martinez",
-            },
+              id: "1",              title: "Professional & Punctual",              quote: "PB&J Plumbing fixed our burst pipe in an emergency and did an excellent job. They were professional, on time, and fair priced. Highly recommend!",              name: "Robert Martinez",              role: "Homeowner, Spring Hill",              imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-woman-wearing-casual-blue-shirt-success-sign-doing-positive-gesture-with-hand-thumbs-up-smiling-happy-cheerful-expression-winner-gesture_839833-2022.jpg",              imageAlt: "Robert Martinez"},
             {
-              id: "2",
-              title: "Transformed Our Bathroom",
-              quote: "We hired them for a full bathroom remodel and they exceeded our expectations. Great craftsmanship, attention to detail, and friendly team. Best decision!",
-              name: "Jennifer Thompson",
-              role: "Homeowner, Palm Harbor",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-business-embrace-confidence-posing-beauty-black-african-american-isolated-gray-background_640221-39.jpg?_wi=1",
-              imageAlt: "Jennifer Thompson",
-            },
+              id: "2",              title: "Transformed Our Bathroom",              quote: "We hired them for a full bathroom remodel and they exceeded our expectations. Great craftsmanship, attention to detail, and friendly team. Best decision!",              name: "Jennifer Thompson",              role: "Homeowner, Palm Harbor",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-business-embrace-confidence-posing-beauty-black-african-american-isolated-gray-background_640221-39.jpg",              imageAlt: "Jennifer Thompson"},
             {
-              id: "3",
-              title: "Reliable & Trustworthy",
-              quote: "27 years of experience shows in their work. They explained everything clearly, no surprises on the bill, and the quality is outstanding. Worth every penny.",
-              name: "David Chen",
-              role: "Homeowner, Spring Hill",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-woman-home_23-2150062545.jpg?_wi=1",
-              imageAlt: "David Chen",
-            },
+              id: "3",              title: "Reliable & Trustworthy",              quote: "27 years of experience shows in their work. They explained everything clearly, no surprises on the bill, and the quality is outstanding. Worth every penny.",              name: "David Chen",              role: "Homeowner, Spring Hill",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-woman-home_23-2150062545.jpg",              imageAlt: "David Chen"},
             {
-              id: "4",
-              title: "Emergency Service Hero",
-              quote: "Clogged main line at midnight and they answered! Arrived within 30 minutes, diagnosed the issue, and fixed it professionally. Thank you PB&J!",
-              name: "Margaret Sullivan",
-              role: "Homeowner, Surrounding Area",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-attractive-young-businesswoman_329181-15813.jpg?_wi=1",
-              imageAlt: "Margaret Sullivan",
-            },
+              id: "4",              title: "Emergency Service Hero",              quote: "Clogged main line at midnight and they answered! Arrived within 30 minutes, diagnosed the issue, and fixed it professionally. Thank you PB&J!",              name: "Margaret Sullivan",              role: "Homeowner, Surrounding Area",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-attractive-young-businesswoman_329181-15813.jpg",              imageAlt: "Margaret Sullivan"},
             {
-              id: "5",
-              title: "Outstanding Craftsmanship",
-              quote: "Completed our whole-house repipe project on schedule and within budget. The team was respectful of our home and did pristine work. Highly satisfied!",
-              name: "Thomas Anderson",
-              role: "Homeowner, Palm Harbor",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-woman-sitting-library_273609-15845.jpg?_wi=1",
-              imageAlt: "Thomas Anderson",
-            },
+              id: "5",              title: "Outstanding Craftsmanship",              quote: "Completed our whole-house repipe project on schedule and within budget. The team was respectful of our home and did pristine work. Highly satisfied!",              name: "Thomas Anderson",              role: "Homeowner, Palm Harbor",              imageSrc: "http://img.b2bpic.net/free-photo/young-woman-sitting-library_273609-15845.jpg",              imageAlt: "Thomas Anderson"},
             {
-              id: "6",
-              title: "Local & Personal Service",
-              quote: "I appreciate that they're locally owned and operated. They treat you like a neighbor, not a number. Professional service with a personal touch. Five stars!",
-              name: "Patricia Rodriguez",
-              role: "Homeowner, Spring Hill",
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-businesswoman-work_1098-3861.jpg?_wi=1",
-              imageAlt: "Patricia Rodriguez",
-            },
+              id: "6",              title: "Local & Personal Service",              quote: "I appreciate that they're locally owned and operated. They treat you like a neighbor, not a number. Professional service with a personal touch. Five stars!",              name: "Patricia Rodriguez",              role: "Homeowner, Spring Hill",              imageSrc: "http://img.b2bpic.net/free-photo/positive-businesswoman-work_1098-3861.jpg",              imageAlt: "Patricia Rodriguez"},
           ]}
           title="Trusted by Our Community"
           description="Read what homeowners in Spring Hill and Palm Harbor say about our plumbing services."
@@ -218,19 +178,12 @@ export default function HomePage() {
           title="Rated & Reviewed on Trusted Platforms"
           description="Consistently 5-star rated across Google, HomeAdvisor, and Angi. We're proud of our reputation and commitment to excellence."
           tag="Verified Reviews"
-          tagIcon={CheckCircleIcon}
+          tagIcon={CheckCircle}
           tagAnimation="slide-up"
           names={[
-            "Google Reviews",
-            "HomeAdvisor",
-            "Angi",
-            "Local Community",
-          ]}
+            "Google Reviews",            "HomeAdvisor",            "Angi",            "Local Community"]}
           logos={[
-            "http://img.b2bpic.net/free-photo/letter-z-white-paper-keyboard-white-marble-textured-background_23-2148061544.jpg",
-            "http://img.b2bpic.net/free-photo/home-insurance-coverage-estate-residential_53876-121259.jpg",
-            "http://img.b2bpic.net/free-vector/round-technology-logo_1051-868.jpg",
-          ]}
+            "http://img.b2bpic.net/free-photo/letter-z-white-paper-keyboard-white-marble-textured-background_23-2148061544.jpg",            "http://img.b2bpic.net/free-photo/home-insurance-coverage-estate-residential_53876-121259.jpg",            "http://img.b2bpic.net/free-vector/round-technology-logo_1051-868.jpg"]}
           textboxLayout="default"
           useInvertedBackground={false}
           speed={40}
@@ -243,35 +196,17 @@ export default function HomePage() {
         <FaqBase
           faqs={[
             {
-              id: "1",
-              title: "Do you offer free estimates?",
-              content: "Yes! We provide free, no-obligation estimates for all plumbing services. We'll assess your needs, explain the work required, and give you a fair, transparent quote before any work begins.",
-            },
+              id: "1",              title: "Do you offer free estimates?",              content: "Yes! We provide free, no-obligation estimates for all plumbing services. We'll assess your needs, explain the work required, and give you a fair, transparent quote before any work begins."},
             {
-              id: "2",
-              title: "Are you licensed and insured?",
-              content: "Absolutely. PB&J Plumbing is fully licensed and insured. We comply with all local codes and regulations. Your peace of mind and protection are important to us.",
-            },
+              id: "2",              title: "Are you licensed and insured?",              content: "Absolutely. PB&J Plumbing is fully licensed and insured. We comply with all local codes and regulations. Your peace of mind and protection are important to us."},
             {
-              id: "3",
-              title: "Do you offer emergency plumbing services?",
-              content: "Yes, we offer emergency plumbing services for urgent situations. Call (813) 479-5578 to speak with our team about after-hours emergencies and availability.",
-            },
+              id: "3",              title: "Do you offer emergency plumbing services?",              content: "Yes, we offer emergency plumbing services for urgent situations. Call (813) 479-5578 to speak with our team about after-hours emergencies and availability."},
             {
-              id: "4",
-              title: "What service areas do you cover?",
-              content: "We serve Spring Hill, Palm Harbor, and surrounding areas in the greater Tampa Bay region. Call us to confirm service availability for your specific location.",
-            },
+              id: "4",              title: "What service areas do you cover?",              content: "We serve Spring Hill, Palm Harbor, and surrounding areas in the greater Tampa Bay region. Call us to confirm service availability for your specific location."},
             {
-              id: "5",
-              title: "How long have you been in business?",
-              content: "We've been proudly serving the community for 27 years. Our longevity is a testament to our quality workmanship and customer satisfaction. We're locally owned and operated.",
-            },
+              id: "5",              title: "How long have you been in business?",              content: "We've been proudly serving the community for 27 years. Our longevity is a testament to our quality workmanship and customer satisfaction. We're locally owned and operated."},
             {
-              id: "6",
-              title: "What payment methods do you accept?",
-              content: "We accept all major payment methods including cash, check, credit cards, and financing options for larger projects. Ask about payment plans when you call for your free estimate.",
-            },
+              id: "6",              title: "What payment methods do you accept?",              content: "We accept all major payment methods including cash, check, credit cards, and financing options for larger projects. Ask about payment plans when you call for your free estimate."},
           ]}
           title="Common Plumbing Questions"
           description="Find answers to frequently asked questions about our services, pricing, and process."
@@ -285,73 +220,70 @@ export default function HomePage() {
         />
       </div>
 
+      {/* Contact Section */}
+      <div id="contact" data-section="contact">
+        <ContactFaq
+          ctaTitle="Ready to Schedule Your Service?"
+          ctaDescription="Contact us today for a free estimate or to book your plumbing service. We're here to help!"
+          ctaButton={{
+            text: "Call (813) 479-5578",            href: "tel:+18134795578"}}
+          ctaIcon={Phone}
+          useInvertedBackground={false}
+          animationType="slide-up"
+          faqs={[
+            {
+              id: "1",              title: "What is your response time for service calls?",              content: "We prioritize urgent plumbing emergencies and work to schedule service calls quickly. Response times vary based on demand, but we always strive for prompt, reliable service."},
+            {
+              id: "2",              title: "Do you provide warranties on your work?",              content: "Yes, we stand behind our work with warranties on labor and materials. Ask about specific warranty details when scheduling your service or requesting an estimate."},
+            {
+              id: "3",              title: "Can you help with water conservation upgrades?",              content: "Absolutely! We can install water-efficient fixtures and advise on upgrades that reduce water usage and lower your utility bills while protecting the environment."},
+            {
+              id: "4",              title: "Do you handle commercial plumbing work?",              content: "We primarily serve residential customers in Spring Hill and Palm Harbor. Contact us directly to discuss any commercial plumbing needs or referrals."},
+          ]}
+          accordionAnimationType="smooth"
+        />
+      </div>
+
       {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/map-california-gold-glitter-map-dark-background_559531-11072.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/map-california-gold-glitter-map-dark-background_559531-11072.jpg"
           imageAlt="Spring Hill, Florida service area"
           columns={[
             {
-              title: "Services",
-              items: [
+              title: "Services",              items: [
                 {
-                  label: "Full Repipe Systems",
-                  href: "/services",
-                },
+                  label: "Full Repipe Systems",                  href: "#services"},
                 {
-                  label: "Bathroom Remodels",
-                  href: "/services",
-                },
+                  label: "Bathroom Remodels",                  href: "#services"},
                 {
-                  label: "Emergency Repairs",
-                  href: "#contact",
-                },
+                  label: "Emergency Repairs",                  href: "#contact"},
                 {
-                  label: "Free Estimates",
-                  href: "#contact",
-                },
+                  label: "Free Estimates",                  href: "#contact"},
               ],
             },
             {
-              title: "Company",
-              items: [
+              title: "Company",              items: [
                 {
-                  label: "About Us",
-                  href: "/",
-                },
+                  label: "About Us",                  href: "#"},
                 {
-                  label: "Our Team",
-                  href: "/",
-                },
+                  label: "Our Team",                  href: "#"},
                 {
-                  label: "Reviews",
-                  href: "/",
-                },
+                  label: "Reviews",                  href: "#testimonials"},
                 {
-                  label: "Contact",
-                  href: "/",
-                },
+                  label: "Contact",                  href: "#contact"},
               ],
             },
             {
-              title: "Contact",
-              items: [
+              title: "Contact",              items: [
                 {
-                  label: "Phone: (813) 479-5578",
-                  href: "tel:+18134795578",
-                },
+                  label: "Phone: (813) 479-5578",                  href: "tel:+18134795578"},
                 {
-                  label: "Spring Hill, FL",
-                  href: "#",
-                },
+                  label: "Spring Hill, FL",                  href: "#"},
                 {
-                  label: "Serving Palm Harbor & Surrounding Areas",
-                  href: "#",
-                },
+                  label: "Serving Palm Harbor & Surrounding Areas",                  href: "#"},
                 {
-                  label: "Email us",
-                  href: "mailto:info@pbjplumbing.com",
-                },
+                  label: "Email us",                  href: "mailto:info@pbjplumbing.com"},
               ],
             },
           ]}