diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index d52e870..4208496 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -19,8 +19,7 @@ export default function AboutPage() {
 
   const footerColumns = [
     {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Services", href: "/services" },
@@ -28,8 +27,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "Request a Part", href: "/request-part" },
         { label: "Contact Us", href: "/contact" },
         { label: "Directions", href: "#" },
@@ -37,8 +35,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Connect",
-      items: [
+      title: "Connect",      items: [
         { label: "Call: 060 914 1017", href: "tel:0609141017" },
         { label: "11 Sisulu St, Pretoria Central", href: "#" },
         { label: "Open 24/7", href: "#" },
@@ -64,9 +61,7 @@ export default function AboutPage() {
         <NavbarStyleCentered
           navItems={navItems}
           button={{
-            text: "Call Now: 060 914 1017",
-            href: "tel:0609141017",
-          }}
+            text: "Call Now: 060 914 1017",            href: "tel:0609141017"}}
           brandName="Tshwane Motor Spares"
         />
       </div>
@@ -81,10 +76,11 @@ export default function AboutPage() {
             { value: "10+", title: "Years of Service" },
             { value: "10K+", title: "Parts in Stock" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/happy-mechanic-greeting-with-his-african-american-coworker-auto-repair-shop_637285-11601.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/happy-mechanic-greeting-with-his-african-american-coworker-auto-repair-shop_637285-11601.jpg"
           imageAlt="Tshwane Motor Spares team members"
           useInvertedBackground={false}
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
         />
       </div>
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 221021e..d9df4ed 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -23,8 +23,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Services", href: "/services" },
@@ -32,8 +31,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "Request a Part", href: "/request-part" },
         { label: "Contact Us", href: "/contact" },
         { label: "Directions", href: "#" },
@@ -41,8 +39,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Connect",
-      items: [
+      title: "Connect",      items: [
         { label: "Call: 060 914 1017", href: "tel:0609141017" },
         { label: "11 Sisulu St, Pretoria Central", href: "#" },
         { label: "Open 24/7", href: "#" },
@@ -68,9 +65,7 @@ export default function HomePage() {
         <NavbarStyleCentered
           navItems={navItems}
           button={{
-            text: "Call Now: 060 914 1017",
-            href: "tel:0609141017",
-          }}
+            text: "Call Now: 060 914 1017",            href: "tel:0609141017"}}
           brandName="Tshwane Motor Spares"
         />
       </div>
@@ -114,28 +109,16 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Engine Parts",
-              description: "Pistons, gaskets, filters, spark plugs and complete engine components",
-              imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-machine-with-racks-pinions-factory_181624-60017.jpg?_wi=1",
-            },
+              title: "Engine Parts",              description: "Pistons, gaskets, filters, spark plugs and complete engine components",              imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-machine-with-racks-pinions-factory_181624-60017.jpg"},
             {
               id: 2,
-              title: "Brake Systems",
-              description: "Brake pads, rotors, cylinders and complete braking solutions",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-hard-disk-with-white-light_23-2149413361.jpg?_wi=1",
-            },
+              title: "Brake Systems",              description: "Brake pads, rotors, cylinders and complete braking solutions",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-hard-disk-with-white-light_23-2149413361.jpg"},
             {
               id: 3,
-              title: "Suspension Components",
-              description: "Shock absorbers, springs, bushings and steering components",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-car-tyre-break-disc_1170-1621.jpg?_wi=1",
-            },
+              title: "Suspension Components",              description: "Shock absorbers, springs, bushings and steering components",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-car-tyre-break-disc_1170-1621.jpg"},
             {
               id: 4,
-              title: "Filters & Oils",
-              description: "Oil, air, fuel filters and premium lubricants for all vehicles",
-              imageSrc: "http://img.b2bpic.net/free-photo/closeup-auto-repairman-checking-car-oil-workshop_637285-7638.jpg?_wi=1",
-            },
+              title: "Filters & Oils",              description: "Oil, air, fuel filters and premium lubricants for all vehicles",              imageSrc: "http://img.b2bpic.net/free-photo/closeup-auto-repairman-checking-car-oil-workshop_637285-7638.jpg"},
           ]}
           title="Our Product Range"
           description="Everything you need for your vehicle – one stop shop for all automotive needs"
@@ -155,10 +138,11 @@ export default function HomePage() {
             { value: "10K+", title: "Parts in Stock" },
             { value: "104", title: "Verified Reviews" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/happy-mechanic-greeting-with-his-african-american-coworker-auto-repair-shop_637285-11601.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/happy-mechanic-greeting-with-his-african-american-coworker-auto-repair-shop_637285-11601.jpg"
           imageAlt="Tshwane Motor Spares team helping customer"
           useInvertedBackground={false}
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
         />
       </div>
 
@@ -167,22 +151,13 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Call or Submit Your Request",
-              description: "Call us at 060 914 1017 or fill out our online part request form with details",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-woman-with-glasses-cafe_273609-3959.jpg?_wi=1",
-            },
+              title: "Call or Submit Your Request",              description: "Call us at 060 914 1017 or fill out our online part request form with details",              imageSrc: "http://img.b2bpic.net/free-photo/young-blonde-woman-with-glasses-cafe_273609-3959.jpg"},
             {
               id: 2,
-              title: "We Check Stock Immediately",
-              description: "Our team verifies availability and confirms your order within minutes",
-              imageSrc: "http://img.b2bpic.net/free-photo/warehouse-worker-mature-businessman-talking-while-going-through-paperwork-industrial-building_637285-4194.jpg?_wi=1",
-            },
+              title: "We Check Stock Immediately",              description: "Our team verifies availability and confirms your order within minutes",              imageSrc: "http://img.b2bpic.net/free-photo/warehouse-worker-mature-businessman-talking-while-going-through-paperwork-industrial-building_637285-4194.jpg"},
             {
               id: 3,
-              title: "Pick Up or Arrange Delivery",
-              description: "Collect from our store or we arrange delivery to your location",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-takeout-employee-delivering-boxes-pizza-building-driving-delivery-car_482257-134975.jpg?_wi=1",
-            },
+              title: "Pick Up or Arrange Delivery",              description: "Collect from our store or we arrange delivery to your location",              imageSrc: "http://img.b2bpic.net/free-photo/woman-takeout-employee-delivering-boxes-pizza-building-driving-delivery-car_482257-134975.jpg"},
           ]}
           title="Simple 3-Step Process"
           description="Get your auto parts fast and hassle-free"
