diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index c3df0e6..915c6bf 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": "Services",
-    "href": "#services"
+    "name": "Services",    "href": "#services"
   },
   {
-    "name": "FAQ",
-    "href": "#faq"
+    "name": "FAQ",    "href": "#faq"
   },
   {
-    "name": "Contact",
-    "href": "#contact"
+    "name": "Contact",    "href": "#contact"
   },
   {
-    "name": "About",
-    "href": "#about"
+    "name": "About",    "href": "#about"
   },
   {
-    "name": "Bento Services",
-    "href": "#bento-services"
+    "name": "Bento Services",    "href": "#bento-services"
   },
   {
-    "name": "Metrics",
-    "href": "#metrics"
+    "name": "Metrics",    "href": "#metrics"
   }
 ];
 
@@ -43,10 +36,9 @@ export default function Layout() {
       <SectionErrorBoundary name="navbar">
         <NavbarFloatingLogo
       logo="ASC RVA"
+      logoImageSrc="http://img.b2bpic.net/free-photo/location-map-direction-left-side_187299-45689.jpg"
       ctaButton={{
-        text: "(804) 739-4094",
-        href: "tel:8047394094",
-      }}
+        text: "(804) 739-4094",        href: "tel:8047394094"}}
      navItems={navItems} />
       </SectionErrorBoundary>
       <main className="flex-grow">
@@ -56,33 +48,21 @@ export default function Layout() {
         <FooterBasic
       columns={[
         {
-          title: "Services",
-          items: [
+          title: "Services",          items: [
             {
-              label: "HVAC Repair",
-              href: "#",
-            },
+              label: "HVAC Repair",              href: "#"},
             {
-              label: "Plumbing",
-              href: "#",
-            },
+              label: "Plumbing",              href: "#"},
             {
-              label: "Maintenance Plans",
-              href: "#",
-            },
+              label: "Maintenance Plans",              href: "#"},
           ],
         },
         {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
             {
-              label: "About Us",
-              href: "#",
-            },
+              label: "About Us",              href: "#"},
             {
-              label: "Contact",
-              href: "#",
-            },
+              label: "Contact",              href: "#"},
           ],
         },
       ]}
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 9147dd7..370ee76 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -18,14 +18,13 @@ export default function HomePage() {
       title="American Service Company RVA - Your Trusted HVAC & Plumbing Experts"
       description="Providing dependable, licensed, and insured HVAC & plumbing services in Richmond. Same-day service, free quotes, and professional craftsmanship."
       primaryButton={{
-        text: "Schedule Service",
-        href: "tel:8047394094",
-      }}
+        text: "Schedule Service",        href: "tel:8047394094"}}
       secondaryButton={{
-        text: "Get Free Quote",
-        href: "#contact",
-      }}
+        text: "Get Free Quote",        href: "#contact"}}
       imageSrc="http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721535.jpg"
+      avatarsSrc={[]}
+      avatarText=""
+      names={[]}
     />
     </SectionErrorBoundary>
   </div>
@@ -49,23 +48,11 @@ export default function HomePage() {
       description="From heating and cooling to complex plumbing, we handle it all with a focus on longevity and performance."
       items={[
         {
-          title: "Cooling Systems",
-          description: "Expert A/C repair, maintenance, and installations to keep your home cool all summer long.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-heat-pump-outside-home_23-2149250253.jpg",
-          buttonIcon: "Zap",
-        },
+          title: "Cooling Systems",          description: "Expert A/C repair, maintenance, and installations to keep your home cool all summer long.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-heat-pump-outside-home_23-2149250253.jpg",          buttonIcon: "Zap"},
         {
-          title: "Plumbing Solutions",
-          description: "Pipe repair, leak detection, and faucet installations by master plumbers you can trust.",
-          imageSrc: "http://img.b2bpic.net/free-photo/water-tap-prevention-concentrated-man-leaning-water-faucet-touching-spout-pipe_259150-58276.jpg",
-          buttonIcon: "Droplets",
-        },
+          title: "Plumbing Solutions",          description: "Pipe repair, leak detection, and faucet installations by master plumbers you can trust.",          imageSrc: "http://img.b2bpic.net/free-photo/water-tap-prevention-concentrated-man-leaning-water-faucet-touching-spout-pipe_259150-58276.jpg",          buttonIcon: "Droplets"},
         {
-          title: "Water Heaters",
-          description: "Installation and repair of high-efficiency water heating systems for constant hot water access.",
-          imageSrc: "http://img.b2bpic.net/free-photo/worker-repairing-water-heater_23-2149334231.jpg",
-          buttonIcon: "Thermometer",
-        },
+          title: "Water Heaters",          description: "Installation and repair of high-efficiency water heating systems for constant hot water access.",          imageSrc: "http://img.b2bpic.net/free-photo/worker-repairing-water-heater_23-2149334231.jpg",          buttonIcon: "Thermometer"},
       ]}
     />
     </SectionErrorBoundary>
