diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 841e7f0..3dac172 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -20,9 +20,7 @@ export default function AboutPage() {
   ];
 
   const navButton = {
-    text: "📞 +420 777 038 440",
-    href: "tel:+420777038440",
-  };
+    text: "📞 +420 777 038 440",    href: "tel:+420777038440"};
 
   return (
     <ThemeProvider
@@ -55,7 +53,7 @@ export default function AboutPage() {
           tagIcon={Heart}
           tagAnimation="slide-up"
           background={{ variant: "radial-gradient" }}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qhz9is&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qhz9is"
           imageAlt="Milan Pražan XtremeBikes Owner"
           mediaAnimation="blur-reveal"
           className="min-h-screen"
@@ -69,20 +67,12 @@ export default function AboutPage() {
         <TextSplitAbout
           title="The XtremeBikes Story"
           description={[
-            "Milan Pražan founded XtremeBikes with a simple mission: provide expert, honest motorcycle repair and restoration services to the local community. With over 20 years of hands-on experience working on motorcycles and scooters, Milan has built a reputation for precision craftsmanship and customer care.",
-            "What started as a small workshop has grown into a full-service facility equipped with professional welding equipment, diagnostic tools, and an extensive inventory of parts and motorcycles. Milan's passion for motorcycles is evident in every project—whether it's a routine oil change or a complete ground-up restoration.",
-            "Today, XtremeBikes is known throughout South Bohemia as the go-to shop for serious motorcycle work. We don't rush jobs, we don't compromise on quality, and we always put the customer first.",
-            "Visit us at Husova 909, Planá nad Lužnicí, or call +420 777 038 440 to learn more.",
-          ]}
+            "Milan Pražan founded XtremeBikes with a simple mission: provide expert, honest motorcycle repair and restoration services to the local community. With over 20 years of hands-on experience working on motorcycles and scooters, Milan has built a reputation for precision craftsmanship and customer care.",            "What started as a small workshop has grown into a full-service facility equipped with professional welding equipment, diagnostic tools, and an extensive inventory of parts and motorcycles. Milan's passion for motorcycles is evident in every project—whether it's a routine oil change or a complete ground-up restoration.",            "Today, XtremeBikes is known throughout South Bohemia as the go-to shop for serious motorcycle work. We don't rush jobs, we don't compromise on quality, and we always put the customer first.",            "Visit us at Husova 909, Planá nad Lužnicí, or call +420 777 038 440 to learn more."]}
           buttons={[
             {
-              text: "📞 Get in Touch",
-              href: "tel:+420777038440",
-            },
+              text: "📞 Get in Touch",              href: "tel:+420777038440"},
             {
-              text: "Visit Workshop",
-              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí",
-            },
+              text: "Visit Workshop",              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí"},
           ]}
           buttonAnimation="slide-up"
           useInvertedBackground={false}