@@ -196,37 +171,17 @@ export default function HomePage() {
         <TestimonialCardSixteen
           testimonials={[
             {
-              id: "1",
-              name: "Thabo Mthembu",
-              role: "Mechanic",
-              company: "Mthembu Auto Repairs",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=1",
-            },
+              id: "1",              name: "Thabo Mthembu",              role: "Mechanic",              company: "Mthembu Auto Repairs",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg"},
             {
-              id: "2",
-              name: "Sipho Dlamini",
-              role: "Fleet Manager",
-              company: "Pretoria Logistics",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=1",
-            },
+              id: "2",              name: "Sipho Dlamini",              role: "Fleet Manager",              company: "Pretoria Logistics",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg"},
             {
-              id: "3",
-              name: "Linda van der Merwe",
-              role: "Car Owner",
-              company: "Individual Customer",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg?_wi=1",
-            },
+              id: "3",              name: "Linda van der Merwe",              role: "Car Owner",              company: "Individual Customer",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg"},
             {
-              id: "4",
-              name: "Mpho Ndlela",
-              role: "Workshop Owner",
-              company: "Ndlela Workshop",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg?_wi=1",
-            },
+              id: "4",              name: "Mpho Ndlela",              role: "Workshop Owner",              company: "Ndlela Workshop",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg"},
           ]}
           kpiItems={[
             { value: "104+", label: "Happy Customers" },