diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 68f3900..e1358df 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -8,32 +8,25 @@ import { StyleProvider } from "@/components/ui/StyleProvider";
 export default function Layout() {
   const navItems = [
   {
-    "name": "Home",
-    "href": "#hero"
+    "name": "Home",    "href": "#hero"
   },
   {
-    "name": "About",
-    "href": "#about"
+    "name": "About",    "href": "#about"
   },
   {
-    "name": "Classes",
-    "href": "#features"
+    "name": "Classes",    "href": "#features"
   },
   {
-    "name": "Plans",
-    "href": "#pricing"
+    "name": "Plans",    "href": "#pricing"
   },
   {
-    "name": "Contact",
-    "href": "#contact"
+    "name": "Contact",    "href": "#contact"
   },
   {
-    "name": "Metrics",
-    "href": "#metrics"
+    "name": "Metrics",    "href": "#metrics"
   },
   {
-    "name": "Team",
-    "href": "#team"
+    "name": "Team",    "href": "#team"
   }
 ];
 
@@ -43,10 +36,9 @@ export default function Layout() {
       <SectionErrorBoundary name="navbar">
         <NavbarFloatingLogo
       logo="Optimum Fitness"
+      logoImageSrc="https://images.pexels.com/photos/863993/pexels-photo-863993.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"
       ctaButton={{
-        text: "Join Now",
-        href: "#contact",
-      }}
+        text: "Join Now",        href: "#contact"}}
      navItems={navItems} />
       </SectionErrorBoundary>
       <main className="flex-grow">
@@ -57,44 +49,30 @@ export default function Layout() {
       brand="Optimum Fitness"
       columns={[
         {
-          title: "Location",
-          items: [
+          title: "Location",          items: [
             {
-              label: "B-69, North Nazimabad, Karachi",
-            },
+              label: "B-69, North Nazimabad, Karachi"},
             {
-              label: "Open Daily 6 AM - 11 PM",
-            },
+              label: "Open Daily 6 AM - 11 PM"},
           ],
         },
         {
-          title: "Services",
-          items: [
+          title: "Services",          items: [
             {
-              label: "Personal Training",
-              href: "#",
-            },
+              label: "Personal Training",              href: "#"},
             {
-              label: "Kickboxing",
-              href: "#",
-            },
+              label: "Kickboxing",              href: "#"},
             {
-              label: "Zumba",
-              href: "#",
-            },
+              label: "Zumba",              href: "#"},
           ],
         },
       ]}
       copyright="© 2024 Optimum Fitness. All rights reserved."
       links={[
         {
-          label: "Privacy",
-          href: "#",
-        },
+          label: "Privacy",          href: "#"},
         {
-          label: "Terms",
-          href: "#",
-        },
+          label: "Terms",          href: "#"},
       ]}
     />
       </SectionErrorBoundary>
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 1f1c871..7d3ee56 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -6,7 +6,7 @@ import MetricsSimpleCards from '@/components/sections/metrics/MetricsSimpleCards
 import PricingHighlightedCards from '@/components/sections/pricing/PricingHighlightedCards';
 import TeamGlassCards from '@/components/sections/team/TeamGlassCards';
 import TestimonialTrustCard from '@/components/sections/testimonial/TestimonialTrustCard';
-import { Award, Target } from "lucide-react";
+import { Dumbbell, Target, Award } from "lucide-react";
 import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 
 export default function HomePage() {
@@ -16,34 +16,17 @@ export default function HomePage() {
     <SectionErrorBoundary name="hero">
           <HeroCenteredLogos
       avatarsSrc={[
-        "https://images.pexels.com/photos/8611338/pexels-photo-8611338.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        "https://images.pexels.com/photos/8539228/pexels-photo-8539228.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        "https://images.pexels.com/photos/17956256/pexels-photo-17956256.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        "https://images.pexels.com/photos/8611298/pexels-photo-8611298.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        "https://images.pexels.com/photos/7551304/pexels-photo-7551304.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-      ]}
+        "https://images.pexels.com/photos/8611338/pexels-photo-8611338.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",        "https://images.pexels.com/photos/8539228/pexels-photo-8539228.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",        "https://images.pexels.com/photos/17956256/pexels-photo-17956256.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",        "https://images.pexels.com/photos/8611298/pexels-photo-8611298.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",        "https://images.pexels.com/photos/7551304/pexels-photo-7551304.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"]}
       avatarText="91+ 5-Star Reviews"
       title="Train Smarter. Perform Better."
       description="Experience elite fitness coaching, world-class training programs, and a community dedicated to helping you reach your goals."
       primaryButton={{
-        text: "Join Now",
-        href: "#contact",
-      }}
+        text: "Join Now",        href: "#contact"}}
       secondaryButton={{
-        text: "Start Free Trial",
-        href: "#contact",
-      }}
+        text: "Start Free Trial",        href: "#contact"}}
       names={[
-        "Strength",
-        "Zumba",
-        "Cycling",
-        "Nutrition",
-        "Kickboxing",
-        "Aerobics",
-      ]}
-      videoSrc="https://images.pexels.com/photos/669584/pexels-photo-669584.jpeg?auto=compress&cs=tinysrgb&h=650&w=940&_wi=1"
-      imageSrc="https://images.pexels.com/photos/8611338/pexels-photo-8611338.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"
-      imageAlt="happy gym member portrait"
+        "Strength",        "Zumba",        "Cycling",        "Nutrition",        "Kickboxing",        "Aerobics"]}
+      videoSrc="https://images.pexels.com/photos/669584/pexels-photo-669584.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"
     />
     </SectionErrorBoundary>
   </div>
