diff --git a/src/app/page.tsx b/src/app/page.tsx
index 18ff3f2..299b7ef 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -9,7 +9,7 @@ import FeatureCardTen from "@/components/sections/feature/FeatureCardTen";
 import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
 import ContactSplit from "@/components/sections/contact/ContactSplit";
 import FooterMedia from "@/components/sections/footer/FooterMedia";
-import { Award, Shield, Clock, CheckCircle, Droplets, Pipe, Wrench, Search, Zap, RefreshCw, Leaf, Flame, AlertTriangle, PhoneCall, MapPin, DollarSign, Eye, Users } from "lucide-react";
+import { Award, Shield, Clock, CheckCircle, Droplets, Wrench, Search, Zap, RefreshCw, Leaf, Flame, AlertTriangle, PhoneCall, MapPin, DollarSign, Eye, Users } from "lucide-react";
 
 export default function HomePage() {
   const navItems = [
@@ -38,9 +38,7 @@ export default function HomePage() {
           brandName="Westernish Plumbing"
           navItems={navItems}
           button={{
-            text: "Call Now",
-            href: "tel:(604)368-5243",
-          }}
+            text: "Call Now",            href: "tel:(604)368-5243"}}
           className="fixed top-4 left-4 right-4 z-50"
         />
       </div>
@@ -52,9 +50,7 @@ export default function HomePage() {
           background={{ variant: "downward-rays-static" }}
           avatars={[
             {
-              src: "http://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg",
-              alt: "Professional plumber at work",
-            },
+              src: "http://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg",              alt: "Professional plumber at work"},
           ]}
           avatarText="Trusted by 1000+ Homeowners"
           buttons={[
@@ -88,27 +84,19 @@ export default function HomePage() {
           tag="Services"
           features={[
             {
-              id: "1",
-              title: "Plumbing Services",
-              description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=1",
-              },
+              id: "1",              title: "Plumbing Services",              description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg"},
               items: [
                 { icon: Droplets, text: "Leak Repairs" },
-                { icon: Pipe, text: "Pipe Installation" },
+                { icon: Wrench, text: "Pipe Installation" },
                 { icon: Wrench, text: "Drain Repairs" },
                 { icon: Search, text: "Inspections" },
               ],
               reverse: false,
             },
             {
-              id: "2",
-              title: "Hot Water Tank Services",
-              description: "Professional installation, replacement, and repair of hot water tanks and tankless systems to keep your home comfortable.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg?_wi=1",
-              },
+              id: "2",              title: "Hot Water Tank Services",              description: "Professional installation, replacement, and repair of hot water tanks and tankless systems to keep your home comfortable.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg"},
               items: [
                 { icon: Zap, text: "Installation" },
                 { icon: RefreshCw, text: "Replacement" },
@@ -118,12 +106,8 @@ export default function HomePage() {
               reverse: true,
             },
             {
-              id: "3",
-              title: "Heating Services",
-              description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg?_wi=1",
-              },
+              id: "3",              title: "Heating Services",              description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg"},
               items: [
                 { icon: Flame, text: "Furnace Installation" },
                 { icon: Wrench, text: "Boiler Repair" },
@@ -133,12 +117,8 @@ export default function HomePage() {
               reverse: false,
             },
             {
-              id: "4",
-              title: "Gas Services & Emergency",
-              description: "Safe gas line installation, appliance hookups, and emergency plumbing response when you need it most.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/male-worker-operating-machinery-factory_107420-96043.jpg?_wi=1",
-              },
+              id: "4",              title: "Gas Services & Emergency",              description: "Safe gas line installation, appliance hookups, and emergency plumbing response when you need it most.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/male-worker-operating-machinery-factory_107420-96043.jpg"},
               items: [
                 { icon: Zap, text: "Gas Line Install" },
                 { icon: Flame, text: "Appliance Hookups" },
@@ -176,59 +156,23 @@ export default function HomePage() {
           description="Real feedback from homeowners who trust us with their plumbing and heating needs."
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              role: "Homeowner",
-              company: "Vancouver, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=1",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "1",              name: "Sarah Johnson",              role: "Homeowner",              company: "Vancouver, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
             {
-              id: "2",
-              name: "Michael Chen",
-              role: "Property Manager",
-              company: "Richmond, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=2",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "2",              name: "Michael Chen",              role: "Property Manager",              company: "Richmond, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
             {
-              id: "3",
-              name: "Emily Rodriguez",
-              role: "Business Owner",
-              company: "Burnaby, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=3",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "3",              name: "Emily Rodriguez",              role: "Business Owner",              company: "Burnaby, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
             {
-              id: "4",
-              name: "David Kim",
-              role: "Homeowner",
-              company: "Surrey, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=4",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "4",              name: "David Kim",              role: "Homeowner",              company: "Surrey, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
             {
-              id: "5",
-              name: "Jennifer Martinez",
-              role: "Office Manager",
-              company: "Coquitlam, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=5",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "5",              name: "Jennifer Martinez",              role: "Office Manager",              company: "Coquitlam, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
             {
-              id: "6",
-              name: "Robert Thompson",
-              role: "Homeowner",
-              company: "Langley, BC",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=6",
-              imageAlt: "customer portrait professional headshot person",
-            },
+              id: "6",              name: "Robert Thompson",              role: "Homeowner",              company: "Langley, BC",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg",              imageAlt: "customer portrait professional headshot person"},
           ]}
           gridVariant="uniform-all-items-equal"
           animationType="slide-up"
@@ -246,7 +190,7 @@ export default function HomePage() {
           tagIcon={PhoneCall}
           background={{ variant: "sparkles-gradient" }}
           useInvertedBackground={false}
-          imageSrc="http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg"
           mediaAnimation="slide-up"
           mediaPosition="right"
           inputPlaceholder="Enter your email"
@@ -258,13 +202,12 @@ export default function HomePage() {
 
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg"
           imageAlt="Plumbing and heating services"
           logoText="Westernish Plumbing & Heating"
           columns={[
             {
-              title: "Quick Links",
-              items: [
+              title: "Quick Links",              items: [
                 { label: "Home", href: "/" },
                 { label: "Services", href: "/services" },
                 { label: "Service Areas", href: "/service-areas" },
@@ -272,8 +215,7 @@ export default function HomePage() {
               ],
             },
             {
-              title: "Services",
-              items: [
+              title: "Services",              items: [
                 { label: "Plumbing", href: "/services" },
                 { label: "Heating", href: "/services" },
                 { label: "Hot Water Tanks", href: "/services" },
@@ -281,8 +223,7 @@ export default function HomePage() {
               ],
             },
             {
-              title: "Contact",
-              items: [
+              title: "Contact",              items: [
                 { label: "Call: (604) 368-5243", href: "tel:(604)368-5243" },
                 { label: "Email", href: "#" },
                 { label: "Request Quote", href: "/contact" },
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 33198dd..3617b13 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -6,7 +6,7 @@ import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatin
 import FeatureCardTen from "@/components/sections/feature/FeatureCardTen";
 import AboutMetric from "@/components/sections/about/AboutMetric";
 import FooterMedia from "@/components/sections/footer/FooterMedia";
-import { Award, Shield, Clock, CheckCircle, Droplets, Pipe, Wrench, Search, Zap, RefreshCw, Leaf, Flame, AlertTriangle, PhoneCall } from "lucide-react";
+import { Award, Shield, Clock, CheckCircle, Droplets, Wrench, Search, Zap, RefreshCw, Leaf, Flame, AlertTriangle, PhoneCall } from "lucide-react";
 
 export default function ServicesPage() {
   const navItems = [
@@ -35,9 +35,7 @@ export default function ServicesPage() {
           brandName="Westernish Plumbing"
           navItems={navItems}
           button={{
-            text: "Call Now",
-            href: "tel:(604)368-5243",
-          }}
+            text: "Call Now",            href: "tel:(604)368-5243"}}
           className="fixed top-4 left-4 right-4 z-50"
         />
       </div>
@@ -49,27 +47,19 @@ export default function ServicesPage() {
           tag="Services"
           features={[
             {
-              id: "1",
-              title: "Plumbing Services",
-              description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care. We diagnose problems quickly and provide lasting solutions.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=3",
-              },
+              id: "1",              title: "Plumbing Services",              description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care. We diagnose problems quickly and provide lasting solutions.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg"},
               items: [
                 { icon: Droplets, text: "Leak Repairs" },
-                { icon: Pipe, text: "Pipe Installation" },
+                { icon: Wrench, text: "Pipe Installation" },
                 { icon: Wrench, text: "Drain Repairs" },
                 { icon: Search, text: "Inspections" },
               ],
               reverse: false,
             },
             {
-              id: "2",
-              title: "Hot Water Tank Services",
-              description: "Professional installation, replacement, and repair of hot water tanks and tankless systems. We help you choose the right system for your home and budget.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg?_wi=2",
-              },
+              id: "2",              title: "Hot Water Tank Services",              description: "Professional installation, replacement, and repair of hot water tanks and tankless systems. We help you choose the right system for your home and budget.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg"},
               items: [
                 { icon: Zap, text: "Installation" },
                 { icon: RefreshCw, text: "Replacement" },
@@ -79,12 +69,8 @@ export default function ServicesPage() {
               reverse: true,
             },
             {
-              id: "3",
-              title: "Heating Services",
-              description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services. Emergency heating repairs available 24/7.",
-              media: {
-                imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg?_wi=2",
-              },
+              id: "3",              title: "Heating Services",              description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services. Emergency heating repairs available 24/7.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg"},
               items: [
                 { icon: Flame, text: "Furnace Installation" },
                 { icon: Wrench, text: "Boiler Repair" },
@@ -118,13 +104,12 @@ export default function ServicesPage() {
 
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg"
           imageAlt="Plumbing and heating services"
           logoText="Westernish Plumbing & Heating"
           columns={[
             {
-              title: "Quick Links",
-              items: [
+              title: "Quick Links",              items: [
                 { label: "Home", href: "/" },
                 { label: "Services", href: "/services" },
                 { label: "Service Areas", href: "/service-areas" },
@@ -132,8 +117,7 @@ export default function ServicesPage() {
               ],
             },
             {
-              title: "Services",
-              items: [
+              title: "Services",              items: [
                 { label: "Plumbing", href: "/services" },
                 { label: "Heating", href: "/services" },
                 { label: "Hot Water Tanks", href: "/services" },
@@ -141,8 +125,7 @@ export default function ServicesPage() {
               ],
             },
             {
-              title: "Contact",
-              items: [
+              title: "Contact",              items: [
                 { label: "Call: (604) 368-5243", href: "tel:(604)368-5243" },
                 { label: "Email", href: "#" },
                 { label: "Request Quote", href: "/contact" },