diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 39736fb..84c8ec0 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -34,9 +34,7 @@ export default function AboutPage() {
             { name: "FAQ", id: "faq" },
           ]}
           button={{
-            text: "Start Learning",
-            href: "/courses",
-          }}
+            text: "Start Learning",            href: "/courses"}}
           animateOnLoad={true}
         />
       </div>
@@ -50,17 +48,14 @@ export default function AboutPage() {
           description="We believe that mathematics is not just for the gifted few. Our platform transforms the way students learn math by providing interactive lessons, detailed explanations, and personalized learning paths. Whether you're struggling with basic arithmetic or preparing for advanced calculus, our expert-designed curriculum helps you build confidence and mastery."
           metrics={[
             {
-              value: "50,000+",
-              title: "Active Learners",
-            },
+              value: "50,000+",              title: "Active Learners"},
             {
-              value: "200+",
-              title: "Lessons & Exercises",
-            },
+              value: "200+",              title: "Lessons & Exercises"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png?_wi=3"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png"
           imageAlt="Interactive mathematics tools"
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
           useInvertedBackground={false}
         />
       </div>
@@ -74,27 +69,15 @@ export default function AboutPage() {
           tagIcon={CheckCircle}
           features={[
             {
-              id: "1",
-              title: "Interactive Problem Solving",
-              author: "Verified by educators",
-              description:
-                "Engage with real-time feedback as you solve problems step-by-step. Our AI-powered system identifies your learning gaps and provides targeted practice.",
-              tags: ["Learning", "Interactive"],
+              id: "1",              title: "Interactive Problem Solving",              author: "Verified by educators",              description:
+                "Engage with real-time feedback as you solve problems step-by-step. Our AI-powered system identifies your learning gaps and provides targeted practice.",              tags: ["Learning", "Interactive"],
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png?_wi=4",
-              imageAlt: "Interactive problem solving",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png",              imageAlt: "Interactive problem solving"},
             {
-              id: "2",
-              title: "Personalized Learning Paths",
-              author: "Designed for all levels",
-              description:
-                "Whether you're a beginner or advanced learner, our adaptive curriculum adjusts to your pace and style. Progress through topics at your own speed with comprehensive guidance.",
-              tags: ["Personalized", "Adaptive"],
+              id: "2",              title: "Personalized Learning Paths",              author: "Designed for all levels",              description:
+                "Whether you're a beginner or advanced learner, our adaptive curriculum adjusts to your pace and style. Progress through topics at your own speed with comprehensive guidance.",              tags: ["Personalized", "Adaptive"],
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png?_wi=3",
-              imageAlt: "Learning path customization",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png",              imageAlt: "Learning path customization"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -110,16 +93,10 @@ export default function AboutPage() {
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
-              value: "50,000+",
-              description:
-                "Active learners using our platform to master mathematics",
-            },
+              id: "1",              value: "50,000+",              description:
+                "Active learners using our platform to master mathematics"},
             {
-              id: "2",
-              value: "95%",
-              description: "Student satisfaction rate with improved performance",
-            },
+              id: "2",              value: "95%",              description: "Student satisfaction rate with improved performance"},
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={false}
@@ -131,13 +108,9 @@ export default function AboutPage() {
         <FooterLogoReveal
           logoText="MathMastery"
           leftLink={{
-            text: "Privacy Policy",
-            href: "#",
-          }}
+            text: "Privacy Policy",            href: "#"}}
           rightLink={{
-            text: "Terms of Service",
-            href: "#",
-          }}
+            text: "Terms of Service",            href: "#"}}
         />
       </div>
     </ThemeProvider>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7796292..5082d9a 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -40,9 +40,7 @@ export default function HomePage() {
           brandName="MathMastery"
           navItems={navItems}
           button={{
-            text: "Start Learning",
-            href: "/courses",
-          }}
+            text: "Start Learning",            href: "/courses"}}
           animateOnLoad={true}
         />
       </div>
@@ -57,23 +55,17 @@ export default function HomePage() {
           background={{ variant: "plain" }}
           buttons={[
             {
-              text: "Start Free Course",
-              href: "/courses",
-            },
+              text: "Start Free Course",              href: "/courses"},
             {
-              text: "Explore Curriculum",
-            },
+              text: "Explore Curriculum"},
           ]}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-beautiful-modern-mathematics-learning--1772946039181-86a634c0.png",
-              imageAlt: "Mathematics learning environment",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-beautiful-modern-mathematics-learning--1772946039181-86a634c0.png",              imageAlt: "Mathematics learning environment"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png?_wi=1",
-              imageAlt: "Learning platform interface",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png",              imageAlt: "Learning platform interface"},
           ]}
