diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 40b9924..f79b54b 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,9 +3,9 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import SplitAbout from "@/components/sections/about/SplitAbout";
-import FeatureHoverPattern from "@/components/sections/feature/featureHoverPattern/FeatureHoverPattern";
+import AboutMetric from "@/components/sections/about/AboutMetric";
 import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
-import { Info, CheckCircle, Clock, Users, DollarSign, Lightbulb, Heart, Zap } from "lucide-react";
+import { Award, TrendingUp, Users, Shield } from "lucide-react";
 
 export default function AboutPage() {
   const navItems = [
@@ -33,87 +33,58 @@ export default function AboutPage() {
         <NavbarStyleFullscreen
           navItems={navItems}
           brandName="Escalus Fairfield Plumbing"
-          bottomLeftText="Fairfield, CT 06820"
-          bottomRightText="(203) 555-0147"
+          bottomLeftText="Fairfield, CT 06825"
+          bottomRightText="(203) 670-0673"
         />
       </div>
 
-      <div id="about" data-section="about">
+      <div id="about-intro" data-section="about-intro">
         <SplitAbout
-          title="Why Choose Escalus Fairfield Plumbing?"
-          description="Serving Fairfield, Connecticut with reliable, professional plumbing services since 2010. We're committed to quality work, transparent pricing, and exceptional customer service."
+          title="About Escalus Fairfield Plumbing"
+          description="With over a decade of experience serving the Fairfield community, Escalus Fairfield Plumbing is your trusted partner for all plumbing needs. We're committed to providing fast, professional, and affordable plumbing solutions backed by our 5-star reputation."
           tag="About Us"
-          tagIcon={Info}
+          tagIcon={Award}
           textboxLayout="default"
-          useInvertedBackground={true}
+          useInvertedBackground={false}
           bulletPoints={[
             {
-              icon: CheckCircle,
-              title: "Licensed & Insured",
-              description: "All our plumbers are fully licensed, bonded, and insured for your peace of mind.",
-            },
-            {
-              icon: Clock,
-              title: "24/7 Availability",
-              description: "Emergency plumbing services available around the clock, including weekends and holidays.",
-            },
+              icon: TrendingUp,
+              title: "Years of Experience",              description: "Serving Fairfield and surrounding areas with professional plumbing expertise and quality service."},
             {
               icon: Users,
-              title: "Local Expertise",
-              description: "Deep knowledge of Fairfield plumbing codes and local water systems ensures compliant, lasting solutions.",
-            },
+              title: "Expert Team",              description: "Licensed, insured plumbers trained in the latest techniques and equipped with modern tools."},
             {
-              icon: DollarSign,
-              title: "Transparent Pricing",
-              description: "No hidden fees. We provide upfront quotes and explain all work before we begin.",
-            },
+              icon: Shield,
+              title: "100% Satisfaction",              description: "We stand behind our work with a guarantee. If you're not satisfied, we'll make it right."},
+            {
+              icon: Award,
+              title: "24/7 Availability",              description: "Emergency plumbing doesn't take a break. Neither do we. Available day and night, 365 days a year."},
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/happy-manual-worker-presenting-results-business-development-while-giving-presentation-company-leaders-his-team-factory_637285-4144.jpg?_wi=2"
+          imageSrc="https://images.unsplash.com/photo-1552664730-d307ca884978?w=600&h=600&fit=crop"
           imageAlt="Professional plumbing team"
           mediaAnimation="slide-up"
         />
       </div>
 
-      <div id="our-values" data-section="our-values">
-        <FeatureHoverPattern
-          title="Our Core Values"
-          description="These principles guide everything we do, from the moment you call us to the completion of your plumbing project."
-          tag="What We Stand For"
-          features={[
+      <div id="about-metrics" data-section="about-metrics">
+        <AboutMetric
+          title="Why Escalus Fairfield Plumbing is Your Best Choice"
+          useInvertedBackground={true}
+          metrics={[
             {
-              icon: Heart,
-              title: "Customer First",
-              description: "Your satisfaction is our top priority. We listen to your concerns and deliver solutions that exceed expectations.",
-            },
-            {
-              icon: Lightbulb,
-              title: "Innovation",
-              description: "We stay current with the latest plumbing technologies and techniques to provide modern solutions.",
-            },
-            {
-              icon: Zap,
-              title: "Reliability",
-              description: "When you call us, you can count on us to show up on time, every time, and get the job done right.",
-            },
-            {
-              icon: CheckCircle,
-              title: "Quality",
-              description: "We use only premium materials and employ rigorous quality control on every single job.",
-            },
+              icon: TrendingUp,
+              label: "Years in Business",              value: "10+"},
             {
               icon: Users,
-              title: "Community",
-              description: "We're proud to be part of the Fairfield community and give back whenever we can.",
-            },
+              label: "Happy Customers",              value: "2,000+"},
             {
-              icon: DollarSign,
-              title: "Fair Pricing",
-              description: "Honest, competitive pricing with no surprises. You'll always know exactly what you're paying for.",
-            },
+              icon: Shield,
+              label: "Emergency Calls",              value: "500+/Year"},
+            {
+              icon: Award,
+              label: "Star Rating",              value: "5 Stars"},
           ]}
-          textboxLayout="default"
-          useInvertedBackground={false}
-          animationType="slide-up"
+          metricsAnimation="slide-up"
         />
       </div>
 
@@ -126,4 +97,4 @@ export default function AboutPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 14ba77f..7288f58 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -3,23 +3,19 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
-import SplitAbout from "@/components/sections/about/SplitAbout";
+import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
-import { Phone, Mail, MapPin, Clock } from "lucide-react";
+import { Phone, MapPin, Clock } from "lucide-react";
 
 export default function ContactPage() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "Services", id: "/services" },
     { name: "About", id: "/about" },
