diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 926ea0d..d185772 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -8,7 +8,7 @@ import MetricCardOne from "@/components/sections/metrics/MetricCardOne";
 import ContactFaq from "@/components/sections/contact/ContactFaq";
 import FooterCard from "@/components/sections/footer/FooterCard";
 import Link from "next/link";
-import { BookOpen, Target, Eye, CheckCircle, ArrowRight } from "lucide-react";
+import { BookOpen, Target, Eye, CheckCircle, ArrowRight, Zap } from "lucide-react";
 
 export default function AboutPage() {
   const navItems = [
@@ -43,12 +43,10 @@ export default function AboutPage() {
         <HeroBillboard
           title="Built by an Athlete. Designed for Results."
           description="Elevate Web is a small studio with a performance mindset—clarity, discipline, and measurable outcomes."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[
             {
-              text: "Book a Free Website Review",
-              href: "/contact",
-            },
+              text: "Book a Free Website Review",              href: "/contact"},
           ]}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n"
           imageAlt="Elevate Web founder"
@@ -65,7 +63,7 @@ export default function AboutPage() {
           description="Most gyms and sports businesses have outdated sites that don't reflect the quality of their service."
           subdescription="We build modern websites that make it easy for visitors to understand your offer and take action. No fluff, no jargon—just results."
           icon={Target}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qgmuof&_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qgmuof"
           imageAlt="Modern gym facility representing quality service"
           mediaAnimation="slide-up"
           useInvertedBackground={false}
@@ -76,31 +74,19 @@ export default function AboutPage() {
         <MetricCardOne
           title="Our Approach"
           description="Three principles that guide every project."
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
           metrics={[
             {
-              id: "value-clarity",
-              value: "Clarity",
-              title: "Over Hype",
-              description: "Clear positioning and honest messaging",
-              icon: Eye,
+              id: "value-clarity",              value: "Clarity",              title: "Over Hype",              description: "Clear positioning and honest messaging",              icon: Eye,
             },
             {
-              id: "value-conversion",
-              value: "Conversion",
-              title: "By Design",
-              description: "Every detail drives action",
-              icon: CheckCircle,
+              id: "value-conversion",              value: "Conversion",              title: "By Design",              description: "Every detail drives action",              icon: CheckCircle,
             },
             {
-              id: "value-speed",
-              value: "Speed &",
-              title: "Simplicity",
-              description: "Fast builds, clean code",
-              icon: Eye,
+              id: "value-speed",              value: "Speed &",              title: "Simplicity",              description: "Fast builds, clean code",              icon: Zap,
             },
           ]}
         />
@@ -111,26 +97,15 @@ export default function AboutPage() {
           ctaTitle="If Your Website Isn't Bringing Leads, Let's Fix That."
           ctaDescription="Start with a free review and get a clear improvement plan in 24–48 hours."
           ctaButton={{
-            text: "Book a Free Website Review",
-            href: "/contact",
-          }}
+            text: "Book a Free Website Review",            href: "/contact"}}
           ctaIcon={ArrowRight}
           faqs={[
             {
-              id: "info-a1",
-              title: "Direct Communication",
-              content: "You work directly with the founder. No agencies, no middlemen.",
-            },
+              id: "info-a1",              title: "Direct Communication",              content: "You work directly with the founder. No agencies, no middlemen."},
             {
-              id: "info-a2",
-              title: "Fast Iterations",
-              content: "We move quickly and respond to feedback within 24 hours.",
-            },
+              id: "info-a2",              title: "Fast Iterations",              content: "We move quickly and respond to feedback within 24 hours."},
             {
-              id: "info-a3",
-              title: "Clear Deliverables",
-              content: "You know exactly what you're getting and when it ships.",
-            },
+              id: "info-a3",              title: "Clear Deliverables",              content: "You know exactly what you're getting and when it ships."},
           ]}
           animationType="blur-reveal"
           useInvertedBackground={false}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 070d930..8b7d57d 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -40,9 +40,9 @@ export default function ContactPage() {
         <HeroBillboard
           title="Book a Free Website Review"
           description="Send your site and we'll reply with 3 specific improvements to increase inquiries and conversions."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=12"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Contact and website review service"
           mediaAnimation="slide-up"
         />
@@ -53,33 +53,19 @@ export default function ContactPage() {
           ctaTitle="Request Your Free Review"
           ctaDescription="We respond within 24–48 hours with a clear analysis and actionable improvements."
           ctaButton={{
-            text: "Send My Site",
-            href: "#",
-          }}
+            text: "Send My Site",            href: "#"}}
           ctaIcon={Mail}
           faqs={[
             {
-              id: "form-q1",
-              title: "Full Name",
-              content: "Your name so we know who to reply to.",
-            },
+              id: "form-q1",              title: "Full Name",              content: "Your name so we know who to reply to."},
             {
-              id: "form-q2",
-              title: "Business Email",
-              content: "We'll send your review and any follow-up here.",
-            },
+              id: "form-q2",              title: "Business Email",              content: "We'll send your review and any follow-up here."},
             {
-              id: "form-q3",
-              title: "Business Name & URL",
-              content:
-                "Your current website (or description if you don't have one yet).",
-            },
+              id: "form-q3",              title: "Business Name & URL",              content:
+                "Your current website (or description if you don't have one yet)."},
             {
-              id: "form-q4",
-              title: "Service Type & Goals",
-              content:
-                "What you offer (gym, coaching, club, etc.) and what you want more of (calls, trials, members).",
-            },
+              id: "form-q4",              title: "Service Type & Goals",              content:
+                "What you offer (gym, coaching, club, etc.) and what you want more of (calls, trials, members)."},
           ]}
           animationType="blur-reveal"
           useInvertedBackground={false}