@@ -107,32 +97,14 @@ export default function AboutPage() {
           animationType="blur-reveal"
           members={[
             {
-              id: "member-1",
-              name: "Milan Pražan",
-              role: "Owner & Master Technician",
-              description: "20+ years of motorcycle repair expertise. Specializes in restoration and welding work.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qhz9is&_wi=2",
-              imageAlt: "Milan Pražan",
-            },
+              id: "member-1",              name: "Milan Pražan",              role: "Owner & Master Technician",              description: "20+ years of motorcycle repair expertise. Specializes in restoration and welding work.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qhz9is",              imageAlt: "Milan Pražan"},
             {
-              id: "member-2",
-              name: "Technical Specialist",
-              role: "Certified Mechanic",
-              description: "Expert in engine diagnostics and repair. Handles complex mechanical challenges.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nzurog&_wi=2",
-              imageAlt: "Technical Specialist",
-            },
+              id: "member-2",              name: "Technical Specialist",              role: "Certified Mechanic",              description: "Expert in engine diagnostics and repair. Handles complex mechanical challenges.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nzurog",              imageAlt: "Technical Specialist"},
             {
-              id: "member-3",
-              name: "Welding Expert",
-              role: "Metal Fabricator",
-              description: "Professional aluminum wheel welding and non-ferrous metal work specialist.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=l6666r",
-              imageAlt: "Welding Expert",
-            },
+              id: "member-3",              name: "Welding Expert",              role: "Metal Fabricator",              description: "Professional aluminum wheel welding and non-ferrous metal work specialist.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=l6666r",              imageAlt: "Welding Expert"},
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -149,29 +121,14 @@ export default function AboutPage() {
           animationType="opacity"
           metrics={[
             {
-              id: "metric-1",
-              category: "Address",
-              title: "Workshop Location",
-              subtitle: "Husova 909",
-              value: "Planá nad Lužnicí",
-            },
+              id: "metric-1",              category: "Address",              title: "Workshop Location",              subtitle: "Husova 909",              value: "Planá nad Lužnicí"},
             {
-              id: "metric-2",
-              category: "Phone",
-              title: "Call Us",
-              subtitle: "+420 777 038 440",
-              value: "Available Daily",
-            },
+              id: "metric-2",              category: "Phone",              title: "Call Us",              subtitle: "+420 777 038 440",              value: "Available Daily"},
             {
-              id: "metric-3",
-              category: "Region",
-              title: "Service Area",
-              subtitle: "South Bohemia",
-              value: "South Tábor Region",
-            },
+              id: "metric-3",              category: "Region",              title: "Service Area",              subtitle: "South Bohemia",              value: "South Tábor Region"},
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -183,14 +140,10 @@ export default function AboutPage() {
           socialLinks={[
             {
               icon: MapPin,
-              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí",
-              ariaLabel: "Visit us on Google Maps",
-            },
+              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí",              ariaLabel: "Visit us on Google Maps"},
             {
               icon: Phone,
-              href: "tel:+420777038440",
-              ariaLabel: "Call XtremeBikes",
-            },
+              href: "tel:+420777038440",              ariaLabel: "Call XtremeBikes"},
           ]}
           containerClassName="bg-card border-t border-accent/30"
         />
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 49f7ee4..fd6bb47 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -36,9 +36,7 @@ export default function ContactPage() {
           navItems={navItems}
           brandName="XtremeBikes"
           button={{
-            text: "📞 +420 777 038 440",
-            href: "tel:+420777038440",
-          }}
+            text: "📞 +420 777 038 440",            href: "tel:+420777038440"}}
         />
       </div>
 
