diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 06a6155..d66356a 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -17,8 +17,7 @@ export default function AboutPage() {
 
   const footerColumns = [
     {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Our Pets", href: "/pets" },
@@ -26,8 +25,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Adopt",
-      items: [
+      title: "Adopt",      items: [
         { label: "Browse Pets", href: "/pets" },
         { label: "Adoption Process", href: "#" },
         { label: "FAQs", href: "#" },
@@ -35,8 +33,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Support",
-      items: [
+      title: "Support",      items: [
         { label: "Donate", href: "#" },
         { label: "Volunteer", href: "#" },
         { label: "Sponsorship", href: "#" },
@@ -66,9 +63,7 @@ export default function AboutPage() {
             id: item.id,
           }))}
           button={{
-            text: "Adopt Now",
-            href: "/pets",
-          }}
+            text: "Adopt Now",            href: "/pets"}}
         />
       </div>
 
@@ -82,10 +77,11 @@ export default function AboutPage() {
             { value: "15+", title: "Years of Service" },
             { value: "2,000+", title: "Lives Transformed" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg?_wi=3"
+          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg"
           imageAlt="Shelter team caring for animals"
           useInvertedBackground={false}
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
         />
       </div>
 
@@ -96,38 +92,11 @@ export default function AboutPage() {
           tag="Our Team"
           testimonials={[
             {
-              id: "1",
-              name: "Dr. Sarah Mitchell, Executive Director",
-              date: "Date: Since 2010",
-              title: "Founded with a passion for animal welfare",
-              quote: "We started PawsHaven because we believed every animal deserves a second chance. Over the years, seeing families reunited with their perfect companions has been the greatest reward we could ask for.",
-              tag: "Founder",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              avatarAlt: "Dr. Sarah Mitchell",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg?_wi=2",
-            },
+              id: "1",              name: "Dr. Sarah Mitchell, Executive Director",              date: "Date: Since 2010",              title: "Founded with a passion for animal welfare",              quote: "We started PawsHaven because we believed every animal deserves a second chance. Over the years, seeing families reunited with their perfect companions has been the greatest reward we could ask for.",              tag: "Founder",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              avatarAlt: "Dr. Sarah Mitchell",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg"},
             {
-              id: "2",
-              name: "Marcus Johnson, Head of Veterinary Care",
-              date: "Date: 12 Years",
-              title: "Dedicated to animal health and wellness",
-              quote: "My role is ensuring every animal receives the best medical care possible. From routine checkups to emergency interventions, we're here 24/7 to keep our animals healthy and ready for their new homes.",
-              tag: "Veterinarian",
-              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",
-              avatarAlt: "Marcus Johnson",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg?_wi=2",
-            },
+              id: "2",              name: "Marcus Johnson, Head of Veterinary Care",              date: "Date: 12 Years",              title: "Dedicated to animal health and wellness",              quote: "My role is ensuring every animal receives the best medical care possible. From routine checkups to emergency interventions, we're here 24/7 to keep our animals healthy and ready for their new homes.",              tag: "Veterinarian",              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",              avatarAlt: "Marcus Johnson",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg"},
             {
-              id: "3",
-              name: "Rebecca Torres, Adoption Counselor",
-              date: "Date: 8 Years",
-              title: "Making perfect matches every day",
-              quote: "There's nothing more fulfilling than connecting the right pet with the right family. I take pride in ensuring every adoption is a success story that will last a lifetime.",
-              tag: "Adoption Specialist",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              avatarAlt: "Rebecca Torres",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-woman-leaning-dog-green-grass_23-2147902026.jpg?_wi=2",
-            },
+              id: "3",              name: "Rebecca Torres, Adoption Counselor",              date: "Date: 8 Years",              title: "Making perfect matches every day",              quote: "There's nothing more fulfilling than connecting the right pet with the right family. I take pride in ensuring every adoption is a success story that will last a lifetime.",              tag: "Adoption Specialist",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              avatarAlt: "Rebecca Torres",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-woman-leaning-dog-green-grass_23-2147902026.jpg"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -136,7 +105,7 @@ export default function AboutPage() {
 
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/young-hispanic-couple-doing-laundry-with-dogs-doing-heart-shape-with-hand-fingers-smiling-looking-through-sign_839833-10678.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/young-hispanic-couple-doing-laundry-with-dogs-doing-heart-shape-with-hand-fingers-smiling-looking-through-sign_839833-10678.jpg"
           imageAlt="Happy pets playing"
           logoText="PawsHaven"
           copyrightText="© 2025 PawsHaven Animal Shelter. All rights reserved."
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4629ebf..4e95adf 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -21,8 +21,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Our Pets", href: "/pets" },
@@ -30,8 +29,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Adopt",
-      items: [
+      title: "Adopt",      items: [
         { label: "Browse Pets", href: "/pets" },
         { label: "Adoption Process", href: "#" },
         { label: "FAQs", href: "#" },
@@ -39,8 +37,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Support",
-      items: [
+      title: "Support",      items: [
         { label: "Donate", href: "#" },
         { label: "Volunteer", href: "#" },
         { label: "Sponsorship", href: "#" },
@@ -70,9 +67,7 @@ export default function HomePage() {
             id: item.id,
           }))}
           button={{
-            text: "Adopt Now",
-            href: "/pets",
-          }}
+            text: "Adopt Now",            href: "/pets"}}
         />
       </div>
 
@@ -84,7 +79,7 @@ export default function HomePage() {
             { text: "Browse Pets", href: "/pets" },
             { text: "Learn More", href: "/about" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg"
           imageAlt="Happy pets in shelter"
           showDimOverlay={true}
         />
@@ -100,10 +95,11 @@ export default function HomePage() {
             { value: "2,000+", title: "Pets Adopted" },
             { value: "95%", title: "Success Rate" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/smiley-woman-playing-with-cute-dog-up-adoption_23-2148682991.jpg"
           imageAlt="Shelter team caring for animals"
           useInvertedBackground={false}
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
         />
       </div>
 
@@ -114,33 +110,13 @@ export default function HomePage() {
           tag="Featured Pets"
           products={[
             {
-              id: "1",
-              name: "Max - Golden Retriever",
-              price: "Adoption Fee: $150",
-              imageSrc: "http://img.b2bpic.net/free-photo/what-good-boy-beautiful-golden-labrador-with-leash-sitting-with-his-owners-park_496169-2472.jpg?_wi=1",
-              imageAlt: "Max, friendly golden retriever",
-            },
+              id: "1",              name: "Max - Golden Retriever",              price: "Adoption Fee: $150",              imageSrc: "http://img.b2bpic.net/free-photo/what-good-boy-beautiful-golden-labrador-with-leash-sitting-with-his-owners-park_496169-2472.jpg",              imageAlt: "Max, friendly golden retriever"},
             {
-              id: "2",
-              name: "Luna - Tabby Cat",
-              price: "Adoption Fee: $75",
-              imageSrc: "http://img.b2bpic.net/free-photo/two-red-kittens_1385-3097.jpg?_wi=1",
-              imageAlt: "Luna, orange tabby cat",
-            },
+              id: "2",              name: "Luna - Tabby Cat",              price: "Adoption Fee: $75",              imageSrc: "http://img.b2bpic.net/free-photo/two-red-kittens_1385-3097.jpg",              imageAlt: "Luna, orange tabby cat"},
             {
-              id: "3",
-              name: "Charlie - Beagle Mix",
-              price: "Adoption Fee: $120",
-              imageSrc: "http://img.b2bpic.net/free-photo/cute-beagle-portrait_1385-382.jpg?_wi=1",
-              imageAlt: "Charlie, playful beagle mix",
-            },
+              id: "3",              name: "Charlie - Beagle Mix",              price: "Adoption Fee: $120",              imageSrc: "http://img.b2bpic.net/free-photo/cute-beagle-portrait_1385-382.jpg",              imageAlt: "Charlie, playful beagle mix"},
             {
-              id: "4",
-              name: "Whiskers - Siamese Cat",
-              price: "Adoption Fee: $85",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-two-identical-siamese-cats_158595-5728.jpg?_wi=1",
-              imageAlt: "Whiskers, elegant siamese cat",
-            },
+              id: "4",              name: "Whiskers - Siamese Cat",              price: "Adoption Fee: $85",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-two-identical-siamese-cats_158595-5728.jpg",              imageAlt: "Whiskers, elegant siamese cat"},
           ]}
           gridVariant="uniform-all-items-equal"
           animationType="slide-up"
@@ -174,71 +150,17 @@ export default function HomePage() {
           tag="Success Stories"
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Martinez, Mom of Max",
-              date: "Date: 15 January 2025",
-              title: "Max changed our lives!",
-              quote: "We adopted Max six months ago and he's brought so much joy to our family. The entire adoption process was smooth, and the staff made sure we were the right fit. We couldn't imagine life without him now!",
-              tag: "Dog Adoption",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              avatarAlt: "Sarah Martinez",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg?_wi=1",
-            },
+              id: "1",              name: "Sarah Martinez, Mom of Max",              date: "Date: 15 January 2025",              title: "Max changed our lives!",              quote: "We adopted Max six months ago and he's brought so much joy to our family. The entire adoption process was smooth, and the staff made sure we were the right fit. We couldn't imagine life without him now!",              tag: "Dog Adoption",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              avatarAlt: "Sarah Martinez",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg"},
             {
-              id: "2",
-              name: "James Chen, Cat Lover",
-              date: "Date: 8 December 2024",
-              title: "Luna is purr-fect!",
-              quote: "I was nervous about adopting, but the team at PawsHaven guided me through everything. Luna is the sweetest companion, and I'm so grateful for their incredible work in rescue.",
-              tag: "Cat Adoption",
-              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",
-              avatarAlt: "James Chen",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-with-her-lovely-tabby-cat-park_23-2148045683.jpg?_wi=1",
-            },
+              id: "2",              name: "James Chen, Cat Lover",              date: "Date: 8 December 2024",              title: "Luna is purr-fect!",              quote: "I was nervous about adopting, but the team at PawsHaven guided me through everything. Luna is the sweetest companion, and I'm so grateful for their incredible work in rescue.",              tag: "Cat Adoption",              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",              avatarAlt: "James Chen",              imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-with-her-lovely-tabby-cat-park_23-2148045683.jpg"},
             {
-              id: "3",
-              name: "Emily Rodriguez, Dog Parent",
-              date: "Date: 2 November 2024",
-              title: "Charlie brings happiness daily",
-              quote: "Charlie was shy at first, but with patience and love, he's blossomed into the most affectionate little guy. PawsHaven's follow-up support made all the difference in his transition.",
-              tag: "Dog Adoption",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              avatarAlt: "Emily Rodriguez",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-woman-leaning-dog-green-grass_23-2147902026.jpg?_wi=1",
-            },
+              id: "3",              name: "Emily Rodriguez, Dog Parent",              date: "Date: 2 November 2024",              title: "Charlie brings happiness daily",              quote: "Charlie was shy at first, but with patience and love, he's blossomed into the most affectionate little guy. PawsHaven's follow-up support made all the difference in his transition.",              tag: "Dog Adoption",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              avatarAlt: "Emily Rodriguez",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-woman-leaning-dog-green-grass_23-2147902026.jpg"},
             {
-              id: "4",
-              name: "Michael Wong, Animal Advocate",
-              date: "Date: 25 September 2024",
-              title: "Amazing organization, amazing people",
-              quote: "I've volunteered at PawsHaven for three years now, and the passion of this team is unmatched. We're truly making a difference in these animals' lives every single day.",
-              tag: "Volunteer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",
-              avatarAlt: "Michael Wong",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg?_wi=1",
-            },
+              id: "4",              name: "Michael Wong, Animal Advocate",              date: "Date: 25 September 2024",              title: "Amazing organization, amazing people",              quote: "I've volunteered at PawsHaven for three years now, and the passion of this team is unmatched. We're truly making a difference in these animals' lives every single day.",              tag: "Volunteer",              avatarSrc: "http://img.b2bpic.net/free-photo/happy-businessman-smiling-camera_1163-4660.jpg",              avatarAlt: "Michael Wong",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg"},
             {
-              id: "5",
-              name: "Lisa Thompson, New Pet Parent",
-              date: "Date: 12 August 2024",
-              title: "Dreams do come true",
-              quote: "Finding Whiskers was like fate. The adoption counselors took time to understand what I needed, and the match was perfect. Thank you, PawsHaven, for making my dreams come true!",
-              tag: "Cat Adoption",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              avatarAlt: "Lisa Thompson",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-with-her-lovely-tabby-cat-park_23-2148045683.jpg?_wi=2",
-            },
+              id: "5",              name: "Lisa Thompson, New Pet Parent",              date: "Date: 12 August 2024",              title: "Dreams do come true",              quote: "Finding Whiskers was like fate. The adoption counselors took time to understand what I needed, and the match was perfect. Thank you, PawsHaven, for making my dreams come true!",              tag: "Cat Adoption",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              avatarAlt: "Lisa Thompson",              imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-with-her-lovely-tabby-cat-park_23-2148045683.jpg"},
             {
-              id: "6",
-              name: "David & Karen Lee, Family",
-              date: "Date: 3 July 2024",
-              title: "Best decision ever",
-              quote: "We adopted two cats and a dog from PawsHaven, and they're all best friends now! The entire staff is professional, caring, and genuinely passionate about helping animals find homes.",
-              tag: "Multiple Adoptions",
-              avatarSrc: "http://img.b2bpic.net/free-photo/self-portrait-cheerful-modern-couple-love_1262-12888.jpg",
-              avatarAlt: "David and Karen Lee",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-parents-their-small-daughter-enjoying-with-dog-home-grandparents-are-standing-background_637285-5542.jpg",
-            },
+              id: "6",              name: "David & Karen Lee, Family",              date: "Date: 3 July 2024",              title: "Best decision ever",              quote: "We adopted two cats and a dog from PawsHaven, and they're all best friends now! The entire staff is professional, caring, and genuinely passionate about helping animals find homes.",              tag: "Multiple Adoptions",              avatarSrc: "http://img.b2bpic.net/free-photo/self-portrait-cheerful-modern-couple-love_1262-12888.jpg",              avatarAlt: "David and Karen Lee",              imageSrc: "http://img.b2bpic.net/free-photo/young-parents-their-small-daughter-enjoying-with-dog-home-grandparents-are-standing-background_637285-5542.jpg"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -261,7 +183,7 @@ export default function HomePage() {
 
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="http://img.b2bpic.net/free-photo/young-hispanic-couple-doing-laundry-with-dogs-doing-heart-shape-with-hand-fingers-smiling-looking-through-sign_839833-10678.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/young-hispanic-couple-doing-laundry-with-dogs-doing-heart-shape-with-hand-fingers-smiling-looking-through-sign_839833-10678.jpg"
           imageAlt="Happy pets playing"
           logoText="PawsHaven"
           copyrightText="© 2025 PawsHaven Animal Shelter. All rights reserved."