@@ -92,33 +78,22 @@ export default function ContactPage() {
           description="Prefer a different approach? We're flexible."
           buttons={[
             {
-              text: "Request a Quote",
-              href: "mailto:hello@elevateweb.co",
-            },
+              text: "Request a Quote",              href: "mailto:hello@elevateweb.co"},
           ]}
           accordionItems={[
             {
-              id: "contact-1",
-              title: "Email",
-              content:
-                "hello@elevateweb.co — Direct contact with the founder.",
-            },
+              id: "contact-1",              title: "Email",              content:
+                "hello@elevateweb.co — Direct contact with the founder."},
             {
-              id: "contact-2",
-              title: "Response Time",
-              content:
-                "We aim to reply within 24 hours. Urgent? Note it in your message.",
-            },
+              id: "contact-2",              title: "Response Time",              content:
+                "We aim to reply within 24 hours. Urgent? Note it in your message."},
             {
-              id: "contact-3",
-              title: "What to Include",
-              content:
-                "Your site URL (if you have one), your business type, and what you want to improve.",
-            },
+              id: "contact-3",              title: "What to Include",              content:
+                "Your site URL (if you have one), your business type, and what you want to improve."},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=13"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Contact options"
-          mediaAnimation="fade"
+          mediaAnimation="opacity"
           useInvertedBackground={false}
         />
       </div>
