diff --git a/src/app/water-heaters/page.tsx b/src/app/water-heaters/page.tsx
index 9cfa349..f2bed0a 100644
--- a/src/app/water-heaters/page.tsx
+++ b/src/app/water-heaters/page.tsx
@@ -1,12 +1,16 @@
 "use client";
 
-import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import HeroBillboard from "@/components/sections/hero/HeroBillboard";
 import FeatureCardOne from "@/components/sections/feature/FeatureCardOne";
+import MetricCardSeven from "@/components/sections/metrics/MetricCardSeven";
+import MediaAbout from "@/components/sections/about/MediaAbout";
+import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
+import FaqBase from "@/components/sections/faq/FaqBase";
 import FooterMedia from "@/components/sections/footer/FooterMedia";
+import { AlertCircle, Zap, Droplets, Shield } from "lucide-react";
 
 const navItems = [
   { name: "Home", id: "/" },
@@ -47,18 +51,19 @@ export default function WaterHeatersPage() {
       {/* Hero Section */}
       <div id="hero" data-section="hero">
         <HeroBillboard
-          title="Water Heater Repair & Installation Sacramento"
-          description="Expert water heater services with fast diagnosis and reliable repair solutions. Call for 24/7 emergency service."
+          title="Water Heater Service & Installation in Sacramento"
+          description="Fast water heater repair, replacement, and maintenance. Never go without hot water again. 24/7 emergency service."
           background={{ variant: "animated-grid" }}
-          tag="Fast Same-Day Service"
+          tag="Expert Technicians"
+          tagIcon={Zap}
           buttons={[
-            {
-              text: "Call Now",              href: "tel:(279)348-7473"},
             {
               text: "Schedule Service",              href: "#contact"},
+            {
+              text: "Call (279) 348-7473",              href: "tel:(279)348-7473"},
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/cheerful-adult-plumber-sitting-bathroom_23-2147772218.jpg?_wi=3"
-          imageAlt="Professional water heater installation"
+          imageSrc="http://img.b2bpic.net/free-photo/cheerful-adult-plumber-sitting-bathroom_23-2147772218.jpg?_wi=1"
+          imageAlt="Water heater service and installation"
           mediaAnimation="slide-up"
         />
       </div>
@@ -66,28 +71,46 @@ export default function WaterHeatersPage() {
       {/* Water Heater Services */}
       <div id="water-heater-services" data-section="water-heater-services">
         <FeatureCardOne
-          title="Water Heater Solutions"
-          description="From emergency repairs to new installations, we provide complete water heater services for your home."
+          title="Water Heater Services"
+          description="Complete water heater solutions including repair, replacement, installation, and maintenance for all types of units."
           textboxLayout="default"
           gridVariant="uniform-all-items-equal"
           animationType="slide-up"
           features={[
             {
-              title: "Tank Water Heater Repair",              description:
-                "Quick diagnosis and repair of traditional tank water heaters to restore hot water.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/cheerful-adult-plumber-sitting-bathroom_23-2147772218.jpg?_wi=4",              imageAlt: "Tank water heater repair",              button: {
-                text: "Get Service",                href: "#contact"},
+              title: "Water Heater Repair",              description:
+                "Quick diagnosis and repair of water heater issues including no hot water, leaks, strange noises, and poor water pressure. We service all major brands and models.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/cheerful-adult-plumber-sitting-bathroom_23-2147772218.jpg?_wi=1",              imageAlt: "Water heater repair service",              button: {
+                text: "Get Repair Quote",                href: "#contact"},
             },
             {
-              title: "Tankless Water Heater Service",              description:
-                "Installation, repair, and maintenance of energy-efficient tankless water heaters.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/sanitary-technician-working-with-sink_23-2147772219.jpg?_wi=3",              imageAlt: "Tankless water heater service",              button: {
-                text: "Learn More",                href: "#contact"},
+              title: "Water Heater Replacement",              description:
+                "Professional installation of new water heaters. We help you choose the right size and type for your home, then handle the complete installation and removal of the old unit.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/sanitary-technician-working-with-sink_23-2147772219.jpg?_wi=1",              imageAlt: "Water heater replacement",              button: {
+                text: "Get Replacement Quote",                href: "#contact"},
             },
             {
-              title: "Water Heater Installation",              description:
-                "Professional installation of new water heaters with proper sizing and efficiency optimization.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/service-maintenance-worker-repairing_23-2149176721.jpg?_wi=3",              imageAlt: "Water heater installation",              button: {
+              title: "Tankless Water Heaters",              description:
+                "Upgrade to a tankless water heater for on-demand hot water and energy savings. We install and service all major brands with expert technical support.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/plumbing-inspection-man-overalls-with-badge-reclining-floor-with-tools_259150-58264.jpg?_wi=1",              imageAlt: "Tankless water heater installation",              button: {
+                text: "Learn More",                href: "#tankless"},
+            },
+            {
+              title: "Water Heater Maintenance",              description:
+                "Regular maintenance extends the life of your water heater and improves efficiency. We flush tanks, inspect components, and address issues before they become problems.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/service-maintenance-worker-repairing_23-2149176721.jpg?_wi=1",              imageAlt: "Water heater maintenance",              button: {
+                text: "Schedule Maintenance",                href: "#contact"},
+            },
+            {
+              title: "Emergency Water Heater Service",              description:
+                "No hot water in the middle of winter? We're available 24/7 for emergency water heater repairs. Fast response times to restore hot water to your home.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/woman-calling-plumber-solve-kitchen-problems_23-2150990674.jpg?_wi=1",              imageAlt: "Emergency water heater service",              button: {
+                text: "Emergency Service",                href: "tel:(279)348-7473"},
+            },
+            {
+              title: "Water Heater Expansion Tanks",              description:
+                "Installation of expansion tanks to protect your water heater and plumbing system. Reduces pressure, extends equipment life, and improves safety.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/woodworking-expert-examining-timber-block-damages-sanding-with-sandpaper_482257-89256.jpg?_wi=1",              imageAlt: "Expansion tank installation",              button: {
                 text: "Get Quote",                href: "#contact"},
             },
           ]}
@@ -95,46 +118,160 @@ export default function WaterHeatersPage() {
         />
       </div>
 
-      {/* Contact Section */}
-      <div id="contact" data-section="contact">
-        <ContactCenter
-          tag="Schedule Now"
-          title="Get Your Water Heater Fixed Today"
-          description="Contact our Sacramento water heater experts for reliable repair and installation services. Available 24/7 for emergencies."
-          background={{ variant: "sparkles-gradient" }}
+      {/* Why Choose Us for Water Heater Service */}
+      <div id="why-water-heaters" data-section="why-water-heaters">
+        <MediaAbout
+          title="Why Choose Us for Water Heater Service?"
+          description="Our experienced technicians specialize in water heater repair and installation. We help you save money on energy costs while ensuring reliable hot water when you need it."
+          tag="Trusted Experts"
+          buttons={[
+            {
+              text: "Get Free Quote",              href: "#contact"},
+            {
+              text: "Call Now",              href: "tel:(279)348-7473"},
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/men-with-beer-smartphone-party_23-2147644302.jpg?_wi=1"
+          imageAlt="Water heater service team"
           useInvertedBackground={false}
-          buttonText="Request Service"
-          inputPlaceholder="Your email address"
-          termsText="We'll respond within 24 hours. Same-day service often available for emergencies."
+        />
+      </div>
+
+      {/* Water Heater Benefits & Features */}
+      <div id="water-heater-benefits" data-section="water-heater-benefits">
+        <MetricCardSeven
+          metrics={[
+            {
+              id: "reliability",              value: "99.9%",              title: "System Reliability",              items: ["Minimal downtime", "Professional installation"],
+            },
+            {
+              id: "efficiency",              value: "40%",              title: "Energy Savings",              items: ["Lower utility bills", "Eco-friendly options"],
+            },
+            {
+              id: "lifespan",              value: "15+ YRS",              title: "Average Lifespan",              items: ["With proper maintenance", "Regular service extends life"],
+            },
+            {
+              id: "support",              value: "24/7",              title: "Customer Support",              items: ["Emergency service", "Professional technicians"],
+            },
+          ]}
+          title="Water Heater Service Benefits"
+          description="Reliable hot water with expert service and professional support."
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      {/* Customer Testimonials */}
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardFifteen
+          testimonial="My water heater stopped working on a cold Saturday night. I called their emergency line and a technician arrived within 90 minutes. They replaced the unit quickly and professionally. Best emergency service I've experienced!"
+          rating={5}
+          author="Jennifer Martinez"
+          avatars={[
+            {
+              src: "http://img.b2bpic.net/free-photo/portrait-cute-blonde-woman-pointing-her-smile-checked-shirt-looking-cheerful-front-view_176474-112653.jpg",              alt: "Customer testimonial"},
+            {
+              src: "http://img.b2bpic.net/free-photo/smiling-middle-aged-attractive-woman-showing-thumb-up-outdoors_1262-12526.jpg",              alt: "Customer testimonial"},
+            {
+              src: "http://img.b2bpic.net/free-photo/pleased-handsome-male-customer-show-thumb-up-approval_176420-17945.jpg",              alt: "Customer testimonial"},
+            {
+              src: "http://img.b2bpic.net/free-photo/smiley-woman-posing-her-home_23-2148708980.jpg",              alt: "Customer testimonial"},
+          ]}
+          ratingAnimation="slide-up"
+          avatarsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      {/* Water Heater Types Info */}
+      <div id="water-heater-types" data-section="water-heater-types">
+        <MediaAbout
+          title="Traditional vs. Tankless Water Heaters"
+          description="Not sure which water heater is right for your home? We help you understand the pros and cons of each type so you can make the best choice for your family and budget."
+          tag="Informed Decisions"
+          buttons={[
+            {
+              text: "Schedule Consultation",              href: "#contact"},
+            {
+              text: "Call for Advice",              href: "tel:(279)348-7473"},
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/people-taking-part-business-event_23-2149346636.jpg?_wi=1"
+          imageAlt="Water heater consultation"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      {/* FAQ */}
+      <div id="faq" data-section="faq">
+        <FaqBase
+          title="Water Heater FAQs"
+          description="Common questions about water heater service, repair, and replacement."
+          textboxLayout="default"
+          faqs={[
+            {
+              id: "1",              title: "How long do water heaters typically last?",              content:
+                "Traditional tank water heaters usually last 10-15 years with proper maintenance. Tankless water heaters can last 20+ years. Regular maintenance and flushing can extend the life of your unit."},
+            {
+              id: "2",              title: "What are the signs my water heater needs repair?",              content:
+                "Common signs include no hot water, rusty water, water pooling around the unit, strange noises, or reduced hot water pressure. If you notice any of these issues, call us for a professional inspection."},
+            {
+              id: "3",              title: "How much does water heater repair cost?",              content:
+                "Repair costs vary depending on the issue and parts needed. We provide free estimates so you know the cost before we start work. Call (279) 348-7473 for a quote."},
+            {
+              id: "4",              title: "Is a tankless water heater worth it?",              content:
+                "Tankless water heaters offer benefits like energy savings, unlimited hot water, and space savings. However, they require higher upfront investment. We can help you determine if it's right for your home."},
+            {
+              id: "5",              title: "How often should I flush my water heater?",              content:
+                "We recommend flushing your water heater annually to remove sediment buildup. This improves efficiency and extends the life of your unit. We offer annual maintenance plans for your convenience."},
+            {
+              id: "6",              title: "Do you offer emergency water heater service?",              content:
+                "Yes! We're available 24/7 for emergency water heater repairs. Call (279) 348-7473 anytime and we'll prioritize your call. Our typical response time is 1-2 hours in the Sacramento area."},
+          ]}
+          faqsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      {/* CTA Section */}
+      <div id="cta" data-section="cta">
+        <ContactCenter
+          tag="Don't Wait"
+          title="Need Water Heater Service Now?"
+          description="Don't suffer without hot water. Contact us today for fast, professional water heater repair, replacement, or maintenance."
+          background={{ variant: "gradient-bars" }}
+          useInvertedBackground={true}
+          buttonText="Call Now"
+          inputPlaceholder="(279) 348-7473"
+          termsText="24/7 emergency service available. Fast response times throughout Sacramento and surrounding areas."
         />
       </div>
 
       {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/people-taking-part-business-event_23-2149346636.jpg?_wi=3"
-          imageAlt="Plumbing services background"
+          imageSrc="http://img.b2bpic.net/free-photo/people-taking-part-business-event_23-2149346636.jpg?_wi=1"
+          imageAlt="Water heater services"
           logoText="Plumbing Sacramento"
           copyrightText="© 2025 Plumbing Sacramento & Water Heater Services. All rights reserved."
           columns={[
             {
               title: "Services",              items: [
-                {
-                  label: "Emergency Plumbing",                  href: "#services"},
-                {
-                  label: "Drain Cleaning",                  href: "#services"},
                 {
                   label: "Water Heater Repair",                  href: "/water-heaters"},
                 {
-                  label: "Leak Detection",                  href: "#services"},
+                  label: "Water Heater Replacement",                  href: "/water-heaters"},
+                {
+                  label: "Tankless Water Heaters",                  href: "/water-heaters"},
+                {
+                  label: "Maintenance Plans",                  href: "/water-heaters"},
               ],
             },
             {
               title: "Company",              items: [
                 {
-                  label: "About Us",                  href: "/about"},
+                  label: "Home",                  href: "/"},
                 {
-                  label: "Reviews",                  href: "/reviews"},
+                  label: "Services",                  href: "/services"},
                 {
                   label: "Contact",                  href: "/contact"},
                 {
@@ -158,4 +295,4 @@ export default function WaterHeatersPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}