@@ -64,56 +47,26 @@ export default function HomePage() {
       description="Elite classes designed for results."
       features={[
         {
-          title: "Personal Training",
-          description: "Custom one-on-one coaching for maximum results.",
-          bentoComponent: "tilted-stack-cards",
-          stackCards: [
+          title: "Personal Training",          description: "Custom one-on-one coaching for maximum results.",          bentoComponent: "tilted-stack-cards",          stackCards: [
             {
-              icon: Dumbbell,
-              title: "Precision",
-              subtitle: "Expertise",
-              detail: "Tailored plans",
-            },
+              icon: "Dumbbell",              title: "Precision",              subtitle: "Expertise",              detail: "Tailored plans"},
             {
-              icon: Target,
-              title: "Focus",
-              subtitle: "Goals",
-              detail: "Achieve targets",
-            },
+              icon: "Target",              title: "Focus",              subtitle: "Goals",              detail: "Achieve targets"},
             {
-              icon: Award,
-              title: "Elite",
-              subtitle: "Quality",
-              detail: "World class",
-            },
+              icon: "Award",              title: "Elite",              subtitle: "Quality",              detail: "World class"},
           ],
-          imageSrc: "https://images.pexels.com/photos/4720783/pexels-photo-4720783.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-          imageAlt: "gym workout video background",
         },
         {
-          title: "Kickboxing",
-          description: "Build strength and confidence.",
-          bentoComponent: "animated-bar-chart",
-          imageSrc: "https://images.pexels.com/photos/863993/pexels-photo-863993.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-          imageAlt: "gym workout video background",
-        },
+          title: "Kickboxing",          description: "Build strength and confidence.",          bentoComponent: "animated-bar-chart"},
         {
-          title: "Indoor Cycling",
-          description: "High-intensity cardiovascular burn.",
-          bentoComponent: "media-stack",
-          mediaItems: [
+          title: "Indoor Cycling",          description: "High-intensity cardiovascular burn.",          bentoComponent: "media-stack",          mediaItems: [
             {
-              imageSrc: "https://images.pexels.com/photos/669584/pexels-photo-669584.jpeg?auto=compress&cs=tinysrgb&h=650&w=940&_wi=2",
-            },
+              imageSrc: "https://images.pexels.com/photos/669584/pexels-photo-669584.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
             {
-              imageSrc: "https://images.pexels.com/photos/5384000/pexels-photo-5384000.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-            },
+              imageSrc: "https://images.pexels.com/photos/5384000/pexels-photo-5384000.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
             {
-              imageSrc: "https://images.pexels.com/photos/9602280/pexels-photo-9602280.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-            },
+              imageSrc: "https://images.pexels.com/photos/9602280/pexels-photo-9602280.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
           ],
-          imageSrc: "https://images.pexels.com/photos/9283337/pexels-photo-9283337.jpeg?auto=compress&cs=tinysrgb&h=650&w=940&_wi=1",
-          imageAlt: "gym workout video background",
         },
       ]}
     />
@@ -128,21 +81,13 @@ export default function HomePage() {
       description="Proven results for our community."
       metrics={[
         {
-          value: "500+",
-          description: "Active Members",
-        },
+          value: "500+",          description: "Active Members"},
         {
-          value: "200+",
-          description: "Transformations",
-        },
+          value: "200+",          description: "Transformations"},
         {
-          value: "15k+",
-          description: "Sessions Delivered",
-        },
+          value: "15k+",          description: "Sessions Delivered"},
         {
-          value: "98%",
-          description: "Client Satisfaction",
-        },
+          value: "98%",          description: "Client Satisfaction"},
       ]}
     />
     </SectionErrorBoundary>