@@ -79,47 +66,19 @@ export default function HomePage() {
       description="From minor faucet repairs to comprehensive HVAC emergency setups, our professional service covers all home requirements."
       items={[
         {
-          title: "HVAC Maintenance",
-          description: "Expert care for your HVAC units.",
-          href: "#contact",
-          imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=bjauam",
-        },
+          title: "HVAC Maintenance",          description: "Expert care for your HVAC units.",          href: "#contact",          imageSrc: "https://storage.googleapis.com/webild/default/no-image.jpg?id=bjauam"},
         {
-          title: "Heating Systems",
-          description: "Boiler and furnace repairs and maintenance.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/adjusting-heating-valves-residential-building_169016-55768.jpg",
-        },
+          title: "Heating Systems",          description: "Boiler and furnace repairs and maintenance.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/adjusting-heating-valves-residential-building_169016-55768.jpg"},
         {
-          title: "Drain & Sewer",
-          description: "Comprehensive drain cleaning and sewer repair.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-view-camera-shutter_23-2150473154.jpg",
-        },
+          title: "Drain & Sewer",          description: "Comprehensive drain cleaning and sewer repair.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/3d-view-camera-shutter_23-2150473154.jpg"},
         {
-          title: "Plumbing Repairs",
-          description: "Expert toilet and pipe system plumbing repairs.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746312.jpg",
-        },
+          title: "Plumbing Repairs",          description: "Expert toilet and pipe system plumbing repairs.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746312.jpg"},
         {
-          title: "Garbage Disposal",
-          description: "Seamless garbage disposal installs and repairs.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-collecting-garbage-concept_23-2149181969.jpg",
-        },
+          title: "Garbage Disposal",          description: "Seamless garbage disposal installs and repairs.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-collecting-garbage-concept_23-2149181969.jpg"},
         {
-          title: "Air Purification",
-          description: "Iwave air purifying solutions for healthier air.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-young-girl-eating-cereals-with-fruits-from-bowl-sitting-couch-home_231208-636.jpg",
-        },
+          title: "Air Purification",          description: "Iwave air purifying solutions for healthier air.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/happy-young-girl-eating-cereals-with-fruits-from-bowl-sitting-couch-home_231208-636.jpg"},
         {
-          title: "24/7 Emergency",
-          description: "HVAC and plumbing emergencies handled instantly.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-builder-man-construction-uniform-cap-holding-wall-clock-hiding-his-face-it-peeking-surprised_141793-28506.jpg",
-        },
+          title: "24/7 Emergency",          description: "HVAC and plumbing emergencies handled instantly.",          href: "#contact",          imageSrc: "http://img.b2bpic.net/free-photo/young-builder-man-construction-uniform-cap-holding-wall-clock-hiding-his-face-it-peeking-surprised_141793-28506.jpg"},
       ]}
     />
     </SectionErrorBoundary>
@@ -133,20 +92,11 @@ export default function HomePage() {
       description="Your safety and comfort is our reputation."
       metrics={[
         {
-          icon: Award,
-          title: "Licensed & Insured",
-          value: "100%",
-        },
+          icon: "Award",          title: "Licensed & Insured",          value: "100%"},
         {
-          icon: Clock,
-          title: "Same Day Service",
-          value: "Fast",
-        },
+          icon: "Clock",          title: "Same Day Service",          value: "Fast"},
         {
-          icon: CheckCircle,
-          title: "Satisfied Customers",
-          value: "500+",
-        },
+          icon: "CheckCircle",          title: "Satisfied Customers",          value: "500+"},
       ]}
     />
     </SectionErrorBoundary>