@@ -128,29 +103,18 @@ export default function ContactPage() {
           ctaTitle="Ready to Elevate?"
           ctaDescription="Your free review is the first step toward a website that actually brings leads."
           ctaButton={{
-            text: "Book a Free Website Review",
-            href: "#",
-          }}
+            text: "Book a Free Website Review",            href: "#"}}
           ctaIcon={Sparkles}
           faqs={[
             {
-              id: "info-c1",
-              title: "No Pressure",
-              content:
-                "Free review, no obligation. We'll share honest feedback and next steps.",
-            },
+              id: "info-c1",              title: "No Pressure",              content:
+                "Free review, no obligation. We'll share honest feedback and next steps."},
             {
-              id: "info-c2",
-              title: "Fast Turnaround",
-              content:
-                "Get your review within 24–48 hours. Results you can start acting on immediately.",
-            },
+              id: "info-c2",              title: "Fast Turnaround",              content:
+                "Get your review within 24–48 hours. Results you can start acting on immediately."},
             {
-              id: "info-c3",
-              title: "Let's Build Something Great",
-              content:
-                "Your business deserves a website that sells. Let's talk.",
-            },
+              id: "info-c3",              title: "Let's Build Something Great",              content:
+                "Your business deserves a website that sells. Let's talk."},
           ]}
           animationType="blur-reveal"
           useInvertedBackground={false}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 1babe70..902e1c2 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -51,18 +51,16 @@ export default function HomePage() {
         <HeroBillboard
           title="Websites That Turn Visitors Into Paying Members"
           description="Elevate Web builds modern, mobile-first websites for gyms, sports clubs, and coaches—designed to look premium, load fast, and generate more inquiries."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[
             {
-              text: "Book a Free Website Review",
-              href: "/contact"
+              text: "Book a Free Website Review",              href: "/contact"
             },
             {
-              text: "See Recent Work",
-              href: "/work"
+              text: "See Recent Work",              href: "/work"
             }
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Laptop and phone mockup showing premium gym website design"
           mediaAnimation="slide-up"
         />
@@ -73,38 +71,22 @@ export default function HomePage() {
         <MetricCardOne
           title="Built for owners who want more leads—not just a prettier site."
           description=""
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="opacity"
           textboxLayout="default"
           useInvertedBackground={false}
           metrics={[
             {
-              id: "mobile-first",
-              value: "Mobile-First",
-              title: "Design",
-              description: "Premium on every screen",
-              icon: Smartphone
+              id: "mobile-first",              value: "Mobile-First",              title: "Design",              description: "Premium on every screen",              icon: Smartphone
             },
             {
-              id: "fast",
-              value: "Lightning",
-              title: "Fast",
-              description: "Speed that converts",
-              icon: Zap
+              id: "fast",              value: "Lightning",              title: "Fast",              description: "Speed that converts",              icon: Zap
             },
             {
-              id: "seo",
-              value: "Local",
-              title: "SEO-Ready",
-              description: "\"Near me\" searchable",
-              icon: MapPin
+              id: "seo",              value: "Local",              title: "SEO-Ready",              description: "\"Near me\" searchable",              icon: MapPin
             },
             {
-              id: "conversions",
-              value: "Leads",
-              title: "Conversion-Focused",
-              description: "Every detail drives action",
-              icon: Target
+              id: "conversions",              value: "Leads",              title: "Conversion-Focused",              description: "Every detail drives action",              icon: Target
             }
           ]}
         />
@@ -120,7 +102,7 @@ export default function HomePage() {
           description="If your site is slow, unclear, or hard to navigate, potential members leave. We design pages that guide visitors to one action: contact you."
           subdescription="Every second counts. Every click matters. We build websites that respect your visitor's time."
           icon={TrendingUp}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qgmuof&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qgmuof"
           imageAlt="Modern gym facility showing the quality of fitness businesses"
           mediaAnimation="slide-up"
           useInvertedBackground={false}
@@ -138,34 +120,18 @@ export default function HomePage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "View All Services",
-              href: "/services"
+              text: "View All Services",              href: "/services"
             }
           ]}
           products={[
             {
-              id: "service-design",
-              name: "Mobile-First Website Design",
-              price: "Starting at $1,500",
-              variant: "Complete websites built for gyms and fitness businesses.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=2",
-              imageAlt: "Modern website design mockup"
+              id: "service-design",              name: "Mobile-First Website Design",              price: "Starting at $1,500",              variant: "Complete websites built for gyms and fitness businesses.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "Modern website design mockup"
             },
             {
-              id: "service-landing",
-              name: "Conversion-Optimized Pages",
-              price: "Starting at $500",
-              variant: "Focused landing pages for trials, offers, and promotions.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=3",
-              imageAlt: "Landing page conversion optimization"
+              id: "service-landing",              name: "Conversion-Optimized Pages",              price: "Starting at $500",              variant: "Focused landing pages for trials, offers, and promotions.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "Landing page conversion optimization"
             },
             {
-              id: "service-seo",
-              name: "Performance & Local SEO",
-              price: "Starting at $400",
-              variant: "Fast load times and clean SEO foundations.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=4",
-              imageAlt: "SEO optimization and performance"
+              id: "service-seo",              name: "Performance & Local SEO",              price: "Starting at $400",              variant: "Fast load times and clean SEO foundations.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "SEO optimization and performance"
             }
           ]}
         />
@@ -178,30 +144,21 @@ export default function HomePage() {
           description="From review to launch in 1–3 weeks. No bloat, no delays."
           buttons={[
             {
-              text: "Start With a Review",
-              href: "/contact"
+              text: "Start With a Review",              href: "/contact"
             }
           ]}
           accordionItems={[
             {
-              id: "step-1",
-              title: "Review & Strategy",
-              content: "We analyze your current site, understand your goals, and map the fastest path to more inquiries."
+              id: "step-1",              title: "Review & Strategy",              content: "We analyze your current site, understand your goals, and map the fastest path to more inquiries."
             },
             {
-              id: "step-2",
-              title: "Design & Copy Structure",
-              content: "Clean layouts, clear messaging, and conversion funnels that guide visitors to contact you."
+              id: "step-2",              title: "Design & Copy Structure",              content: "Clean layouts, clear messaging, and conversion funnels that guide visitors to contact you."
             },
             {
-              id: "step-3",
-              title: "Build & Optimize",
-              content: "Fast, SEO-ready pages built on modern tech. Every detail tested for speed and clarity."
+              id: "step-3",              title: "Build & Optimize",              content: "Fast, SEO-ready pages built on modern tech. Every detail tested for speed and clarity."
             },
             {
-              id: "step-4",
-              title: "Launch & Track",
-              content: "Your site goes live with analytics ready. We provide launch support and optimization guidance."
+              id: "step-4",              title: "Launch & Track",              content: "Your site goes live with analytics ready. We provide launch support and optimization guidance."
             }
           ]}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=c4z8f9"
@@ -216,49 +173,23 @@ export default function HomePage() {
         <BlogCardThree
           title="Recent Builds (Sample)"
           description="Three examples that showcase our approach to design and conversion."
-          gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
           buttons={[
             {
-              text: "See All Work",
-              href: "/work"
+              text: "See All Work",              href: "/work"
             }
           ]}
           blogs={[
             {
-              id: "case-iron-horizon",
-              category: "Gym",
-              title: "Iron Horizon Gym — Trial Bookings Focus",
-              excerpt: "Rebuilt the homepage around one offer: 'Book a Free Trial Session,' with a clearer CTA flow and faster load experience.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=xgnyca&_wi=1",
-              imageAlt: "Iron Horizon Gym website case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Performance: <2.0s load target"
+              id: "case-iron-horizon",              category: "Gym",              title: "Iron Horizon Gym — Trial Bookings Focus",              excerpt: "Rebuilt the homepage around one offer: 'Book a Free Trial Session,' with a clearer CTA flow and faster load experience.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=xgnyca",              imageAlt: "Iron Horizon Gym website case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Performance: <2.0s load target"
             },
             {
-              id: "case-summit-tennis",
-              category: "Sports Club",
-              title: "Summit Tennis Club — Membership Inquiries",
-              excerpt: "Designed a modern club site with simple navigation and trust-building sections that drive member inquiries.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vbebq1&_wi=1",
-              imageAlt: "Summit Tennis Club website case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Performance: 90+ score target"
+              id: "case-summit-tennis",              category: "Sports Club",              title: "Summit Tennis Club — Membership Inquiries",              excerpt: "Designed a modern club site with simple navigation and trust-building sections that drive member inquiries.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vbebq1",              imageAlt: "Summit Tennis Club website case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Performance: 90+ score target"
             },
             {
-              id: "case-velocity",
-              category: "Coaching",
-              title: "Velocity Performance Coaching — High-Ticket Leads",
-              excerpt: "Built a clean funnel-style layout that explains the method, shows proof, and drives to a booking form.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qvywwu&_wi=1",
-              imageAlt: "Velocity Performance Coaching website case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Focus: Strong above-fold CTA"
+              id: "case-velocity",              category: "Coaching",              title: "Velocity Performance Coaching — High-Ticket Leads",              excerpt: "Built a clean funnel-style layout that explains the method, shows proof, and drives to a booking form.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qvywwu",              imageAlt: "Velocity Performance Coaching website case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Focus: Strong above-fold CTA"
             }
           ]}
         />
@@ -275,40 +206,20 @@ export default function HomePage() {
           useInvertedBackground={false}
           testimonials={[
             {
-              id: "testimonial-1",
-              name: "Sarah Mitchell",
-              role: "Gym Owner",
-              company: "Iron Horizon Gym",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=quxh22&_wi=1",
-              imageAlt: "Sarah Mitchell, gym owner"
+              id: "testimonial-1",              name: "Sarah Mitchell",              role: "Gym Owner",              company: "Iron Horizon Gym",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=quxh22",              imageAlt: "Sarah Mitchell, gym owner"
             },
             {
-              id: "testimonial-2",
-              name: "James Rodriguez",
-              role: "Sports Club Manager",
-              company: "Summit Tennis Club",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o1a57z",
-              imageAlt: "James Rodriguez, sports club manager"
+              id: "testimonial-2",              name: "James Rodriguez",              role: "Sports Club Manager",              company: "Summit Tennis Club",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o1a57z",              imageAlt: "James Rodriguez, sports club manager"
             },
             {
-              id: "testimonial-3",
-              name: "Marcus Thompson",
-              role: "Performance Coach",
-              company: "Velocity Coaching",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6fnriv",
-              imageAlt: "Marcus Thompson, performance coach"
+              id: "testimonial-3",              name: "Marcus Thompson",              role: "Performance Coach",              company: "Velocity Coaching",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6fnriv",              imageAlt: "Marcus Thompson, performance coach"
             },
             {
-              id: "testimonial-4",
-              name: "Elena Vasquez",
-              role: "Pilates Studio Owner",
-              company: "Flow Studios",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=quxh22&_wi=2",
-              imageAlt: "Elena Vasquez, pilates studio owner"
+              id: "testimonial-4",              name: "Elena Vasquez",              role: "Pilates Studio Owner",              company: "Flow Studios",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=quxh22",              imageAlt: "Elena Vasquez, pilates studio owner"
             }
           ]}
         />
@@ -324,63 +235,32 @@ export default function HomePage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "View Pricing",
-              href: "/pricing"
+              text: "View Pricing",              href: "/pricing"
             }
           ]}
           plans={[
             {
-              id: "plan-launch",
-              title: "Launch",
-              price: "$1,500",
-              period: "One-time",
-              features: [
-                "1–3 pages",
-                "Mobile-first design",
-                "Contact form",
-                "Basic SEO structure",
-                "Speed optimization",
-                "Launch support"
+              id: "plan-launch",              title: "Launch",              price: "$1,500",              period: "One-time",              features: [
+                "1–3 pages",                "Mobile-first design",                "Contact form",                "Basic SEO structure",                "Speed optimization",                "Launch support"
               ],
               button: {
-                text: "Choose Launch",
-                href: "/contact"
+                text: "Choose Launch",                href: "/contact"
               }
             },
             {
-              id: "plan-growth",
-              title: "Growth",
-              price: "$2,500",
-              period: "One-time",
-              features: [
-                "Up to 6 pages",
-                "Strong CTA flow",
-                "Portfolio/proof sections",
-                "Local SEO foundations",
-                "Analytics-ready setup",
-                "Two revision rounds"
+              id: "plan-growth",              title: "Growth",              price: "$2,500",              period: "One-time",              features: [
+                "Up to 6 pages",                "Strong CTA flow",                "Portfolio/proof sections",                "Local SEO foundations",                "Analytics-ready setup",                "Two revision rounds"
               ],
               button: {
-                text: "Choose Growth",
-                href: "/contact"
+                text: "Choose Growth",                href: "/contact"
               }
             },
             {
-              id: "plan-elite",
-              title: "Elite",
-              price: "$3,500",
-              period: "One-time",
-              features: [
-                "Up to 10 pages",
-                "Two landing pages",
-                "Stronger copy structure",
-                "Advanced performance pass",
-                "Conversion-focused layout system",
-                "Priority build"
+              id: "plan-elite",              title: "Elite",              price: "$3,500",              period: "One-time",              features: [
+                "Up to 10 pages",                "Two landing pages",                "Stronger copy structure",                "Advanced performance pass",                "Conversion-focused layout system",                "Priority build"
               ],
               button: {
-                text: "Choose Elite",
-                href: "/contact"
+                text: "Choose Elite",                href: "/contact"
               }
             }
           ]}
@@ -394,29 +274,19 @@ export default function HomePage() {
           sideDescription="Everything you need to know about working with Elevate Web."
           faqs={[
             {
-              id: "faq-1",
-              title: "How long does a new website take?",
-              content: "Most projects take 1–3 weeks depending on page count and feedback speed. We prioritize speed without cutting corners."
+              id: "faq-1",              title: "How long does a new website take?",              content: "Most projects take 1–3 weeks depending on page count and feedback speed. We prioritize speed without cutting corners."
             },
             {
-              id: "faq-2",
-              title: "Do you write the copy too?",
-              content: "Yes—at minimum we structure the messaging and refine your wording so it's clear and conversion-focused."
+              id: "faq-2",              title: "Do you write the copy too?",              content: "Yes—at minimum we structure the messaging and refine your wording so it's clear and conversion-focused."
             },
             {
-              id: "faq-3",
-              title: "Can you use my existing domain?",
-              content: "Yes. We can connect an existing domain or help you purchase one. No lock-in, full ownership."
+              id: "faq-3",              title: "Can you use my existing domain?",              content: "Yes. We can connect an existing domain or help you purchase one. No lock-in, full ownership."
             },
             {
-              id: "faq-4",
-              title: "What if I need updates after launch?",
-              content: "You can request edits anytime. We also offer simple monthly maintenance packages for ongoing improvements."
+              id: "faq-4",              title: "What if I need updates after launch?",              content: "You can request edits anytime. We also offer simple monthly maintenance packages for ongoing improvements."
             },
             {
-              id: "faq-5",
-              title: "What makes a website 'convert'?",
-              content: "Clear positioning, strong CTAs, proof (testimonials, case studies), fast load times, and a layout that guides visitors to one action."
+              id: "faq-5",              title: "What makes a website 'convert'?",              content: "Clear positioning, strong CTAs, proof (testimonials, case studies), fast load times, and a layout that guides visitors to one action."
             }
           ]}
           faqsAnimation="blur-reveal"
@@ -431,25 +301,18 @@ export default function HomePage() {
           ctaTitle="Ready to Elevate Your Website?"
           ctaDescription="Get a free review with 3 specific improvements you can apply immediately."
           ctaButton={{
-            text: "Book a Free Website Review",
-            href: "/contact"
+            text: "Book a Free Website Review",            href: "/contact"
           }}
           ctaIcon={Sparkles}
           faqs={[
             {
-              id: "info-1",
-              title: "24–48 Hour Turnaround",
-              content: "Send your site URL and we'll analyze it. You'll get a clear report with top improvements."
+              id: "info-1",              title: "24–48 Hour Turnaround",              content: "Send your site URL and we'll analyze it. You'll get a clear report with top improvements."
             },
             {
-              id: "info-2",
-              title: "No Obligation",
-              content: "The review is free. If you want to work together, we'll discuss next steps and pricing."
+              id: "info-2",              title: "No Obligation",              content: "The review is free. If you want to work together, we'll discuss next steps and pricing."
             },
             {
-              id: "info-3",
-              title: "All Fitness Businesses Welcome",
-              content: "Gyms, studios, clubs, coaches, trainers—if you serve fitness clients, we can help."
+              id: "info-3",              title: "All Fitness Businesses Welcome",              content: "Gyms, studios, clubs, coaches, trainers—if you serve fitness clients, we can help."
             }
           ]}
           animationType="blur-reveal"
diff --git a/src/app/pricing/page.tsx b/src/app/pricing/page.tsx
index 64b4efe..bcbf10b 100644
--- a/src/app/pricing/page.tsx
+++ b/src/app/pricing/page.tsx
@@ -41,14 +41,12 @@ export default function PricingPage() {
         <HeroBillboard
           title="Simple Packages for Serious Businesses"
           description="Built for gyms and service businesses that want a premium website and more inquiries."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[
             {
-              text: "Book a Free Website Review",
-              href: "/contact",
-            },
+              text: "Book a Free Website Review",              href: "/contact"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=11"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Pricing packages overview"
           mediaAnimation="slide-up"
         />
@@ -63,58 +61,22 @@ export default function PricingPage() {
           useInvertedBackground={false}
           plans={[
             {
-              id: "plan-launch-full",
-              title: "Launch",
-              price: "$1,500",
-              period: "One-time",
-              features: [
-                "1–3 pages",
-                "Mobile-first design",
-                "Contact form",
-                "Basic SEO structure",
-                "Speed optimization",
-                "Launch support",
-              ],
+              id: "plan-launch-full",              title: "Launch",              price: "$1,500",              period: "One-time",              features: [
+                "1–3 pages",                "Mobile-first design",                "Contact form",                "Basic SEO structure",                "Speed optimization",                "Launch support"],
               button: {
-                text: "Get Started",
-                href: "/contact",
-              },
+                text: "Get Started",                href: "/contact"},
             },
             {
-              id: "plan-growth-full",
-              title: "Growth",
-              price: "$2,500",
-              period: "One-time",
-              features: [
-                "Up to 6 pages",
-                "Strong CTA flow",
-                "Portfolio/proof sections",
-                "Local SEO foundations",
-                "Analytics-ready setup",
-                "Two revision rounds",
-              ],
+              id: "plan-growth-full",              title: "Growth",              price: "$2,500",              period: "One-time",              features: [
+                "Up to 6 pages",                "Strong CTA flow",                "Portfolio/proof sections",                "Local SEO foundations",                "Analytics-ready setup",                "Two revision rounds"],
               button: {
-                text: "Get Started",
-                href: "/contact",
-              },
+                text: "Get Started",                href: "/contact"},
             },
             {
-              id: "plan-elite-full",
-              title: "Elite",
-              price: "$3,500",
-              period: "One-time",
-              features: [
-                "Up to 10 pages",
-                "Two landing pages",
-                "Stronger copy structure",
-                "Advanced performance pass",
-                "Conversion-focused layout system",
-                "Priority build",
-              ],
+              id: "plan-elite-full",              title: "Elite",              price: "$3,500",              period: "One-time",              features: [
+                "Up to 10 pages",                "Two landing pages",                "Stronger copy structure",                "Advanced performance pass",                "Conversion-focused layout system",                "Priority build"],
               button: {
-                text: "Get Started",
-                href: "/contact",
-              },
+                text: "Get Started",                href: "/contact"},
             },
           ]}
         />
@@ -126,29 +88,17 @@ export default function PricingPage() {
           sideDescription="Transparent pricing with no surprises. All packages include launch support."
           faqs={[
             {
-              id: "pricing-faq-1",
-              title: "Can you start smaller?",
-              content:
-                "Yes—Launch is designed for smaller sites, and you can expand later with Growth or Elite.",
-            },
+              id: "pricing-faq-1",              title: "Can you start smaller?",              content:
+                "Yes—Launch is designed for smaller sites, and you can expand later with Growth or Elite."},
             {
-              id: "pricing-faq-2",
-              title: "Do you offer monthly maintenance?",
-              content:
-                "Yes—optional monthly updates and new landing pages. Perfect for ongoing optimization.",
-            },
+              id: "pricing-faq-2",              title: "Do you offer monthly maintenance?",              content:
+                "Yes—optional monthly updates and new landing pages. Perfect for ongoing optimization."},
             {
-              id: "pricing-faq-3",
-              title: "What if I need revisions?",
-              content:
-                "Launch includes unlimited revisions until launch. Growth includes two revision rounds post-launch.",
-            },
+              id: "pricing-faq-3",              title: "What if I need revisions?",              content:
+                "Launch includes unlimited revisions until launch. Growth includes two revision rounds post-launch."},
             {
-              id: "pricing-faq-4",
-              title: "Can I add features later?",
-              content:
-                "Absolutely. All packages are expandable. Add new pages, landing pages, or integrations anytime.",
-            },
+              id: "pricing-faq-4",              title: "Can I add features later?",              content:
+                "Absolutely. All packages are expandable. Add new pages, landing pages, or integrations anytime."},
           ]}
           faqsAnimation="blur-reveal"
           textPosition="left"
@@ -161,29 +111,18 @@ export default function PricingPage() {
           ctaTitle="Not Sure Which Package Fits?"
           ctaDescription="Book a free review and we'll recommend the best option based on your goals."
           ctaButton={{
-            text: "Book a Free Website Review",
-            href: "/contact",
-          }}
+            text: "Book a Free Website Review",            href: "/contact"}}
           ctaIcon={HelpCircle}
           faqs={[
             {
-              id: "info-p1",
-              title: "Talk to a Human",
-              content:
-                "We'll discuss your goals and recommend the right package.",
-            },
+              id: "info-p1",              title: "Talk to a Human",              content:
+                "We'll discuss your goals and recommend the right package."},
             {
-              id: "info-p2",
-              title: "Flexible Timelines",
-              content:
-                "Most projects ship in 1–3 weeks. Urgent? We can accelerate.",
-            },
+              id: "info-p2",              title: "Flexible Timelines",              content:
+                "Most projects ship in 1–3 weeks. Urgent? We can accelerate."},
             {
-              id: "info-p3",
-              title: "No Surprises",
-              content:
-                "Fixed pricing. No hidden fees. Full transparency.",
-            },
+              id: "info-p3",              title: "No Surprises",              content:
+                "Fixed pricing. No hidden fees. Full transparency."},
           ]}
           animationType="blur-reveal"
           useInvertedBackground={false}
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index b7a2791..32dca84 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -43,18 +43,16 @@ export default function ServicesPage() {
         <HeroBillboard
           title="Services Built to Grow Membership"
           description="Everything we build is designed for one thing: more inquiries, trial sign-ups, and calls."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[
             {
-              text: "Book a Free Website Review",
-              href: "/contact"
+              text: "Book a Free Website Review",              href: "/contact"
             },
             {
-              text: "View Work",
-              href: "/work"
+              text: "View Work",              href: "/work"
             }
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=5"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Web design services overview"
           mediaAnimation="slide-up"
         />
@@ -71,28 +69,13 @@ export default function ServicesPage() {
           useInvertedBackground={false}
           products={[
             {
-              id: "service-1",
-              name: "Website Design & Build",
-              price: "Complete Build",
-              variant: "A complete modern website for gyms, clubs, and coaches. Built mobile-first, structured for clarity, and optimized to convert visitors into leads.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=6",
-              imageAlt: "Website design and build service"
+              id: "service-1",              name: "Website Design & Build",              price: "Complete Build",              variant: "A complete modern website for gyms, clubs, and coaches. Built mobile-first, structured for clarity, and optimized to convert visitors into leads.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "Website design and build service"
             },
             {
-              id: "service-2",
-              name: "Conversion Landing Pages",
-              price: "Focused Pages",
-              variant: "Focused pages for ads, promotions, and trial offers. Ideal for 'Free trial week,' 'New member promo,' or 'Book an assessment.'",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=7",
-              imageAlt: "Landing page conversion optimization"
+              id: "service-2",              name: "Conversion Landing Pages",              price: "Focused Pages",              variant: "Focused pages for ads, promotions, and trial offers. Ideal for 'Free trial week,' 'New member promo,' or 'Book an assessment.'",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "Landing page conversion optimization"
             },
             {
-              id: "service-3",
-              name: "Performance & Local SEO",
-              price: "Optimization",
-              variant: "We structure your pages so Google and customers understand what you do, where you are, and how to contact you.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=8",
-              imageAlt: "Performance and SEO optimization"
+              id: "service-3",              name: "Performance & Local SEO",              price: "Optimization",              variant: "We structure your pages so Google and customers understand what you do, where you are, and how to contact you.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5",              imageAlt: "Performance and SEO optimization"
             }
           ]}
         />
@@ -105,33 +88,24 @@ export default function ServicesPage() {
           description="Scale your website as your business grows."
           buttons={[
             {
-              text: "Ask About Add-Ons",
-              href: "/contact"
+              text: "Ask About Add-Ons",              href: "/contact"
             }
           ]}
           accordionItems={[
             {
-              id: "addon-1",
-              title: "Copy Polish & Messaging Refinement",
-              content: "Professional copywriting and conversion optimization to make every word count."
+              id: "addon-1",              title: "Copy Polish & Messaging Refinement",              content: "Professional copywriting and conversion optimization to make every word count."
             },
             {
-              id: "addon-2",
-              title: "Professional Photography & Asset Upgrade",
-              content: "Premium images, video integration, and custom graphics to elevate your site."
+              id: "addon-2",              title: "Professional Photography & Asset Upgrade",              content: "Premium images, video integration, and custom graphics to elevate your site."
             },
             {
-              id: "addon-3",
-              title: "Monthly Updates & Maintenance",
-              content: "Ongoing improvements, new landing pages, and performance monitoring."
+              id: "addon-3",              title: "Monthly Updates & Maintenance",              content: "Ongoing improvements, new landing pages, and performance monitoring."
             },
             {
-              id: "addon-4",
-              title: "New Landing Pages (Post-Launch)",
-              content: "Additional focused pages for new offers, seasonal promotions, or expansion."
+              id: "addon-4",              title: "New Landing Pages (Post-Launch)",              content: "Additional focused pages for new offers, seasonal promotions, or expansion."
             }
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=9"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Add-on services options"
           mediaAnimation="opacity"
           useInvertedBackground={false}
diff --git a/src/app/work/page.tsx b/src/app/work/page.tsx
index 1adec81..71404fc 100644
--- a/src/app/work/page.tsx
+++ b/src/app/work/page.tsx
@@ -42,14 +42,12 @@ export default function WorkPage() {
         <HeroBillboard
           title="Work That Looks Premium—and Performs"
           description="These are sample builds and layouts showcasing our approach to design and conversion."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           buttons={[
             {
-              text: "Book a Free Website Review",
-              href: "/contact",
-            },
+              text: "Book a Free Website Review",              href: "/contact"},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5&_wi=10"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qkozd5"
           imageAlt="Portfolio and case studies overview"
           mediaAnimation="slide-up"
         />
@@ -59,44 +57,16 @@ export default function WorkPage() {
         <BlogCardThree
           title="Case Studies"
           description="Real examples of websites we've built for fitness and sports businesses."
-          gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
           blogs={[
             {
-              id: "case-1",
-              category: "Gym",
-              title: "Iron Horizon Gym",
-              excerpt: "Trial Bookings Focus: Rebuilt the homepage around one offer with clearer CTA flow and faster load experience.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=xgnyca&_wi=2",
-              imageAlt: "Iron Horizon Gym case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Target: <2.0s load • 3.0%+ conversions",
-            },
+              id: "case-1",              category: "Gym",              title: "Iron Horizon Gym",              excerpt: "Trial Bookings Focus: Rebuilt the homepage around one offer with clearer CTA flow and faster load experience.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=xgnyca",              imageAlt: "Iron Horizon Gym case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Target: <2.0s load • 3.0%+ conversions"},
             {
-              id: "case-2",
-              category: "Sports Club",
-              title: "Summit Tennis Club",
-              excerpt: "Membership Inquiries: Modern club site with simple navigation and trust-building sections that drive inquiries.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vbebq1&_wi=2",
-              imageAlt: "Summit Tennis Club case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Target: 90+ performance • 2x clarity",
-            },
+              id: "case-2",              category: "Sports Club",              title: "Summit Tennis Club",              excerpt: "Membership Inquiries: Modern club site with simple navigation and trust-building sections that drive inquiries.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vbebq1",              imageAlt: "Summit Tennis Club case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Target: 90+ performance • 2x clarity"},
             {
-              id: "case-3",
-              category: "Coaching",
-              title: "Velocity Performance Coaching",
-              excerpt: "High-Ticket Leads: Clean funnel-style layout that explains method, shows proof, and drives bookings.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qvywwu&_wi=2",
-              imageAlt: "Velocity Performance Coaching case study",
-              authorName: "Elevate Web",
-              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",
-              date: "Focus: Strong above-fold CTA • 5 proof blocks",
-            },
+              id: "case-3",              category: "Coaching",              title: "Velocity Performance Coaching",              excerpt: "High-Ticket Leads: Clean funnel-style layout that explains method, shows proof, and drives bookings.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=qvywwu",              imageAlt: "Velocity Performance Coaching case study",              authorName: "Elevate Web",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=10wr5n",              date: "Focus: Strong above-fold CTA • 5 proof blocks"},
           ]}
         />
       </div>
@@ -106,26 +76,15 @@ export default function WorkPage() {
           ctaTitle="Want Results Like This?"
           ctaDescription="Start with a free review and we'll map out the fastest improvements for your site."
           ctaButton={{
-            text: "Book a Free Website Review",
-            href: "/contact",
-          }}
+            text: "Book a Free Website Review",            href: "/contact"}}
           ctaIcon={Zap}
           faqs={[
             {
-              id: "info-w1",
-              title: "Custom Approach",
-              content: "No templates. Every design is tailored to your business goals and audience.",
-            },
+              id: "info-w1",              title: "Custom Approach",              content: "No templates. Every design is tailored to your business goals and audience."},
             {
-              id: "info-w2",
-              title: "Performance Guaranteed",
-              content: "We measure success by your results: faster loads, more inquiries, better rankings.",
-            },
+              id: "info-w2",              title: "Performance Guaranteed",              content: "We measure success by your results: faster loads, more inquiries, better rankings."},
             {
-              id: "info-w3",
-              title: "Start Today",
-              content: "Your free review is the first step. Ready? Let's build something great.",
-            },
+              id: "info-w3",              title: "Start Today",              content: "Your free review is the first step. Ready? Let's build something great."},
           ]}
           animationType="blur-reveal"
           useInvertedBackground={false}