+          mediaAnimation="slide-up"
           rating={5}
           ratingText="Trusted by thousands of learners"
         />
@@ -88,17 +80,14 @@ export default function HomePage() {
           description="We believe that mathematics is not just for the gifted few. Our platform transforms the way students learn math by providing interactive lessons, detailed explanations, and personalized learning paths. Whether you're struggling with basic arithmetic or preparing for advanced calculus, our expert-designed curriculum helps you build confidence and mastery."
           metrics={[
             {
-              value: "50,000+",
-              title: "Active Learners",
-            },
+              value: "50,000+",              title: "Active Learners"},
             {
-              value: "200+",
-              title: "Lessons & Exercises",
-            },
+              value: "200+",              title: "Lessons & Exercises"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png?_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png"
           imageAlt="Interactive mathematics tools"
           mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
           useInvertedBackground={false}
         />
       </div>
@@ -112,23 +101,11 @@ export default function HomePage() {
           tagIcon={CheckCircle}
           features={[
             {
-              id: "1",
-              title: "Interactive Problem Solving",
-              author: "Verified by educators",
-              description: "Engage with real-time feedback as you solve problems step-by-step. Our AI-powered system identifies your learning gaps and provides targeted practice.",
-              tags: ["Learning", "Interactive"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png?_wi=2",
-              imageAlt: "Interactive problem solving",
-            },
+              id: "1",              title: "Interactive Problem Solving",              author: "Verified by educators",              description: "Engage with real-time feedback as you solve problems step-by-step. Our AI-powered system identifies your learning gaps and provides targeted practice.",              tags: ["Learning", "Interactive"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/interactive-mathematics-learning-tools-v-1772946039944-8c7b64d0.png",              imageAlt: "Interactive problem solving"},
             {
-              id: "2",
-              title: "Personalized Learning Paths",
-              author: "Designed for all levels",
-              description: "Whether you're a beginner or advanced learner, our adaptive curriculum adjusts to your pace and style. Progress through topics at your own speed with comprehensive guidance.",
-              tags: ["Personalized", "Adaptive"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png?_wi=2",
-              imageAlt: "Learning path customization",
-            },
+              id: "2",              title: "Personalized Learning Paths",              author: "Designed for all levels",              description: "Whether you're a beginner or advanced learner, our adaptive curriculum adjusts to your pace and style. Progress through topics at your own speed with comprehensive guidance.",              tags: ["Personalized", "Adaptive"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-screenshot-or-mockup-of-a-modern-mathe-1772946041721-f7ac2949.png",              imageAlt: "Learning path customization"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -145,29 +122,11 @@ export default function HomePage() {
           tagIcon={BookOpen}
           products={[
             {
-              id: "algebra",
-              name: "Algebra Fundamentals",
-              price: "Free",
-              variant: "Beginner • 24 Lessons",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-course-card-or-thumbnail-for-an-algebr-1772946038996-6e74196b.png?_wi=1",
-              imageAlt: "Algebra course",
-            },
+              id: "algebra",              name: "Algebra Fundamentals",              price: "Free",              variant: "Beginner • 24 Lessons",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-course-card-or-thumbnail-for-an-algebr-1772946038996-6e74196b.png",              imageAlt: "Algebra course"},
             {
-              id: "geometry",
-              name: "Geometry Essentials",
-              price: "Free",
-              variant: "Beginner • 20 Lessons",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-course-card-for-geometry-featuring-geo-1772946039410-53ee85cc.png?_wi=1",
-              imageAlt: "Geometry course",
-            },
+              id: "geometry",              name: "Geometry Essentials",              price: "Free",              variant: "Beginner • 20 Lessons",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-course-card-for-geometry-featuring-geo-1772946039410-53ee85cc.png",              imageAlt: "Geometry course"},
             {
-              id: "calculus",
-              name: "Calculus Advanced",
-              price: "Premium",
-              variant: "Advanced • 32 Lessons",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-calculus-course-card-showing-derivativ-1772946041446-7788440d.png?_wi=1",
-              imageAlt: "Calculus course",
-            },
+              id: "calculus",              name: "Calculus Advanced",              price: "Premium",              variant: "Advanced • 32 Lessons",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/a-calculus-course-card-showing-derivativ-1772946041446-7788440d.png",              imageAlt: "Calculus course"},
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -181,29 +140,13 @@ export default function HomePage() {
         <TestimonialCardTwelve
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-a-young-student-confident-an-1772946038377-79202c98.png?_wi=1",
-              imageAlt: "Sarah Johnson",
-            },
+              id: "1",              name: "Sarah Johnson",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-a-young-student-confident-an-1772946038377-79202c98.png",              imageAlt: "Sarah Johnson"},
             {
-              id: "2",
-              name: "Michael Chen",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-another-diverse-young-studen-1772946040031-8a0d09c5.png?_wi=1",
-              imageAlt: "Michael Chen",
-            },
+              id: "2",              name: "Michael Chen",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-another-diverse-young-studen-1772946040031-8a0d09c5.png",              imageAlt: "Michael Chen"},
             {
-              id: "3",
-              name: "Emily Rodriguez",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-a-third-student-with-diverse-1772946038932-5570ad22.png?_wi=1",
-              imageAlt: "Emily Rodriguez",
-            },
+              id: "3",              name: "Emily Rodriguez",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-a-third-student-with-diverse-1772946038932-5570ad22.png",              imageAlt: "Emily Rodriguez"},
             {
-              id: "4",
-              name: "David Kim",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-another-student-happy-and-su-1772946038750-da8f36d3.png?_wi=1",
-              imageAlt: "David Kim",
-            },
+              id: "4",              name: "David Kim",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AeH4ugdtMqy72pjayyaJFdLcKs/portrait-of-another-student-happy-and-su-1772946038750-da8f36d3.png",              imageAlt: "David Kim"},
           ]}
           cardTitle="Over 50,000 students have transformed their math skills"
           cardTag="See what they say"
@@ -221,15 +164,9 @@ export default function HomePage() {
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
-              value: "50,000+",
-              description: "Active learners using our platform to master mathematics",
-            },
+              id: "1",              value: "50,000+",              description: "Active learners using our platform to master mathematics"},
             {
-              id: "2",
-              value: "95%",
-              description: "Student satisfaction rate with improved performance",
-            },
+              id: "2",              value: "95%",              description: "Student satisfaction rate with improved performance"},
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={false}
@@ -245,25 +182,13 @@ export default function HomePage() {
           tagIcon={HelpCircle}
           faqs={[
             {
-              id: "1",
-              title: "Is MathMastery suitable for beginners?",
-              content: "Absolutely! MathMastery is designed for learners of all levels. Our courses start from basic arithmetic and progress to advanced calculus. Each lesson includes foundational concepts, so you can start anywhere based on your current knowledge.",
-            },
+              id: "1",              title: "Is MathMastery suitable for beginners?",              content: "Absolutely! MathMastery is designed for learners of all levels. Our courses start from basic arithmetic and progress to advanced calculus. Each lesson includes foundational concepts, so you can start anywhere based on your current knowledge."},
             {
-              id: "2",
-              title: "How do I track my progress?",
-              content: "Our platform provides detailed progress tracking. You can view your completed lessons, quiz scores, and performance analytics in your personal dashboard. This helps you identify areas for improvement and celebrate your achievements.",
-            },
+              id: "2",              title: "How do I track my progress?",              content: "Our platform provides detailed progress tracking. You can view your completed lessons, quiz scores, and performance analytics in your personal dashboard. This helps you identify areas for improvement and celebrate your achievements."},
             {
-              id: "3",
-              title: "Can I access courses on mobile?",
-              content: "Yes! MathMastery is fully responsive and works seamlessly on desktop, tablet, and mobile devices. Download our mobile app or use our web platform from any device.",
-            },
+              id: "3",              title: "Can I access courses on mobile?",              content: "Yes! MathMastery is fully responsive and works seamlessly on desktop, tablet, and mobile devices. Download our mobile app or use our web platform from any device."},
             {
-              id: "4",
-              title: "What if I need help understanding a concept?",
-              content: "Each lesson includes step-by-step explanations, video tutorials, and interactive examples. You can also access our community forum to ask questions and connect with other learners and instructors.",
-            },
+              id: "4",              title: "What if I need help understanding a concept?",              content: "Each lesson includes step-by-step explanations, video tutorials, and interactive examples. You can also access our community forum to ask questions and connect with other learners and instructors."},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -277,13 +202,9 @@ export default function HomePage() {
         <FooterLogoReveal
           logoText="MathMastery"
           leftLink={{
-            text: "Privacy Policy",
-            href: "#",
-          }}
+            text: "Privacy Policy",            href: "#"}}
           rightLink={{
-            text: "Terms of Service",
-            href: "#",
-          }}
+            text: "Terms of Service",            href: "#"}}
         />
       </div>
     </ThemeProvider>