diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 9109069..4fdcb71 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -19,8 +19,7 @@ export default function AboutPage() {
 
   const footerColumns = [
     {
-      title: "Navigation",
-      items: [
+      title: "Navigation",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Our Baked Goods", href: "/" },
@@ -29,8 +28,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Phone: +27 12 345 6789", href: "tel:+27123456789" },
         { label: "Email: info@glo-bake.co.za", href: "mailto:info@glo-bake.co.za" },
         { label: "WhatsApp", href: "https://wa.me/27123456789" },
@@ -38,8 +36,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
         { label: "Mon-Fri: 6:00 AM - 6:00 PM", href: "#" },
         { label: "Sat: 7:00 AM - 5:00 PM", href: "#" },
         { label: "Sun: 7:00 AM - 3:00 PM", href: "#" },
@@ -81,32 +78,22 @@ export default function AboutPage() {
           buttonAnimation="opacity"
           bulletPoints={[
             {
-              title: "Traditional Baking Methods",
-              description: "We use time-tested techniques passed down through generations to create the perfect texture and flavor in every loaf.",
-              icon: CheckCircle,
+              title: "Traditional Baking Methods",              description: "We use time-tested techniques passed down through generations to create the perfect texture and flavor in every loaf.",              icon: CheckCircle,
             },
             {
-              title: "Premium Ingredients",
-              description: "Only the finest locally-sourced and imported ingredients make it into our bakery. We believe quality matters.",
-              icon: CheckCircle,
+              title: "Premium Ingredients",              description: "Only the finest locally-sourced and imported ingredients make it into our bakery. We believe quality matters.",              icon: CheckCircle,
             },
             {
-              title: "Community Commitment",
-              description: "We're not just a bakery - we're part of the Pretoria community. We support local events and charities whenever we can.",
-              icon: CheckCircle,
+              title: "Community Commitment",              description: "We're not just a bakery - we're part of the Pretoria community. We support local events and charities whenever we can.",              icon: CheckCircle,
             },
             {
-              title: "Passion for Baking",
-              description: "Our team of skilled bakers love what they do. Their passion translates into every product we create.",
-              icon: CheckCircle,
+              title: "Passion for Baking",              description: "Our team of skilled bakers love what they do. Their passion translates into every product we create.",              icon: CheckCircle,
             },
             {
-              title: "Customer First Approach",
-              description: "Your satisfaction is our priority. We work closely with you to ensure every order meets your expectations.",
-              icon: CheckCircle,
+              title: "Customer First Approach",              description: "Your satisfaction is our priority. We work closely with you to ensure every order meets your expectations.",              icon: CheckCircle,
             },
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=3"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm"
           imageAlt="Our skilled baking team at work in the GLO-BAKE kitchen"
           mediaAnimation="opacity"
           imagePosition="right"
@@ -125,14 +112,7 @@ export default function AboutPage() {
       <div id="about-values" data-section="about-values">
         <SocialProofOne
           names={[
-            "Quality First",
-            "Local Community",
-            "Fresh Daily",
-            "Expert Bakers",
-            "Fair Pricing",
-            "Customer Care",
-            "Continuous Improvement",
-          ]}
+            "Quality First",            "Local Community",            "Fresh Daily",            "Expert Bakers",            "Fair Pricing",            "Customer Care",            "Continuous Improvement"]}
           title="Our Core Values"
           description="These principles guide everything we do at GLO-BAKE, from sourcing ingredients to serving our valued customers."
           tag="What Drives Us"
@@ -145,7 +125,7 @@ export default function AboutPage() {
           ariaLabel="GLO-BAKE core values and mission"
           containerClassName="py-16"
           textBoxClassName="text-center mb-12"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
           textBoxDescriptionClassName="text-lg text-foreground/80"
           logoTextClassName="text-sm font-semibold text-emerald-700 bg-emerald-50 px-4 py-2 rounded-full"
         />
@@ -155,59 +135,23 @@ export default function AboutPage() {
         <TestimonialCardSixteen
           testimonials={[
             {
-              id: "testimonial-1",
-              name: "Sarah Mthembu",
-              role: "Regular Customer",
-              company: "Pretoria",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=3",
-              imageAlt: "Sarah testimonial",
-            },
+              id: "testimonial-1",              name: "Sarah Mthembu",              role: "Regular Customer",              company: "Pretoria",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",              imageAlt: "Sarah testimonial"},
             {
-              id: "testimonial-2",
-              name: "John Pieterse",
-              role: "Event Planner",
-              company: "Pretoria Events",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=3",
-              imageAlt: "John testimonial",
-            },
+              id: "testimonial-2",              name: "John Pieterse",              role: "Event Planner",              company: "Pretoria Events",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",              imageAlt: "John testimonial"},
             {
-              id: "testimonial-3",
-              name: "Amelia Ndlela",
-              role: "Business Owner",
-              company: "Pretoria Central",
-              rating: 4,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik&_wi=2",
-              imageAlt: "Amelia testimonial",
-            },
+              id: "testimonial-3",              name: "Amelia Ndlela",              role: "Business Owner",              company: "Pretoria Central",              rating: 4,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik",              imageAlt: "Amelia testimonial"},
             {
-              id: "testimonial-4",
-              name: "Michael Van Der Merwe",
-              role: "Family Man",
-              company: "Pretoria North",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp&_wi=2",
-              imageAlt: "Michael testimonial",
-            },
+              id: "testimonial-4",              name: "Michael Van Der Merwe",              role: "Family Man",              company: "Pretoria North",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp",              imageAlt: "Michael testimonial"},
             {
-              id: "testimonial-5",
-              name: "Linda Khumalo",
-              role: "Regular Customer",
-              company: "Pretoria",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=4",
-              imageAlt: "Linda testimonial",
-            },
+              id: "testimonial-5",              name: "Linda Khumalo",              role: "Regular Customer",              company: "Pretoria",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",              imageAlt: "Linda testimonial"},
             {
-              id: "testimonial-6",
-              name: "David Steenkamp",
-              role: "Corporate Manager",
-              company: "Pretoria CBD",
-              rating: 4,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=4",
-              imageAlt: "David testimonial",
-            },
+              id: "testimonial-6",              name: "David Steenkamp",              role: "Corporate Manager",              company: "Pretoria CBD",              rating: 4,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",              imageAlt: "David testimonial"},
           ]}
           kpiItems={[
             { value: "4.1/5", label: "Google Rating" },
@@ -225,8 +169,8 @@ export default function AboutPage() {
           carouselMode="buttons"
           ariaLabel="GLO-BAKE customer testimonials on about page"
           containerClassName="py-20"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
-          descriptionClassName="text-lg text-foreground/80 mb-12"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxDescriptionClassName="text-lg text-foreground/80 mb-12"
           nameClassName="text-lg font-bold text-foreground"
           roleClassName="text-sm text-foreground/70"
           companyClassName="text-sm text-emerald-700 font-semibold"
diff --git a/src/app/our-baked-goods/page.tsx b/src/app/our-baked-goods/page.tsx
index a0aa24d..4799dff 100644
--- a/src/app/our-baked-goods/page.tsx
+++ b/src/app/our-baked-goods/page.tsx
@@ -20,8 +20,7 @@ export default function OurBakedGoodsPage() {
 
   const footerColumns = [
     {
-      title: "Navigation",
-      items: [
+      title: "Navigation",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Our Baked Goods", href: "/our-baked-goods" },
@@ -30,8 +29,7 @@ export default function OurBakedGoodsPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Phone: +27 12 345 6789", href: "tel:+27123456789" },
         { label: "Email: info@glo-bake.co.za", href: "mailto:info@glo-bake.co.za" },
         { label: "WhatsApp", href: "https://wa.me/27123456789" },
@@ -39,8 +37,7 @@ export default function OurBakedGoodsPage() {
       ],
     },
     {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
         { label: "Mon-Fri: 6:00 AM - 6:00 PM", href: "#" },
         { label: "Sat: 7:00 AM - 5:00 PM", href: "#" },
         { label: "Sun: 7:00 AM - 3:00 PM", href: "#" },
@@ -73,9 +70,7 @@ export default function OurBakedGoodsPage() {
             { name: "Contact", id: "contact" },
           ]}
           button={{
-            text: "Call Now",
-            href: "tel:+27123456789",
-          }}
+            text: "Call Now",            href: "tel:+27123456789"}}
           className="bg-gradient-to-r from-emerald-50 to-lime-50 shadow-sm"
         />
       </div>
@@ -95,13 +90,9 @@ export default function OurBakedGoodsPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=4",
-              imageAlt: "artisan fresh bread loaf",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",              imageAlt: "artisan fresh bread loaf"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=2",
-              imageAlt: "delicious pastries variety bakery",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",              imageAlt: "delicious pastries variety bakery"},
           ]}
           mediaAnimation="blur-reveal"
           rating={4.1}
@@ -119,33 +110,13 @@ export default function OurBakedGoodsPage() {
         <ProductCardOne
           products={[
             {
-              id: "bread-1",
-              name: "Fresh Sourdough Bread",
-              price: "R45",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=5",
-              imageAlt: "Fresh artisan sourdough bread",
-            },
+              id: "bread-1",              name: "Fresh Sourdough Bread",              price: "R45",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",              imageAlt: "Fresh artisan sourdough bread"},
             {
-              id: "pastry-1",
-              name: "Fresh Pastries & Desserts",
-              price: "From R25",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=3",
-              imageAlt: "Delicious assorted pastries",
-            },
+              id: "pastry-1",              name: "Fresh Pastries & Desserts",              price: "From R25",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",              imageAlt: "Delicious assorted pastries"},
             {
-              id: "bread-2",
-              name: "Rolls & Sandwich Bread",
-              price: "From R35",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v&_wi=2",
-              imageAlt: "Fresh sandwich bread rolls",
-            },
+              id: "bread-2",              name: "Rolls & Sandwich Bread",              price: "From R35",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v",              imageAlt: "Fresh sandwich bread rolls"},
             {
-              id: "daily-1",
-              name: "Daily Baked Goods",
-              price: "From R20",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0&_wi=2",
-              imageAlt: "Daily bakery items",
-            },
+              id: "daily-1",              name: "Daily Baked Goods",              price: "From R20",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0",              imageAlt: "Daily bakery items"},
           ]}
           gridVariant="bento-grid"
           animationType="blur-reveal"
@@ -161,8 +132,8 @@ export default function OurBakedGoodsPage() {
           useInvertedBackground={false}
           ariaLabel="Our baked goods products"
           containerClassName="py-20"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
-          descriptionClassName="text-lg text-foreground/80 mb-12"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxDescriptionClassName="text-lg text-foreground/80 mb-12"
           cardNameClassName="text-lg font-bold text-foreground"
           cardPriceClassName="text-emerald-700 font-semibold"
         />
@@ -171,13 +142,7 @@ export default function OurBakedGoodsPage() {
       <div id="social-proof" data-section="social-proof">
         <SocialProofOne
           names={[
-            "Fresh Bread Daily",
-            "Affordable Local Bakery",
-            "Friendly Staff",
-            "Custom Cake Orders",
-            "Convenient Pretoria Location",
-            "Quality Ingredients",
-          ]}
+            "Fresh Bread Daily",            "Affordable Local Bakery",            "Friendly Staff",            "Custom Cake Orders",            "Convenient Pretoria Location",            "Quality Ingredients"]}
           title="Why Our Customers Love Us"
           description="Trusted by hundreds of Pretoria residents for fresh, delicious baked goods at fair prices."
           tag="Community Favorite"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5def275..1a7f070 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -23,8 +23,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Navigation",
-      items: [
+      title: "Navigation",      items: [
         { label: "Home", href: "/" },
         { label: "About Us", href: "/about" },
         { label: "Our Baked Goods", href: "/" },
@@ -33,8 +32,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Phone: +27 12 345 6789", href: "tel:+27123456789" },
         { label: "Email: info@glo-bake.co.za", href: "mailto:info@glo-bake.co.za" },
         { label: "WhatsApp", href: "https://wa.me/27123456789" },
@@ -42,8 +40,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
         { label: "Mon-Fri: 6:00 AM - 6:00 PM", href: "#" },
         { label: "Sat: 7:00 AM - 5:00 PM", href: "#" },
         { label: "Sun: 7:00 AM - 3:00 PM", href: "#" },
@@ -89,13 +86,9 @@ export default function HomePage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=dkall0",
-              imageAlt: "Fresh bread baking in traditional oven at GLO-BAKE bakery",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=dkall0",              imageAlt: "Fresh bread baking in traditional oven at GLO-BAKE bakery"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0ujipm",
-              imageAlt: "Delicious assorted pastries fresh from the oven",
-            },
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0ujipm",              imageAlt: "Delicious assorted pastries fresh from the oven"},
           ]}
           mediaAnimation="blur-reveal"
           rating={4.1}
@@ -112,14 +105,7 @@ export default function HomePage() {
       <div id="social-proof" data-section="social-proof">
         <SocialProofOne
           names={[
-            "Fresh Bread Daily",
-            "Affordable Local Bakery",
-            "Friendly Staff",
-            "Custom Cake Orders",
-            "Convenient Pretoria Location",
-            "Quality Ingredients",
-            "Community Trusted",
-          ]}
+            "Fresh Bread Daily",            "Affordable Local Bakery",            "Friendly Staff",            "Custom Cake Orders",            "Convenient Pretoria Location",            "Quality Ingredients",            "Community Trusted"]}
           title="Why Choose GLO-BAKE?"
           description="We are committed to providing Pretoria with the freshest baked goods, exceptional service, and affordable prices."
           tag="Local Trusted Bakery"
@@ -132,7 +118,7 @@ export default function HomePage() {
           ariaLabel="GLO-BAKE social proof and trust signals"
           containerClassName="py-16"
           textBoxClassName="text-center mb-12"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
           textBoxDescriptionClassName="text-lg text-foreground/80"
           logoTextClassName="text-sm font-semibold text-emerald-700 bg-emerald-50 px-4 py-2 rounded-full"
         />
@@ -142,52 +128,22 @@ export default function HomePage() {
         <ProductCardOne
           products={[
             {
-              id: "bread-1",
-              name: "Fresh Sourdough Bread",
-              price: "R45",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=1",
-              imageAlt: "Fresh artisan sourdough bread",
-              isFavorited: false,
+              id: "bread-1",              name: "Fresh Sourdough Bread",              price: "R45",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",              imageAlt: "Fresh artisan sourdough bread",              isFavorited: false,
             },
             {
-              id: "cake-1",
-              name: "Birthday Cakes",
-              price: "From R250",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng&_wi=1",
-              imageAlt: "Beautiful custom birthday cake",
-              isFavorited: false,
+              id: "cake-1",              name: "Birthday Cakes",              price: "From R250",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng",              imageAlt: "Beautiful custom birthday cake",              isFavorited: false,
             },
             {
-              id: "cake-2",
-              name: "Custom Celebration Cakes",
-              price: "From R350",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco&_wi=1",
-              imageAlt: "Elegant celebration cake",
-              isFavorited: false,
+              id: "cake-2",              name: "Custom Celebration Cakes",              price: "From R350",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco",              imageAlt: "Elegant celebration cake",              isFavorited: false,
             },
             {
-              id: "pastry-1",
-              name: "Fresh Pastries & Desserts",
-              price: "From R25",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=1",
-              imageAlt: "Delicious assorted pastries",
-              isFavorited: false,
+              id: "pastry-1",              name: "Fresh Pastries & Desserts",              price: "From R25",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",              imageAlt: "Delicious assorted pastries",              isFavorited: false,
             },
             {
-              id: "bread-2",
-              name: "Rolls & Sandwich Bread",
-              price: "From R35",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v&_wi=1",
-              imageAlt: "Fresh sandwich bread rolls",
-              isFavorited: false,
+              id: "bread-2",              name: "Rolls & Sandwich Bread",              price: "From R35",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v",              imageAlt: "Fresh sandwich bread rolls",              isFavorited: false,
             },
             {
-              id: "daily-1",
-              name: "Daily Baked Goods",
-              price: "From R20",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0&_wi=1",
-              imageAlt: "Daily bakery items",
-              isFavorited: false,
+              id: "daily-1",              name: "Daily Baked Goods",              price: "From R20",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0",              imageAlt: "Daily bakery items",              isFavorited: false,
             },
           ]}
           gridVariant="bento-grid"
@@ -204,8 +160,8 @@ export default function HomePage() {
           useInvertedBackground={false}
           ariaLabel="GLO-BAKE products and services"
           containerClassName="py-20"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
-          descriptionClassName="text-lg text-foreground/80 mb-12"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxDescriptionClassName="text-lg text-foreground/80 mb-12"
           cardNameClassName="text-lg font-bold text-foreground"
           cardPriceClassName="text-emerald-700 font-semibold"
         />
@@ -222,32 +178,22 @@ export default function HomePage() {
           buttonAnimation="opacity"
           bulletPoints={[
             {
-              title: "Freshly Baked Daily",
-              description: "All our bread and pastries are made fresh every morning using traditional baking methods.",
-              icon: CheckCircle,
+              title: "Freshly Baked Daily",              description: "All our bread and pastries are made fresh every morning using traditional baking methods.",              icon: CheckCircle,
             },
             {
-              title: "Affordable Local Bakery",
-              description: "Quality baked goods at fair prices for our Pretoria neighbors.",
-              icon: CheckCircle,
+              title: "Affordable Local Bakery",              description: "Quality baked goods at fair prices for our Pretoria neighbors.",              icon: CheckCircle,
             },
             {
-              title: "Friendly Staff",
-              description: "Our team is dedicated to making you feel welcome and helping you find exactly what you need.",
-              icon: CheckCircle,
+              title: "Friendly Staff",              description: "Our team is dedicated to making you feel welcome and helping you find exactly what you need.",              icon: CheckCircle,
             },
             {
-              title: "Custom Cake Orders",
-              description: "Create the perfect cake for any celebration with our custom cake design service.",
-              icon: CheckCircle,
+              title: "Custom Cake Orders",              description: "Create the perfect cake for any celebration with our custom cake design service.",              icon: CheckCircle,
             },
             {
-              title: "Convenient Location",
-              description: "Located in the heart of Pretoria, easy to reach and easy to visit.",
-              icon: CheckCircle,
+              title: "Convenient Location",              description: "Located in the heart of Pretoria, easy to reach and easy to visit.",              icon: CheckCircle,
             },
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm"
           imageAlt="Fresh artisan bread at GLO-BAKE"
           mediaAnimation="opacity"
           imagePosition="right"
@@ -267,59 +213,23 @@ export default function HomePage() {
         <TestimonialCardSixteen
           testimonials={[
             {
-              id: "testimonial-1",
-              name: "Sarah Mthembu",
-              role: "Regular Customer",
-              company: "Pretoria",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=1",
-              imageAlt: "Sarah testimonial",
-            },
+              id: "testimonial-1",              name: "Sarah Mthembu",              role: "Regular Customer",              company: "Pretoria",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",              imageAlt: "Sarah testimonial"},
             {
-              id: "testimonial-2",
-              name: "John Pieterse",
-              role: "Event Planner",
-              company: "Pretoria Events",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=1",
-              imageAlt: "John testimonial",
-            },
+              id: "testimonial-2",              name: "John Pieterse",              role: "Event Planner",              company: "Pretoria Events",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",              imageAlt: "John testimonial"},
             {
-              id: "testimonial-3",
-              name: "Amelia Ndlela",
-              role: "Business Owner",
-              company: "Pretoria Central",
-              rating: 4,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik&_wi=1",
-              imageAlt: "Amelia testimonial",
-            },
+              id: "testimonial-3",              name: "Amelia Ndlela",              role: "Business Owner",              company: "Pretoria Central",              rating: 4,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik",              imageAlt: "Amelia testimonial"},
             {
-              id: "testimonial-4",
-              name: "Michael Van Der Merwe",
-              role: "Family Man",
-              company: "Pretoria North",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp&_wi=1",
-              imageAlt: "Michael testimonial",
-            },
+              id: "testimonial-4",              name: "Michael Van Der Merwe",              role: "Family Man",              company: "Pretoria North",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp",              imageAlt: "Michael testimonial"},
             {
-              id: "testimonial-5",
-              name: "Linda Khumalo",
-              role: "Regular Customer",
-              company: "Pretoria",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=2",
-              imageAlt: "Linda testimonial",
-            },
+              id: "testimonial-5",              name: "Linda Khumalo",              role: "Regular Customer",              company: "Pretoria",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",              imageAlt: "Linda testimonial"},
             {
-              id: "testimonial-6",
-              name: "David Steenkamp",
-              role: "Corporate Manager",
-              company: "Pretoria CBD",
-              rating: 4,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=2",
-              imageAlt: "David testimonial",
-            },
+              id: "testimonial-6",              name: "David Steenkamp",              role: "Corporate Manager",              company: "Pretoria CBD",              rating: 4,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",              imageAlt: "David testimonial"},
           ]}
           kpiItems={[
             { value: "4.1/5", label: "Google Rating" },
@@ -337,8 +247,8 @@ export default function HomePage() {
           carouselMode="buttons"
           ariaLabel="GLO-BAKE customer testimonials"
           containerClassName="py-20"
-          titleClassName="text-4xl font-extrabold text-foreground mb-4"
-          descriptionClassName="text-lg text-foreground/80 mb-12"
+          textBoxTitleClassName="text-4xl font-extrabold text-foreground mb-4"
+          textBoxDescriptionClassName="text-lg text-foreground/80 mb-12"
           nameClassName="text-lg font-bold text-foreground"
           roleClassName="text-sm text-foreground/70"
           companyClassName="text-sm text-emerald-700 font-semibold"
@@ -349,30 +259,15 @@ export default function HomePage() {
         <ContactFaq
           faqs={[
             {
-              id: "faq-1",
-              title: "How do I place a custom cake order?",
-              content: "Call us at +27 12 345 6789 or fill out the contact form below with your cake requirements. Our friendly staff will help you design the perfect cake for your special occasion.",
-            },
+              id: "faq-1",              title: "How do I place a custom cake order?",              content: "Call us at +27 12 345 6789 or fill out the contact form below with your cake requirements. Our friendly staff will help you design the perfect cake for your special occasion."},
             {
-              id: "faq-2",
-              title: "What is your delivery area?",
-              content: "We deliver throughout Pretoria and surrounding areas. Delivery charges apply based on location. Contact us for specific delivery details.",
-            },
+              id: "faq-2",              title: "What is your delivery area?",              content: "We deliver throughout Pretoria and surrounding areas. Delivery charges apply based on location. Contact us for specific delivery details."},
             {
-              id: "faq-3",
-              title: "Can you accommodate dietary requirements?",
-              content: "Yes! We offer gluten-free, sugar-free, and vegan options. Please inform us of any dietary needs when placing your order.",
-            },
+              id: "faq-3",              title: "Can you accommodate dietary requirements?",              content: "Yes! We offer gluten-free, sugar-free, and vegan options. Please inform us of any dietary needs when placing your order."},
             {
-              id: "faq-4",
-              title: "What are your opening hours?",
-              content: "Monday to Friday: 6:00 AM - 6:00 PM | Saturday: 7:00 AM - 5:00 PM | Sunday: 7:00 AM - 3:00 PM",
-            },
+              id: "faq-4",              title: "What are your opening hours?",              content: "Monday to Friday: 6:00 AM - 6:00 PM | Saturday: 7:00 AM - 5:00 PM | Sunday: 7:00 AM - 3:00 PM"},
             {
-              id: "faq-5",
-              title: "Do you offer wholesale pricing?",
-              content: "Yes, we offer competitive wholesale rates for businesses and corporate orders. Contact our sales team for pricing.",
-            },
+              id: "faq-5",              title: "Do you offer wholesale pricing?",              content: "Yes, we offer competitive wholesale rates for businesses and corporate orders. Contact our sales team for pricing."},
           ]}
           ctaTitle="Ready to Order?"
           ctaDescription="Get in touch with us today to place your order or request a custom cake quote."