@@ -52,11 +50,9 @@ export default function ContactPage() {
           background={{ variant: "radial-gradient" }}
           buttons={[
             {
-              text: "📞 Call Now",
-              href: "tel:+420777038440",
-            },
+              text: "📞 Call Now",              href: "tel:+420777038440"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uzc2cb&_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uzc2cb"
           imageAlt="XtremeBikes Workshop Contact"
           mediaAnimation="blur-reveal"
           className="min-h-screen"
@@ -75,9 +71,7 @@ export default function ContactPage() {
           description="Fill out the form below and we'll respond as quickly as possible. For urgent issues, call directly at +420 777 038 440."
           buttons={[
             {
-              text: "📞 Call Instead",
-              href: "tel:+420777038440",
-            },
+              text: "📞 Call Instead",              href: "tel:+420777038440"},
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "plain" }}
@@ -99,29 +93,14 @@ export default function ContactPage() {
           animationType="opacity"
           metrics={[
             {
-              id: "info-1",
-              category: "Address",
-              title: "Husova 909",
-              subtitle: "Planá nad Lužnicí",
-              value: "39111 Czech Republic",
-            },
+              id: "info-1",              category: "Address",              title: "Husova 909",              subtitle: "Planá nad Lužnicí",              value: "39111 Czech Republic"},
             {
-              id: "info-2",
-              category: "Phone",
-              title: "+420 777 038 440",
-              subtitle: "Direct Line",
-              value: "Call Anytime",
-            },
+              id: "info-2",              category: "Phone",              title: "+420 777 038 440",              subtitle: "Direct Line",              value: "Call Anytime"},
             {
-              id: "info-3",
-              category: "Hours",
-              title: "Monday - Friday",
-              subtitle: "8:00 - 18:00",
-              value: "Saturday by Appointment",
-            },
+              id: "info-3",              category: "Hours",              title: "Monday - Friday",              subtitle: "8:00 - 18:00",              value: "Saturday by Appointment"},
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -132,14 +111,10 @@ export default function ContactPage() {
           socialLinks={[
             {
               icon: Phone,
-              href: "tel:+420777038440",
-              ariaLabel: "Call XtremeBikes",
-            },
+              href: "tel:+420777038440",              ariaLabel: "Call XtremeBikes"},
             {
               icon: MapPin,
-              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí",
-              ariaLabel: "Google Maps Directions",
-            },
+              href: "https://maps.google.com/?q=Husova+909+Planá+nad+Lužnicí",              ariaLabel: "Google Maps Directions"},
           ]}
           ariaLabel="Site footer with contact information"
           containerClassName="bg-card border-t border-accent/30"
diff --git a/src/app/motorcycles/page.tsx b/src/app/motorcycles/page.tsx
index b2d9d9d..6bf2f18 100644
--- a/src/app/motorcycles/page.tsx
+++ b/src/app/motorcycles/page.tsx
@@ -19,9 +19,7 @@ export default function MotorcyclesPage() {
   ];
 
   const navButton = {
-    text: "📞 +420 777 038 440",
-    href: "tel:+420777038440",
-  };
+    text: "📞 +420 777 038 440",    href: "tel:+420777038440"};
 
   return (
     <ThemeProvider
@@ -56,11 +54,9 @@ export default function MotorcyclesPage() {
           background={{ variant: "radial-gradient" }}
           buttons={[
             {
-              text: "Inquire Now",
-              href: "/contact",
-            },
+              text: "Inquire Now",              href: "/contact"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq&_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq"
           imageAlt="Quality Used Motorcycles for Sale"
           mediaAnimation="blur-reveal"
           className="min-h-screen"
@@ -84,44 +80,21 @@ export default function MotorcyclesPage() {
           animationType="scale-rotate"
           products={[
             {
-              id: "bike-001",
-              brand: "Yamaha",
-              name: "YZF-R125 Sport Bike",
-              price: "45,000 CZK",
-              rating: 5,
-              reviewCount: "2 owners",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq&_wi=3",
-              imageAlt: "Yamaha YZF-R125",
-            },
+              id: "bike-001",              brand: "Yamaha",              name: "YZF-R125 Sport Bike",              price: "45,000 CZK",              rating: 5,
+              reviewCount: "2 owners",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq",              imageAlt: "Yamaha YZF-R125"},
             {
-              id: "bike-002",
-              brand: "Honda",
-              name: "CB500 Cruiser",
-              price: "78,000 CZK",
-              rating: 5,
-              reviewCount: "1 owner",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m57fxa&_wi=2",
-              imageAlt: "Honda CB500",
-            },
+              id: "bike-002",              brand: "Honda",              name: "CB500 Cruiser",              price: "78,000 CZK",              rating: 5,
+              reviewCount: "1 owner",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m57fxa",              imageAlt: "Honda CB500"},
             {
-              id: "bike-003",
-              brand: "Vespa",
-              name: "LX150 Classic Scooter",
-              price: "32,000 CZK",
-              rating: 4.5,
-              reviewCount: "3 owners",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=cc8ooi&_wi=2",
-              imageAlt: "Vespa LX150",
-            },
+              id: "bike-003",              brand: "Vespa",              name: "LX150 Classic Scooter",              price: "32,000 CZK",              rating: 4.5,
+              reviewCount: "3 owners",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=cc8ooi",              imageAlt: "Vespa LX150"},
           ]}
           buttons={[
             {
-              text: "Inquire About Bike",
-              href: "/contact",
-            },
+              text: "Inquire About Bike",              href: "/contact"},
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
           cardClassName="p-4 rounded-lg border border-accent"
           cardBrandClassName="text-sm font-semibold text-primary-cta"
           cardNameClassName="text-xl font-bold text-foreground"
@@ -140,13 +113,9 @@ export default function MotorcyclesPage() {
           description="Contact us now to discuss pricing, inspect a bike, or arrange a test ride."
           buttons={[
             {
-              text: "📞 Call Now",
-              href: "tel:+420777038440",
-            },
+              text: "📞 Call Now",              href: "tel:+420777038440"},
             {
-              text: "Inquire via Form",
-              href: "/contact",
-            },
+              text: "Inquire via Form",              href: "/contact"},
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "radial-gradient" }}
@@ -164,9 +133,7 @@ export default function MotorcyclesPage() {
           socialLinks={[
             {
               icon: Phone,
-              href: "tel:+420777038440",
-              ariaLabel: "Call XtremeBikes",
-            },
+              href: "tel:+420777038440",              ariaLabel: "Call XtremeBikes"},
           ]}
           containerClassName="bg-card border-t border-accent/30"
         />
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d435583..d8bbbc0 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -38,9 +38,7 @@ export default function HomePage() {
           brandName="XtremeBikes"
           navItems={navItems}
           button={{
-            text: "📞 +420 777 038 440",
-            href: "tel:+420777038440",
-          }}
+            text: "📞 +420 777 038 440",            href: "tel:+420777038440"}}
         />
       </div>
 
@@ -58,7 +56,7 @@ export default function HomePage() {
             { text: "Request Service", href: "/contact" },
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uzc2cb&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uzc2cb"
           imageAlt="XtremeBikes Professional Motorcycle Workshop"
           mediaAnimation="blur-reveal"
           className="min-h-screen"
@@ -81,44 +79,32 @@ export default function HomePage() {
           animationType="slide-up"
           features={[
             {
-              title: "Expert Technicians",
-              description: "Experienced motorcycle mechanics with specialized knowledge in all repair types.",
-              bentoComponent: "icon-info-cards",
-              items: [
+              title: "Expert Technicians",              description: "Experienced motorcycle mechanics with specialized knowledge in all repair types.",              bentoComponent: "icon-info-cards",              items: [
                 { icon: CheckCircle, label: "Certified", value: "20+ Years" },
                 { icon: Wrench, label: "Specialized", value: "All Makes" },
               ],
             },
             {
-              title: "Professional Welding",
-              description: "Aluminum wheel welding and non-ferrous metal work with precision equipment.",
-              bentoComponent: "icon-info-cards",
-              items: [
+              title: "Professional Welding",              description: "Aluminum wheel welding and non-ferrous metal work with precision equipment.",              bentoComponent: "icon-info-cards",              items: [
                 { icon: Zap, label: "Precision", value: "Industrial" },
                 { icon: Shield, label: "Quality", value: "Guaranteed" },
               ],
             },
             {
-              title: "Fast Service",
-              description: "Quick turnaround on repairs without sacrificing quality craftsmanship.",
-              bentoComponent: "icon-info-cards",
-              items: [
+              title: "Fast Service",              description: "Quick turnaround on repairs without sacrificing quality craftsmanship.",              bentoComponent: "icon-info-cards",              items: [
                 { icon: Clock, label: "Urgent", value: "Same Day" },
                 { icon: CheckCircle, label: "Reliable", value: "On Time" },
               ],
             },
             {
-              title: "Local Workshop",
-              description: "Owned and operated locally in Planá nad Lužnicí, serving South Bohemia.",
-              bentoComponent: "icon-info-cards",
-              items: [
+              title: "Local Workshop",              description: "Owned and operated locally in Planá nad Lužnicí, serving South Bohemia.",              bentoComponent: "icon-info-cards",              items: [
                 { icon: MapPin, label: "Location", value: "Local" },
                 { icon: Star, label: "Trusted", value: "Reputation" },
               ],
             },
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          cardTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -135,29 +121,32 @@ export default function HomePage() {
           animationType="blur-reveal"
           features={[
             {
-              title: "Motorcycle Repair",
-              description: "Engine diagnostics, brake service, electrical repairs, and full mechanical restoration.",
-              button: { text: "Learn More", href: "/services" },
+              title: "Motorcycle Repair",              description: "Engine diagnostics, brake service, electrical repairs, and full mechanical restoration.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Service", value: "Expert" },
+                { icon: CheckCircle, label: "Quality", value: "Guaranteed" },
+              ],
             },
             {
-              title: "Scooter Service",
-              description: "Routine maintenance, clutch replacement, transmission repair, and parts sourcing.",
-              button: { text: "Learn More", href: "/services" },
+              title: "Scooter Service",              description: "Routine maintenance, clutch replacement, transmission repair, and parts sourcing.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Maintenance", value: "Complete" },
+                { icon: CheckCircle, label: "Parts", value: "Available" },
+              ],
             },
             {
-              title: "Restoration",
-              description: "Complete motorcycle restoration from ground-up, custom builds, and vintage bike revival.",
-              button: { text: "Learn More", href: "/services" },
+              title: "Restoration",              description: "Complete motorcycle restoration from ground-up, custom builds, and vintage bike revival.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Star, label: "Custom", value: "Builds" },
+                { icon: CheckCircle, label: "Vintage", value: "Revival" },
+              ],
             },
             {
-              title: "Aluminum Welding",
-              description: "Wheel welding, frame repair, custom fabrication of motorcycle components.",
-              button: { text: "Learn More", href: "/services" },
+              title: "Aluminum Welding",              description: "Wheel welding, frame repair, custom fabrication of motorcycle components.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Zap, label: "Welding", value: "Precision" },
+                { icon: Shield, label: "Quality", value: "Assured" },
+              ],
             },
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
-          buttonClassName="px-4 py-2 rounded font-semibold"
+          cardTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -166,10 +155,7 @@ export default function HomePage() {
         <TextSplitAbout
           title="About Milan Pražan – XtremeBikes"
           description={[
-            "XtremeBikes is a professional motorcycle repair and sales workshop located in Planá nad Lužnicí, South Bohemia. Founded by Milan Pražan, an experienced motorcycle technician with decades of expertise in bike repair, restoration, and custom modifications.",
-            "We specialize in comprehensive motorcycle and scooter servicing, professional aluminum wheel welding, non-ferrous metal fabrication, and complete restoration projects. Every bike that leaves our workshop meets our exacting standards for quality and performance.",
-            "Whether you need urgent repair, specialized welding work, a complete restoration, or a quality used motorcycle, XtremeBikes is your trusted local partner.",
-          ]}
+            "XtremeBikes is a professional motorcycle repair and sales workshop located in Planá nad Lužnicí, South Bohemia. Founded by Milan Pražan, an experienced motorcycle technician with decades of expertise in bike repair, restoration, and custom modifications.",            "We specialize in comprehensive motorcycle and scooter servicing, professional aluminum wheel welding, non-ferrous metal fabrication, and complete restoration projects. Every bike that leaves our workshop meets our exacting standards for quality and performance.",            "Whether you need urgent repair, specialized welding work, a complete restoration, or a quality used motorcycle, XtremeBikes is your trusted local partner."]}
           buttons={[
             { text: "📞 Call for Details", href: "tel:+420777038440" },
             { text: "Visit Us", href: "/contact" },
@@ -197,43 +183,22 @@ export default function HomePage() {
           animationType="scale-rotate"
           products={[
             {
-              id: "bike-001",
-              brand: "Yamaha",
-              name: "YZF-R125 Sport Bike",
-              price: "45,000 CZK",
-              rating: 5,
-              reviewCount: "2 owners",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq&_wi=1",
-              imageAlt: "Yamaha YZF-R125 Sport Motorcycle",
-            },
+              id: "bike-001",              brand: "Yamaha",              name: "YZF-R125 Sport Bike",              price: "45,000 CZK",              rating: 5,
+              reviewCount: "2 owners",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=baexrq",              imageAlt: "Yamaha YZF-R125 Sport Motorcycle"},
             {
-              id: "bike-002",
-              brand: "Honda",
-              name: "CB500 Cruiser",
-              price: "78,000 CZK",
-              rating: 5,
-              reviewCount: "1 owner",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m57fxa&_wi=1",
-              imageAlt: "Honda CB500 Cruiser Motorcycle",
-            },
+              id: "bike-002",              brand: "Honda",              name: "CB500 Cruiser",              price: "78,000 CZK",              rating: 5,
+              reviewCount: "1 owner",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m57fxa",              imageAlt: "Honda CB500 Cruiser Motorcycle"},
             {
-              id: "bike-003",
-              brand: "Vespa",
-              name: "LX150 Classic Scooter",
-              price: "32,000 CZK",
-              rating: 4.5,
-              reviewCount: "3 owners",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=cc8ooi&_wi=1",
-              imageAlt: "Vespa LX150 Classic Scooter",
-            },
+              id: "bike-003",              brand: "Vespa",              name: "LX150 Classic Scooter",              price: "32,000 CZK",              rating: 4.5,
+              reviewCount: "3 owners",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=cc8ooi",              imageAlt: "Vespa LX150 Classic Scooter"},
           ]}
           buttons={[
             { text: "View All Bikes", href: "/motorcycles" },
             { text: "Inquire Now", href: "/contact" },
           ]}
           buttonAnimation="slide-up"
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
           cardClassName="p-4 rounded-lg border border-accent"
           cardBrandClassName="text-sm font-semibold text-primary-cta"
           cardNameClassName="text-xl font-bold text-foreground"
@@ -255,62 +220,26 @@ export default function HomePage() {
           animationType="blur-reveal"
           testimonials={[
             {
-              id: "testimonial-1",
-              name: "Tomáš Kovács",
-              role: "Motorcycle Owner",
-              testimonial: "Milan repaired my vintage Jawa in just two days. Professional work, fair price, and the bike runs like new. Highly recommended!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=8ly2nf",
-              imageAlt: "Tomáš Kovács",
-              icon: Star,
+              id: "testimonial-1",              name: "Tomáš Kovács",              role: "Motorcycle Owner",              testimonial: "Milan repaired my vintage Jawa in just two days. Professional work, fair price, and the bike runs like new. Highly recommended!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=8ly2nf",              imageAlt: "Tomáš Kovács",              icon: Star,
             },
             {
-              id: "testimonial-2",
-              name: "Jana Svobodová",
-              role: "Scooter Owner",
-              testimonial: "Great service and very friendly. My scooter needed welding on the frame and they did it perfectly. Best workshop in the area!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=enfqdd",
-              imageAlt: "Jana Svobodová",
-              icon: Star,
+              id: "testimonial-2",              name: "Jana Svobodová",              role: "Scooter Owner",              testimonial: "Great service and very friendly. My scooter needed welding on the frame and they did it perfectly. Best workshop in the area!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=enfqdd",              imageAlt: "Jana Svobodová",              icon: Star,
             },
             {
-              id: "testimonial-3",
-              name: "Petr Novotný",
-              role: "Motorcycle Enthusiast",
-              testimonial: "Bought a restored Yamaha from XtremeBikes. Complete transparency, perfect condition, and excellent after-sales support.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m9175h",
-              imageAlt: "Petr Novotný",
-              icon: Star,
+              id: "testimonial-3",              name: "Petr Novotný",              role: "Motorcycle Enthusiast",              testimonial: "Bought a restored Yamaha from XtremeBikes. Complete transparency, perfect condition, and excellent after-sales support.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=m9175h",              imageAlt: "Petr Novotný",              icon: Star,
             },
             {
-              id: "testimonial-4",
-              name: "Mária Dubová",
-              role: "Commuter",
-              testimonial: "My Honda maintenance is always top-notch here. Milan knows every detail about motorcycles and treats them with care.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=achy6a",
-              imageAlt: "Mária Dubová",
-              icon: Star,
+              id: "testimonial-4",              name: "Mária Dubová",              role: "Commuter",              testimonial: "My Honda maintenance is always top-notch here. Milan knows every detail about motorcycles and treats them with care.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=achy6a",              imageAlt: "Mária Dubová",              icon: Star,
             },
             {
-              id: "testimonial-5",
-              name: "František Krčil",
-              role: "Bike Collector",
-              testimonial: "Restoration work was exceptional. They captured the original character while making it ride like a dream. Worth every koruna!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q6tsfy",
-              imageAlt: "František Krčil",
-              icon: Star,
+              id: "testimonial-5",              name: "František Krčil",              role: "Bike Collector",              testimonial: "Restoration work was exceptional. They captured the original character while making it ride like a dream. Worth every koruna!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q6tsfy",              imageAlt: "František Krčil",              icon: Star,
             },
             {
-              id: "testimonial-6",
-              name: "Klára Bílá",
-              role: "Scooter Rider",
-              testimonial: "Fast, reliable, and honest service. When my scooter broke down, Milan had it fixed within 24 hours. True professional!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=sp7lq2",
-              imageAlt: "Klára Bílá",
-              icon: Star,
+              id: "testimonial-6",              name: "Klára Bílá",              role: "Scooter Rider",              testimonial: "Fast, reliable, and honest service. When my scooter broke down, Milan had it fixed within 24 hours. True professional!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=sp7lq2",              imageAlt: "Klára Bílá",              icon: Star,
             },
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
           cardClassName="p-6 rounded-lg border border-accent/50"
           testimonialClassName="text-base italic text-foreground/80"
           nameClassName="font-bold text-foreground"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index e4f9453..ac6595a 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -7,7 +7,7 @@ import FeatureBento from "@/components/sections/feature/FeatureBento";
 import FaqSplitMedia from "@/components/sections/faq/FaqSplitMedia";
 import FooterCard from "@/components/sections/footer/FooterCard";
 import Link from "next/link";
-import { Wrench, Phone, MapPin } from "lucide-react";
+import { Wrench, Phone, MapPin, CheckCircle, Zap } from "lucide-react";
 
 export default function ServicesPage() {
   const navItems = [
@@ -35,9 +35,7 @@ export default function ServicesPage() {
           brandName="XtremeBikes"
           navItems={navItems}
           button={{
-            text: "📞 +420 777 038 440",
-            href: "tel:+420777038440",
-          }}
+            text: "📞 +420 777 038 440",            href: "tel:+420777038440"}}
         />
       </div>
 
@@ -51,7 +49,7 @@ export default function ServicesPage() {
           tagAnimation="slide-up"
           background={{ variant: "radial-gradient" }}
           buttons={[{ text: "📞 Call for Service", href: "tel:+420777038440" }]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nzurog&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nzurog"
           imageAlt="XtremeBikes Motorcycle Repair Service"
           mediaAnimation="blur-reveal"
           titleClassName="text-4xl md:text-5xl font-bold"
@@ -72,32 +70,44 @@ export default function ServicesPage() {
           animationType="slide-up"
           features={[
             {
-              title: "Motorcycle Repair",
-              description: "Engine diagnostics, carburetor cleaning, fuel system repair, ignition system service, and complete mechanical overhaul.",
+              title: "Motorcycle Repair",              description: "Engine diagnostics, carburetor cleaning, fuel system repair, ignition system service, and complete mechanical overhaul.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Service", value: "Complete" },
+                { icon: CheckCircle, label: "Quality", value: "Expert" },
+              ],
             },
             {
-              title: "Scooter Service",
-              description: "Routine maintenance, oil changes, filter replacement, clutch adjustment, transmission repair, and parts sourcing.",
+              title: "Scooter Service",              description: "Routine maintenance, oil changes, filter replacement, clutch adjustment, transmission repair, and parts sourcing.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Maintenance", value: "Routine" },
+                { icon: CheckCircle, label: "Parts", value: "Available" },
+              ],
             },
             {
-              title: "Brake Service",
-              description: "Brake pad replacement, rotor resurfacing, caliper service, brake fluid flush, and ABS diagnostic repair.",
+              title: "Brake Service",              description: "Brake pad replacement, rotor resurfacing, caliper service, brake fluid flush, and ABS diagnostic repair.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Brake", value: "Service" },
+                { icon: CheckCircle, label: "Safety", value: "First" },
+              ],
             },
             {
-              title: "Electrical Repair",
-              description: "Battery service, starter motor repair, charging system diagnostics, lighting system repair, and wiring troubleshooting.",
+              title: "Electrical Repair",              description: "Battery service, starter motor repair, charging system diagnostics, lighting system repair, and wiring troubleshooting.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Zap, label: "Electrical", value: "Expert" },
+                { icon: CheckCircle, label: "Diagnostic", value: "Advanced" },
+              ],
             },
             {
-              title: "Welding & Fabrication",
-              description: "Aluminum wheel welding, non-ferrous metal welding, frame repair, custom fabrication, and metal restoration.",
+              title: "Welding & Fabrication",              description: "Aluminum wheel welding, non-ferrous metal welding, frame repair, custom fabrication, and metal restoration.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Zap, label: "Welding", value: "Precision" },
+                { icon: CheckCircle, label: "Metal", value: "Work" },
+              ],
             },
             {
-              title: "Complete Restoration",
-              description: "Ground-up restoration, vintage bike revival, custom builds, paint and finish work, and mechanical perfection.",
+              title: "Complete Restoration",              description: "Ground-up restoration, vintage bike revival, custom builds, paint and finish work, and mechanical perfection.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Wrench, label: "Restoration", value: "Full" },
+                { icon: CheckCircle, label: "Custom", value: "Builds" },
+              ],
             },
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          cardTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>
 
@@ -117,33 +127,18 @@ export default function ServicesPage() {
           mediaPosition="right"
           faqs={[
             {
-              id: "faq-1",
-              title: "How long does a typical repair take?",
-              content: "Most routine repairs are completed within 1-2 days. Engine work and restorations may take longer. Call for a specific estimate on your bike.",
-            },
+              id: "faq-1",              title: "How long does a typical repair take?",              content: "Most routine repairs are completed within 1-2 days. Engine work and restorations may take longer. Call for a specific estimate on your bike."},
             {
-              id: "faq-2",
-              title: "Do you work on all brands?",
-              content: "Yes! We service all major motorcycle and scooter brands including Yamaha, Honda, Suzuki, Kawasaki, Vespa, Jawa, and many others.",
-            },
+              id: "faq-2",              title: "Do you work on all brands?",              content: "Yes! We service all major motorcycle and scooter brands including Yamaha, Honda, Suzuki, Kawasaki, Vespa, Jawa, and many others."},
             {
-              id: "faq-3",
-              title: "What warranty do you provide?",
-              content: "All repair work includes a 3-month warranty on parts and labor. Restorations include extended guarantees on workmanship.",
-            },
+              id: "faq-3",              title: "What warranty do you provide?",              content: "All repair work includes a 3-month warranty on parts and labor. Restorations include extended guarantees on workmanship."},
             {
-              id: "faq-4",
-              title: "Can you help with urgent repairs?",
-              content: "Yes! We offer same-day service for urgent repairs when possible. Call immediately with your issue and we'll prioritize your bike.",
-            },
+              id: "faq-4",              title: "Can you help with urgent repairs?",              content: "Yes! We offer same-day service for urgent repairs when possible. Call immediately with your issue and we'll prioritize your bike."},
             {
-              id: "faq-5",
-              title: "Do you buy used motorcycles?",
-              content: "We accept trade-ins and buy used motorcycles in good condition. Contact us with details about your bike for an offer.",
-            },
+              id: "faq-5",              title: "Do you buy used motorcycles?",              content: "We accept trade-ins and buy used motorcycles in good condition. Contact us with details about your bike for an offer."},
           ]}
-          titleClassName="text-3xl md:text-4xl font-bold"
-          descriptionClassName="text-lg text-foreground/70"
+          textBoxTitleClassName="text-3xl md:text-4xl font-bold"
+          textBoxDescriptionClassName="text-lg text-foreground/70"
         />
       </div>