@@ -156,46 +101,22 @@ export default function HomePage() {
       description="Choose the tier that fits your journey."
       plans={[
         {
-          tag: "Basic",
-          price: "PKR 5,000",
-          description: "Essential gym access.",
-          features: [
-            "Full Gym Access",
-            "Locker Room",
-          ],
+          tag: "Basic",          price: "PKR 5,000",          description: "Essential gym access.",          features: [
+            "Full Gym Access",            "Locker Room"],
           primaryButton: {
-            text: "Select",
-            href: "#contact",
-          },
+            text: "Select",            href: "#contact"},
         },
         {
-          tag: "Premium",
-          price: "PKR 8,500",
-          description: "Most popular option.",
-          features: [
-            "Gym Access",
-            "Group Classes",
-            "Assessments",
-          ],
-          highlight: "Best Value",
-          primaryButton: {
-            text: "Select",
-            href: "#contact",
-          },
+          tag: "Premium",          price: "PKR 8,500",          description: "Most popular option.",          features: [
+            "Gym Access",            "Group Classes",            "Assessments"],
+          highlight: "Best Value",          primaryButton: {
+            text: "Select",            href: "#contact"},
         },
         {
-          tag: "Elite",
-          price: "PKR 15,000",
-          description: "Complete elite coaching.",
-          features: [
-            "Personal Training",
-            "Nutrition Plan",
-            "Tracking",
-          ],
+          tag: "Elite",          price: "PKR 15,000",          description: "Complete elite coaching.",          features: [
+            "Personal Training",            "Nutrition Plan",            "Tracking"],
           primaryButton: {
-            text: "Select",
-            href: "#contact",
-          },
+            text: "Select",            href: "#contact"},
         },
       ]}
     />
@@ -210,20 +131,11 @@ export default function HomePage() {
       description="World-class team at North Nazimabad."
       members={[
         {
-          name: "Coach Ahmed",
-          role: "Lead Trainer",
-          imageSrc: "https://images.pexels.com/photos/9283337/pexels-photo-9283337.jpeg?auto=compress&cs=tinysrgb&h=650&w=940&_wi=2",
-        },
+          name: "Coach Ahmed",          role: "Lead Trainer",          imageSrc: "https://images.pexels.com/photos/9283337/pexels-photo-9283337.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Coach Sara",
-          role: "Kickboxing Pro",
-          imageSrc: "https://images.pexels.com/photos/6455771/pexels-photo-6455771.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Coach Sara",          role: "Kickboxing Pro",          imageSrc: "https://images.pexels.com/photos/6455771/pexels-photo-6455771.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Coach David",
-          role: "Nutrition Expert",
-          imageSrc: "https://images.pexels.com/photos/14082250/pexels-photo-14082250.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Coach David",          role: "Nutrition Expert",          imageSrc: "https://images.pexels.com/photos/14082250/pexels-photo-14082250.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
       ]}
     />
     </SectionErrorBoundary>
@@ -237,25 +149,15 @@ export default function HomePage() {
       author="Faisal Khan"
       avatars={[
         {
-          name: "Faisal K.",
-          imageSrc: "https://images.pexels.com/photos/8554983/pexels-photo-8554983.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Faisal K.",          imageSrc: "https://images.pexels.com/photos/8554983/pexels-photo-8554983.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Ayesha B.",
-          imageSrc: "https://images.pexels.com/photos/12833353/pexels-photo-12833353.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Ayesha B.",          imageSrc: "https://images.pexels.com/photos/12833353/pexels-photo-12833353.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Kamran S.",
-          imageSrc: "https://images.pexels.com/photos/32798083/pexels-photo-32798083.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Kamran S.",          imageSrc: "https://images.pexels.com/photos/32798083/pexels-photo-32798083.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Zohaib R.",
-          imageSrc: "https://images.pexels.com/photos/20418607/pexels-photo-20418607.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Zohaib R.",          imageSrc: "https://images.pexels.com/photos/20418607/pexels-photo-20418607.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
         {
-          name: "Sana Q.",
-          imageSrc: "https://images.pexels.com/photos/16216729/pexels-photo-16216729.jpeg?auto=compress&cs=tinysrgb&h=650&w=940",
-        },
+          name: "Sana Q.",          imageSrc: "https://images.pexels.com/photos/16216729/pexels-photo-16216729.jpeg?auto=compress&cs=tinysrgb&h=650&w=940"},
       ]}
     />
     </SectionErrorBoundary>
@@ -267,13 +169,9 @@ export default function HomePage() {
       tag="Start Today"
       text="Get your Free Fitness Consultation and Goal Assessment."
       primaryButton={{
-        text: "Book Now",
-        href: "https://wa.me/923360222340",
-      }}
+        text: "Book Now",        href: "https://wa.me/923360222340"}}
       secondaryButton={{
-        text: "Call Us",
-        href: "tel:03360222340",
-      }}
+        text: "Call Us",        href: "tel:03360222340"}}
     />
     </SectionErrorBoundary>
   </div>