-    { name: "Reviews", id: "/contact" },
+    { name: "Reviews", id: "/" },
     { name: "Contact", id: "/contact" },
   ];
 
-  const handleContactSubmit = (data: Record<string, string>) => {
-    console.log("Contact form submitted:", data);
-  };
-
   return (
     <ThemeProvider
       defaultButtonVariant="hover-bubble"
@@ -37,15 +33,15 @@ export default function ContactPage() {
         <NavbarStyleFullscreen
           navItems={navItems}
           brandName="Escalus Fairfield Plumbing"
-          bottomLeftText="Fairfield, CT 06820"
-          bottomRightText="(203) 555-0147"
+          bottomLeftText="Fairfield, CT 06825"
+          bottomRightText="(203) 670-0673"
         />
       </div>
 
       <div id="contact-form" data-section="contact-form">
         <ContactSplitForm
-          title="Get Your Plumbing Fixed Today"
-          description="Contact us for emergency repairs, routine maintenance, or to schedule a service appointment. We'll respond quickly to all inquiries."
+          title="Request Plumbing Service"
+          description="Fill out the form below and we'll get back to you as soon as possible. For emergencies, call us directly at (203) 670-0673."
           inputs={[
             { name: "name", type: "text", placeholder: "Your Name", required: true },
             { name: "phone", type: "tel", placeholder: "Your Phone Number", required: true },
@@ -53,53 +49,30 @@ export default function ContactPage() {
             { name: "address", type: "text", placeholder: "Service Address", required: true },
           ]}
           textarea={{
-            name: "message",
-            placeholder: "Describe your plumbing issue or service request...",
-            rows: 5,
+            name: "message",            placeholder: "Describe your plumbing issue or service request...",            rows: 5,
             required: true,
           }}
           useInvertedBackground={false}
-          imageSrc="http://img.b2bpic.net/free-photo/healthcare-expert-wearing-headset-while-working-call-center-giving-instructions-patients_637285-4888.jpg?_wi=2"
-          imageAlt="Emergency plumbing service"
+          imageSrc="https://images.unsplash.com/photo-1552664730-d307ca884978?w=600&h=600&fit=crop"
+          imageAlt="Customer service"
           mediaAnimation="slide-up"
           mediaPosition="right"
           buttonText="Request Service"
-          onSubmit={handleContactSubmit}
         />
       </div>
 
       <div id="contact-info" data-section="contact-info">
-        <SplitAbout
-          title="Get In Touch With Us"
-          description="Multiple ways to reach Escalus Fairfield Plumbing. Whether it's an emergency or a routine inquiry, we're here to help you."
-          tag="Contact Information"
-          textboxLayout="default"
-          useInvertedBackground={true}
-          bulletPoints={[
-            {
-              icon: Phone,
-              title: "Emergency Phone",
-              description: "(203) 555-0147 - Available 24/7 for urgent plumbing emergencies.",
-            },
-            {
-              icon: Mail,
-              title: "Email",
-              description: "service@escalusplumbing.com - For non-urgent inquiries and quotes.",
-            },
-            {
-              icon: MapPin,
-              title: "Service Area",
-              description: "Fairfield, Connecticut and surrounding communities within 15 miles.",
-            },
-            {
-              icon: Clock,
-              title: "Hours",
-              description: "24/7 emergency service. Regular service hours: Monday-Friday 7AM-6PM, Saturday 8AM-4PM.",
-            },
+        <ContactCTA
+          tag="Business Information"
+          tagIcon={Phone}
+          title="Get in Touch"
+          description="Escalus Fairfield Plumbing is available 24/7 for all your plumbing needs. Call us anytime for emergency services or to schedule a service appointment."
+          buttons={[
+            { text: "Call (203) 670-0673", href: "tel:+12036700673" },
+            { text: "Visit Address", href: "https://maps.google.com/?q=109+Tunxis+Hill+Rd+Fairfield+CT+06825" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990698.jpg"
-          imageAlt="Professional plumber at work"
-          mediaAnimation="slide-up"
+          background={{ variant: "plain" }}
+          useInvertedBackground={true}
         />
       </div>
 
@@ -112,4 +85,4 @@ export default function ContactPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 468bf7f..6522f86 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,62 +1,26 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
 import { Inter } from "next/font/google";
-import { Manrope } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
-
-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
+import "./styles/variables.css";
+import "./styles/base.css";
 
 const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});
-
-const manrope = Manrope({
-  variable: "--font-manrope",
-  subsets: ["latin"],
+  variable: "--font-inter",  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "Escalus Fairfield Plumbing | 24/7 Emergency Plumbing Services CT",
-  description: "Professional 24/7 emergency plumbing services in Fairfield, Connecticut. Licensed, insured plumbers. Same-day service. 5-star customer satisfaction. Call now!",
-  keywords: "plumber Fairfield CT, emergency plumbing, drain cleaning, water heater repair, 24/7 plumbing service",
-  openGraph: {
-    title: "Escalus Fairfield Plumbing | 24/7 Emergency Services",
-    description: "Professional plumbing solutions for Fairfield, Connecticut. Same-day emergency service available.",
-    siteName: "Escalus Fairfield Plumbing",
-    type: "website",
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "Escalus Fairfield Plumbing | 24/7 Emergency Services",
-    description: "Professional plumbing services in Fairfield, CT. Emergency repairs, maintenance, and installation.",
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Escalus Fairfield Plumbing - 24/7 Emergency Plumbing Services",  description: "Professional plumbing services in Fairfield, CT. 24/7 emergency repairs, drain cleaning, water heater services, and more. Licensed, insured, and 5-star rated."};
 
 export default function RootLayout({
   children,
-}: Readonly<{
+}: {
   children: React.ReactNode;
-}>) {
+}) {
   return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${manrope.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={inter.variable}>
+        {children}
+      
         <script
           dangerouslySetInnerHTML={{
             __html: `
@@ -1424,7 +1388,6 @@ export default function RootLayout({
           }}
         />
       </body>
-      </ServiceWrapper>
     </html>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 6325fa6..2410f39 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,28 +7,28 @@ import FeatureHoverPattern from "@/components/sections/feature/featureHoverPatte
 import TestimonialCardTen from "@/components/sections/testimonial/TestimonialCardTen";
 import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
 import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
-import { AlertCircle, Wrench, Droplet, AlertTriangle, Droplets, Flame, Shield, CheckCircle, Clock, Users, DollarSign, Star } from "lucide-react";
+import { AlertCircle, Wrench, Droplet, AlertTriangle, Droplets, Flame, Shield, Star } from "lucide-react";
 
 export default function HomePage() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "Services", id: "/services" },
     { name: "About", id: "/about" },
-    { name: "Reviews", id: "/contact" },
+    { name: "Reviews", id: "#testimonials" },
     { name: "Contact", id: "/contact" },
   ];
 
   const testimonials = [
     {
-      id: "1",      title: "Emergency Response Saved Our Home",      quote: "Our burst pipe at 2 AM could have caused thousands in damage. Escalus arrived within 30 minutes and fixed it professionally. Highly recommend!",      name: "Robert Martinez",      role: "Homeowner",      imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=1",      imageAlt: "Robert Martinez"},
+      id: "1",      title: "Emergency Response Saved Our Home",      quote: "Our burst pipe at 2 AM could have caused thousands in damage. Escalus arrived within 30 minutes and fixed it professionally. Highly recommend!",      name: "Robert Martinez",      role: "Homeowner",      imageSrc: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=400&h=400&fit=crop",      imageAlt: "Robert Martinez"},
     {
-      id: "2",      title: "Best Plumber in Fairfield",      quote: "Fixed our kitchen sink leak perfectly. Fair pricing, clean work, and they actually explained what was wrong. Will definitely call them again.",      name: "Sarah Thompson",      role: "Homeowner",      imageSrc: "http://img.b2bpic.net/free-photo/man-portrait-posing-loft-modern-space_158595-5367.jpg",      imageAlt: "Sarah Thompson"},
+      id: "2",      title: "Best Plumber in Fairfield",      quote: "Fixed our kitchen sink leak perfectly. Fair pricing, clean work, and they actually explained what was wrong. Will definitely call them again.",      name: "Sarah Thompson",      role: "Homeowner",      imageSrc: "https://images.unsplash.com/photo-1494790108377-be9c29b29330?w=400&h=400&fit=crop",      imageAlt: "Sarah Thompson"},
     {
-      id: "3",      title: "Professional and Reliable",      quote: "We use Escalus for all our commercial building maintenance. They're always on time, professional, and solve problems quickly.",      name: "Michael Chen",      role: "Property Manager",      imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=2",      imageAlt: "Michael Chen"},
+      id: "3",      title: "Professional and Reliable",      quote: "We use Escalus for all our commercial building maintenance. They're always on time, professional, and solve problems quickly.",      name: "Michael Chen",      role: "Property Manager",      imageSrc: "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?w=400&h=400&fit=crop",      imageAlt: "Michael Chen"},
     {
-      id: "4",      title: "Trustworthy and Honest",      quote: "They could have replaced my whole water heater, but they only fixed what was needed. That kind of honesty is rare. Five stars!",      name: "Jennifer Williams",      role: "Homeowner",      imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",      imageAlt: "Jennifer Williams"},
+      id: "4",      title: "Trustworthy and Honest",      quote: "They could have replaced my whole water heater, but they only fixed what was needed. That kind of honesty is rare. Five stars!",      name: "Jennifer Williams",      role: "Homeowner",      imageSrc: "https://images.unsplash.com/photo-1438761681033-6461ffad8d80?w=400&h=400&fit=crop",      imageAlt: "Jennifer Williams"},
     {
-      id: "5",      title: "Exceptional Service",      quote: "From the first phone call to the completed job, everything was seamless. Our bathroom plumbing works perfectly now.",      name: "David Anderson",      role: "Homeowner",      imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=3",      imageAlt: "David Anderson"},
+      id: "5",      title: "Exceptional Service",      quote: "From the first phone call to the completed job, everything was seamless. Our bathroom plumbing works perfectly now.",      name: "David Anderson",      role: "Homeowner",      imageSrc: "https://images.unsplash.com/photo-1507009335872-a72960257ae0?w=400&h=400&fit=crop",      imageAlt: "David Anderson"},
   ];
 
   return (
@@ -48,8 +48,8 @@ export default function HomePage() {
         <NavbarStyleFullscreen
           navItems={navItems}
           brandName="Escalus Fairfield Plumbing"
-          bottomLeftText="Fairfield, CT 06820"
-          bottomRightText="(203) 555-0147"
+          bottomLeftText="Fairfield, CT 06825"
+          bottomRightText="(203) 670-0673"
         />
       </div>
 
@@ -60,15 +60,15 @@ export default function HomePage() {
           tag="Emergency Plumbing"
           tagIcon={AlertCircle}
           buttons={[
-            { text: "Call Now: (203) 555-0147", href: "tel:+12035550147" },
-            { text: "Schedule Service" },
+            { text: "Call Now: (203) 670-0673", href: "tel:+12036700673" },
+            { text: "Schedule Service", href: "/contact" },
           ]}
           background={{ variant: "plain" }}
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721566.jpg",              imageAlt: "Emergency plumbing service"},
+              imageSrc: "https://images.unsplash.com/photo-1585771724684-38269d6639fd?w=600&h=600&fit=crop",              imageAlt: "Emergency plumbing service"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/female-plumber-working-fix-problems-client-s-house_23-2150990725.jpg",              imageAlt: "Professional plumbing solution"},
+              imageSrc: "https://images.unsplash.com/photo-1581092918056-0c4c3acd3789?w=600&h=600&fit=crop",              imageAlt: "Professional plumbing solution"},
           ]}
           rating={5}
           ratingText="5-Star Customer Satisfaction"
@@ -137,8 +137,8 @@ export default function HomePage() {
             required: true,
           }}
           useInvertedBackground={false}
-          imageSrc="http://img.b2bpic.net/free-photo/healthcare-expert-wearing-headset-while-working-call-center-giving-instructions-patients_637285-4888.jpg"
-          imageAlt="Emergency plumbing service"
+          imageSrc="https://images.unsplash.com/photo-1552664730-d307ca884978?w=600&h=600&fit=crop"
+          imageAlt="Customer service representative"
           mediaAnimation="slide-up"
           mediaPosition="right"
           buttonText="Request Service"
@@ -154,4 +154,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 438692b..06e15ce 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -33,8 +33,8 @@ export default function ServicesPage() {
         <NavbarStyleFullscreen
           navItems={navItems}
           brandName="Escalus Fairfield Plumbing"
-          bottomLeftText="Fairfield, CT 06820"
-          bottomRightText="(203) 555-0147"
+          bottomLeftText="Fairfield, CT 06825"
+          bottomRightText="(203) 670-0673"
         />
       </div>
 
@@ -92,7 +92,7 @@ export default function ServicesPage() {
               icon: Shield,
               title: "Fully Licensed & Insured",              description: "Complete coverage and protection for every job. Your peace of mind is our priority."},
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/happy-manual-worker-presenting-results-business-development-while-giving-presentation-company-leaders-his-team-factory_637285-4144.jpg"
+          imageSrc="https://images.unsplash.com/photo-1552664730-d307ca884978?w=600&h=600&fit=crop"
           imageAlt="Professional plumbing team"
           mediaAnimation="slide-up"
         />
@@ -107,4 +107,4 @@ export default function ServicesPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}