@@ -160,17 +110,11 @@ export default function HomePage() {
       description="Quick answers to common questions about our services."
       items={[
         {
-          question: "Do you offer emergency service?",
-          answer: "Yes, we offer emergency HVAC and plumbing service for your peace of mind.",
-        },
+          question: "Do you offer emergency service?",          answer: "Yes, we offer emergency HVAC and plumbing service for your peace of mind."},
         {
-          question: "Are your quotes free?",
-          answer: "Absolutely. All our estimates and quotes for service are provided free of charge.",
-        },
+          question: "Are your quotes free?",          answer: "Absolutely. All our estimates and quotes for service are provided free of charge."},
         {
-          question: "What service areas do you cover?",
-          answer: "We proudly serve the entire Richmond (RVA) metro area and surrounding communities.",
-        },
+          question: "What service areas do you cover?",          answer: "We proudly serve the entire Richmond (RVA) metro area and surrounding communities."},
       ]}
     />
     </SectionErrorBoundary>
@@ -184,35 +128,15 @@ export default function HomePage() {
       description="Read about the quality service provided by our expert technicians."
       testimonials={[
         {
-          name: "Sarah Miller",
-          role: "Homeowner",
-          quote: "American Service Company RVA fixed my AC instantly. Highly recommended!",
-          imageSrc: "http://img.b2bpic.net/free-photo/technology-occupation-remote-work-concept-confident-young-female-copywriter-standing-kitchen_343059-3895.jpg",
-        },
+          name: "Sarah Miller",          role: "Homeowner",          quote: "American Service Company RVA fixed my AC instantly. Highly recommended!",          imageSrc: "http://img.b2bpic.net/free-photo/technology-occupation-remote-work-concept-confident-young-female-copywriter-standing-kitchen_343059-3895.jpg"},
         {
-          name: "James Doe",
-          role: "Homeowner",
-          quote: "Professional, clean, and fast. The best plumbing service I've found in RVA.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-doing-thumbs-up_23-2148628939.jpg",
-        },
+          name: "James Doe",          role: "Homeowner",          quote: "Professional, clean, and fast. The best plumbing service I've found in RVA.",          imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-doing-thumbs-up_23-2148628939.jpg"},
         {
-          name: "Alice Green",
-          role: "Client",
-          quote: "Reliable experts. They did a great job installing our new water heater.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-organizing-live-shop_23-2149947467.jpg",
-        },
+          name: "Alice Green",          role: "Client",          quote: "Reliable experts. They did a great job installing our new water heater.",          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-organizing-live-shop_23-2149947467.jpg"},
         {
-          name: "Mark Stevens",
-          role: "Client",
-          quote: "Excellent HVAC maintenance plan. Keeps our home running efficiently.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-listening-senior-man_1262-1970.jpg",
-        },
+          name: "Mark Stevens",          role: "Client",          quote: "Excellent HVAC maintenance plan. Keeps our home running efficiently.",          imageSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-listening-senior-man_1262-1970.jpg"},
         {
-          name: "Linda V.",
-          role: "Homeowner",
-          quote: "Honest, transparent and fast. Five stars for the service team!",
-          imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
-        },
+          name: "Linda V.",          role: "Homeowner",          quote: "Honest, transparent and fast. Five stars for the service team!",          imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg"},
       ]}
     />
     </SectionErrorBoundary>
@@ -224,13 +148,9 @@ export default function HomePage() {
       tag="Contact Us"
       text="Ready to get your home service needs addressed? Call us or book your free quote today."
       primaryButton={{
-        text: "(804) 739-4094",
-        href: "tel:8047394094",
-      }}
+        text: "(804) 739-4094",        href: "tel:8047394094"}}
       secondaryButton={{
-        text: "Book Service",
-        href: "#",
-      }}
+        text: "Book Service",        href: "#"}}
     />
     </SectionErrorBoundary>
   </div>