diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index d0caba4..5ad0a41 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,13 +1,14 @@
 "use client";
 
-import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
-import TeamCardTen from "@/components/sections/team/TeamCardTen";
+import MediaAbout from "@/components/sections/about/MediaAbout";
 import TextAbout from "@/components/sections/about/TextAbout";
+import FeatureCardTwelve from "@/components/sections/feature/FeatureCardTwelve";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Shield, Zap } from "lucide-react";
+import { Shield, Target, Award, Star, Zap, MapPin } from "lucide-react";
 
 export default function AboutPage() {
   const navItems = [
@@ -66,51 +67,129 @@ export default function AboutPage() {
         />
       </div>
 
-      <div id="about" data-section="about">
-        <TeamCardTen
-          title="Elite coaching grounded in science, delivered with passion. Your dedicated strength coach combines proven methodologies with personalized attention to build your best self."
-          tag="Meet Your Coach"
-          tagAnimation="slide-up"
-          membersAnimation="blur-reveal"
-          members={[
+      <div id="hero" data-section="hero">
+        <MediaAbout
+          title="Elite Strength Training Philosophy"
+          description="At Vinsmoke Athletics, we believe strength training is more than lifting weights—it's about building discipline, confidence, and a lifestyle that works. Founded on proven principles and delivered with personalized expertise."
+          tag="About Vinsmoke"
+          tagIcon={Shield}
+          imageSrc="http://img.b2bpic.net/free-photo/handsome-man-showing-mucles_23-2147775529.jpg"
+          imageAlt="Elite strength training at Vinsmoke Athletics"
+          buttons={[
             {
-              id: "1",              name: "Your Elite Coach",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businessman-office-3_1262-1489.jpg"},
+              text: "Explore Our Services",              href: "/services"},
           ]}
-          memberVariant="default"
           useInvertedBackground={false}
         />
       </div>
 
+      <div id="mission" data-section="mission">
+        <FeatureCardTwelve
+          features={[
+            {
+              id: "mission",              label: "Our Mission",              title: "Transform Bodies Through Disciplined Strength Training",              items: [
+                "Provide world-class coaching and personalized programs",                "Build a community of committed athletes and lifters",                "Deliver measurable results with proven methodologies"],
+              buttons: [
+                {
+                  text: "Learn More",                  href: "/contact"},
+              ],
+            },
+            {
+              id: "values",              label: "Core Values",              title: "Excellence, Accountability, and Transformation",              items: [
+                "Excellence in every training session and interaction",                "Accountability to our clients and their goals",                "Sustainable transformation through proper technique"],
+              buttons: [
+                {
+                  text: "Start Your Journey",                  href: "/contact"},
+              ],
+            },
+            {
+              id: "approach",              label: "Our Approach",              title: "Science-Backed Training Tailored to You",              items: [
+                "Evidence-based strength training principles",                "Customized programs for every fitness level",                "Consistent coaching and progressive programming"],
+              buttons: [
+                {
+                  text: "Book a Consultation",                  href: "/contact"},
+              ],
+            },
+          ]}
+          animationType="slide-up"
+          title="Why Choose Vinsmoke Athletics?"
+          description="We combine expert knowledge with personalized coaching to deliver real, lasting results."
+          textboxLayout="default"
+          useInvertedBackground={true}
+        />
+      </div>
+
       <div id="philosophy" data-section="philosophy">
         <TextAbout
-          tag="Our Philosophy"
-          tagIcon={Shield}
-          title="Structured Coaching That Delivers Real Results. Personalized training programs built on proven strength training principles, tailored to YOUR body, YOUR goals, and YOUR lifestyle."
-          useInvertedBackground={true}
+          tag="Training Philosophy"
+          tagIcon={Target}
+          title="Progressive, Personalized, and Proven. We believe in progressive overload, proper form, and adapting training to each individual's body, lifestyle, and goals. Your strength journey is unique—your training should be too."
+          useInvertedBackground={false}
           buttons={[
             {
-              text: "Explore Our Services",              href: "/services"},
+              text: "See Our Services",              href: "/services"},
           ]}
         />
       </div>
 
-      <div id="cta-about" data-section="cta-about">
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardSix
+          title="Client Success Stories"
+          description="Discover how our training has transformed the lives and fitness levels of our clients."
+          tag="Real Results"
+          tagIcon={Star}
+          testimonials={[
+            {
+              id: "1",              name: "Marcus Chen",              handle: "@marcuschen",              testimonial: "Transformed my entire approach to strength training. The personalized coaching made all the difference in my progress.",              imageSrc: "http://img.b2bpic.net/free-photo/man-doing-some-business-deal-with-client_329181-10302.jpg",              imageAlt: "Marcus Chen"},
+            {
+              id: "2",              name: "Sarah Mitchell",              handle: "@sarahmitch_fitness",              testimonial: "Finally understand proper form and progressive overload. Best investment in my health I could have made.",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-athlete-ready-run_23-2148876522.jpg",              imageAlt: "Sarah Mitchell"},
+            {
+              id: "3",              name: "David Thompson",              handle: "@davidthompson88",              testimonial: "Consistency and structure finally clicked. The customized program kept me accountable and delivered results.",              imageSrc: "http://img.b2bpic.net/free-photo/view-woman-helping-man-exercise-gym_52683-98091.jpg",              imageAlt: "David Thompson"},
+            {
+              id: "4",              name: "Jessica Liu",              handle: "@jessicaliu_trains",              testimonial: "Expert guidance cut through the confusion. Now I train smarter, not just harder. Highly recommend.",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-face-african-american-girl-looking-away_1262-3098.jpg",              imageAlt: "Jessica Liu"},
+          ]}
+          animationType="blur-reveal"
+          textboxLayout="default"
+          useInvertedBackground={true}
+          speed={40}
+          topMarqueeDirection="left"
+        />
+      </div>
+
+      <div id="cta" data-section="cta">
         <ContactCTA
           tag="Ready to Start?"
           tagIcon={Zap}
-          title="Begin Your Transformation Today"
-          description="Schedule a free consultation with our coaching team. We'll discuss your goals, assess your current fitness level, and create a personalized plan to get you results."
+          title="Begin Your Strength Journey"
+          description="Book a free consultation with our coaching team and let's build a personalized program tailored to your goals and lifestyle."
           background={{ variant: "glowing-orb" }}
           buttons={[
             {
-              text: "Book Your Free Consultation",              href: "/contact"},
+              text: "Schedule a Consultation",              href: "/contact"},
             {
-              text: "View Services",              href: "/services"},
+              text: "Learn More",              href: "/services"},
           ]}
           useInvertedBackground={false}
         />
       </div>
 
+      <div id="location" data-section="location">
+        <ContactCTA
+          tag="Visit Us"
+          tagIcon={MapPin}
+          title="488 Helmcken St, Vancouver, BC"
+          description="Located in the heart of Vancouver. Drop by to meet the team, tour our facility, and discuss your fitness goals in person."
+          background={{ variant: "plain" }}
+          buttons={[
+            {
+              text: "Get Directions",              href: "https://maps.google.com/?q=488+Helmcken+St+Vancouver+BC"},
+            {
+              text: "Contact Us",              href: "/contact"},
+          ]}
+          useInvertedBackground={true}
+        />
+      </div>
+
       <div id="footer" data-section="footer">
         <FooterSimple
           columns={footerColumns}
@@ -120,4 +199,4 @@ export default function AboutPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 22f62c8..320f5c5 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,13 +1,70 @@
 "use client";
 
+import { useState } from "react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import Link from "next/link";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import HeroBillboardTestimonial from "@/components/sections/hero/HeroBillboardTestimonial";
+import ContactSplit from "@/components/sections/contact/ContactSplit";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Zap, MapPin } from "lucide-react";
+import { Zap, MapPin, Phone, Clock } from "lucide-react";
 
 export default function ContactPage() {
+  const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
+  ];
+
+  const footerColumns = [
+    {
+      title: "Navigate",      items: [
+        { label: "Home", href: "/" },
+        { label: "About", href: "/about" },
+        { label: "Services", href: "/services" },
+        { label: "Contact", href: "/contact" },
+      ],
+    },
+    {
+      title: "Services",      items: [
+        { label: "Personal Training", href: "/services" },
+        { label: "Strength & Conditioning", href: "/services" },
+        { label: "Custom Programs", href: "/services" },
+        { label: "Book a Session", href: "/contact" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Our Philosophy", href: "/about" },
+        { label: "Contact", href: "/contact" },
+        { label: "Privacy Policy", href: "#" },
+      ],
+    },
+  ];
+
+  const [formData, setFormData] = useState({
+    name: "",    email: "",    phone: "",    message: ""});
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+    const { name, value } = e.target;
+    setFormData((prev) => ({
+      ...prev,
+      [name]: value,
+    }));
+  };
+
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    console.log("Form submitted:", formData);
+    setFormData({ name: "", email: "", phone: "", message: "" });
+  };
+
+  const handleEmailSubmit = (email: string) => {
+    console.log("Email signup:", email);
+  };
+
   return (
     <ThemeProvider
       defaultButtonVariant="hover-bubble"
@@ -21,94 +78,226 @@ export default function ContactPage() {
       secondaryButtonStyle="solid"
       headingFontWeight="extrabold"
     >
-      {/* Navbar */}
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
+          navItems={navItems}
           brandName="VINSMOKE"
-          navItems={[
-            { name: "Home", id: "/" },
-            { name: "About", id: "/about" },
-            { name: "Services", id: "/services" },
-            { name: "Contact", id: "/contact" },
-          ]}
           bottomLeftText="Vancouver, BC"
           bottomRightText="488 Helmcken St"
         />
       </div>
 
-      {/* Main CTA Section */}
-      <div id="cta" data-section="cta">
-        <ContactCTA
-          tag="Ready to Transform?"
+      <div id="hero" data-section="hero">
+        <HeroBillboardTestimonial
+          title="Get In Touch"
+          description="Ready to start your strength training journey? Reach out to our team. We'll help you book a session, answer questions, or discuss your fitness goals."
+          tag="Contact Us"
           tagIcon={Zap}
-          tagAnimation="slide-up"
-          title="Start Training Today"
-          description="Your first step toward elite strength and unshakeable confidence. Book a consultation with our coaching team and let's build your custom strength program."
-          background={{
-            variant: "plain"}}
+          background={{ variant: "glowing-orb" }}
+          imageSrc="http://img.b2bpic.net/free-photo/handsome-man-showing-mucles_23-2147775529.jpg"
+          imageAlt="Contact Vinsmoke Athletics"
+          mediaAnimation="slide-up"
+          testimonials={[
+            {
+              name: "Fast Response",              handle: "We reply within 24 hours",              testimonial: "Your inquiry matters. Our team gets back to you quickly to help you move forward.",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/man-doing-some-business-deal-with-client_329181-10302.jpg"},
+            {
+              name: "Expert Guidance",              handle: "Personalized recommendations",              testimonial: "We assess your needs and recommend the best service or program for your goals.",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-athlete-ready-run_23-2148876522.jpg"},
+          ]}
           buttons={[
             {
-              text: "Book Your Free Consultation",              href: "/contact"},
-            {
-              text: "Learn More",              href: "/services"},
+              text: "Send a Message",              href: "#contact-form"},
           ]}
           buttonAnimation="blur-reveal"
           useInvertedBackground={false}
         />
       </div>
 
-      {/* Location Section */}
+      <div id="contact-form" data-section="contact-form" className="py-20">
+        <div className="max-w-7xl mx-auto px-4 md:px-6 lg:px-8">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-12 md:gap-16">
+            {/* Contact Form */}
+            <div>
+              <h2 className="text-3xl md:text-4xl font-extrabold mb-8">Send Us a Message</h2>
+              <form onSubmit={handleSubmit} className="space-y-6">
+                <div>
+                  <label htmlFor="name" className="block text-sm font-semibold mb-2">
+                    Full Name
+                  </label>
+                  <input
+                    type="text"
+                    id="name"
+                    name="name"
+                    value={formData.name}
+                    onChange={handleChange}
+                    required
+                    className="w-full px-4 py-3 rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+                    placeholder="Your name"
+                  />
+                </div>
+                <div>
+                  <label htmlFor="email" className="block text-sm font-semibold mb-2">
+                    Email Address
+                  </label>
+                  <input
+                    type="email"
+                    id="email"
+                    name="email"
+                    value={formData.email}
+                    onChange={handleChange}
+                    required
+                    className="w-full px-4 py-3 rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+                    placeholder="your@email.com"
+                  />
+                </div>
+                <div>
+                  <label htmlFor="phone" className="block text-sm font-semibold mb-2">
+                    Phone Number
+                  </label>
+                  <input
+                    type="tel"
+                    id="phone"
+                    name="phone"
+                    value={formData.phone}
+                    onChange={handleChange}
+                    className="w-full px-4 py-3 rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+                    placeholder="(604) 555-0000"
+                  />
+                </div>
+                <div>
+                  <label htmlFor="message" className="block text-sm font-semibold mb-2">
+                    Message
+                  </label>
+                  <textarea
+                    id="message"
+                    name="message"
+                    value={formData.message}
+                    onChange={handleChange}
+                    required
+                    rows={4}
+                    className="w-full px-4 py-3 rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+                    placeholder="Tell us about your fitness goals or ask any questions..."
+                  />
+                </div>
+                <button
+                  type="submit"
+                  className="w-full bg-blue-600 text-white font-semibold py-3 rounded-lg hover:bg-blue-700 transition-colors"
+                >
+                  Send Message
+                </button>
+              </form>
+            </div>
+
+            {/* Contact Info */}
+            <div>
+              <h2 className="text-3xl md:text-4xl font-extrabold mb-8">Contact Information</h2>
+              <div className="space-y-8">
+                <div className="flex gap-4">
+                  <MapPin className="w-6 h-6 flex-shrink-0 text-blue-600 mt-1" />
+                  <div>
+                    <h3 className="font-semibold text-lg mb-2">Location</h3>
+                    <p className="text-gray-600">488 Helmcken St</p>
+                    <p className="text-gray-600">Vancouver, BC, Canada</p>
+                  </div>
+                </div>
+
+                <div className="flex gap-4">
+                  <Phone className="w-6 h-6 flex-shrink-0 text-blue-600 mt-1" />
+                  <div>
+                    <h3 className="font-semibold text-lg mb-2">Phone</h3>
+                    <p className="text-gray-600">(604) 555-0123</p>
+                    <p className="text-gray-500 text-sm">Mon-Fri: 9AM-6PM</p>
+                  </div>
+                </div>
+
+                <div className="flex gap-4">
+                  <Clock className="w-6 h-6 flex-shrink-0 text-blue-600 mt-1" />
+                  <div>
+                    <h3 className="font-semibold text-lg mb-2">Hours</h3>
+                    <p className="text-gray-600">Monday - Friday: 9AM - 6PM</p>
+                    <p className="text-gray-600">Saturday: 10AM - 4PM</p>
+                    <p className="text-gray-600">Sunday: Closed</p>
+                  </div>
+                </div>
+
+                <div className="mt-12 p-6 bg-gradient-to-br from-blue-50 to-indigo-50 rounded-lg">
+                  <h3 className="font-semibold text-lg mb-3">Visit Our Studio</h3>
+                  <p className="text-gray-700 mb-6">
+                    Stop by in person to tour our facility, meet the team, and discuss your fitness goals over a coffee.
+                  </p>
+                  <a
+                    href="https://maps.google.com/?q=488+Helmcken+St+Vancouver+BC"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="inline-block bg-blue-600 text-white font-semibold py-2 px-6 rounded-lg hover:bg-blue-700 transition-colors"
+                  >
+                    Get Directions
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div id="newsletter" data-section="newsletter">
+        <ContactSplit
+          tag="Stay Connected"
+          title="Subscribe to Our Newsletter"
+          description="Get fitness tips, training advice, and updates on our latest offerings delivered directly to your inbox."
+          background={{ variant: "animated-grid" }}
+          useInvertedBackground={true}
+          imageSrc="http://img.b2bpic.net/free-photo/handsome-man-showing-mucles_23-2147775529.jpg"
+          imageAlt="Subscribe to fitness tips"
+          mediaAnimation="slide-up"
+          inputPlaceholder="your@email.com"
+          buttonText="Subscribe"
+          onSubmit={handleEmailSubmit}
+        />
+      </div>
+
+      <div id="cta" data-section="cta">
+        <ContactCTA
+          tag="Next Steps"
+          tagIcon={Zap}
+          title="Book Your Free Consultation"
+          description="Whether you're a complete beginner or an experienced lifter, our coaching team is ready to help. Schedule your free consultation to discuss your goals and find the perfect training program."
+          background={{ variant: "glowing-orb" }}
+          buttons={[
+            {
+              text: "Schedule Consultation",              href: "#contact-form"},
+            {
+              text: "Explore Services",              href: "/services"},
+          ]}
+          useInvertedBackground={false}
+        />
+      </div>
+
       <div id="location" data-section="location">
         <ContactCTA
-          tag="Visit Our Studio"
+          tag="Find Us"
           tagIcon={MapPin}
           title="488 Helmcken St, Vancouver, BC"
-          description="Located in the heart of Vancouver. Walk in for a tour, meet the team, and discuss your fitness goals in person. We're here to help you succeed."
-          background={{
-            variant: "plain"}}
+          description="Located in the heart of Vancouver. Drop by our studio to see our training facilities and meet the team in person."
+          background={{ variant: "plain" }}
           buttons={[
             {
               text: "Get Directions",              href: "https://maps.google.com/?q=488+Helmcken+St+Vancouver+BC"},
             {
-              text: "Contact Us",              href: "/contact"},
+              text: "Back to Top",              href: "#nav"},
           ]}
           useInvertedBackground={true}
         />
       </div>
 
-      {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterSimple
-          columns={[
-            {
-              title: "Navigate",              items: [
-                { label: "Home", href: "/" },
-                { label: "About", href: "/about" },
-                { label: "Services", href: "/services" },
-                { label: "Contact", href: "/contact" },
-              ],
-            },
-            {
-              title: "Services",              items: [
-                { label: "Personal Training", href: "/services" },
-                { label: "Strength & Conditioning", href: "/services" },
-                { label: "Custom Programs", href: "/services" },
-                { label: "Book a Session", href: "/contact" },
-              ],
-            },
-            {
-              title: "Company",              items: [
-                { label: "About Us", href: "/about" },
-                { label: "Our Philosophy", href: "/services" },
-                { label: "Contact", href: "/contact" },
-                { label: "Privacy Policy", href: "#" },
-              ],
-            },
-          ]}
+          columns={footerColumns}
           bottomLeftText="© 2025 Vinsmoke Athletics. All rights reserved."
           bottomRightText="488 Helmcken St, Vancouver, BC"
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 04dca7a..cf33e9e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,1433 +1,38 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
-import { Manrope } from "next/font/google";
+import { Inter_Tight } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import { ServiceWrapper } from "@/providers/serviceWrapper/ServiceWrapper";
+import { Tag } from "@/components/tag/Tag";
 
-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});
-
-const manrope = Manrope({
-  variable: "--font-manrope",
-  subsets: ["latin"],
+const interTight = Inter_Tight({
+  variable: "--font-inter-tight",  subsets: ["latin"],
+  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
 });
 
 export const metadata: Metadata = {
-  title: "Vinsmoke Athletics | Elite Personal Training Vancouver",
-  description: "Transform your strength with elite personal training coaching in Vancouver. Personalized programs, disciplined results. Book your first session today.",
-  keywords: "personal training, strength coaching, Vancouver fitness, elite gym, personalized training programs",
-  metadataBase: new URL("https://vinsmokeathletics.com"),
-  alternates: {
-    canonical: "https://vinsmokeathletics.com",
-  },
-  openGraph: {
-    title: "Vinsmoke Athletics | Elite Personal Training",
-    description: "Strength built with discipline. Personalized coaching for real results.",
-    url: "https://vinsmokeathletics.com",
-    siteName: "Vinsmoke Athletics",
-    type: "website",
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "Vinsmoke Athletics | Elite Personal Training",
-    description: "Transform your strength with personalized coaching.",
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Vinsmoke Athletics | Elite Strength Training in Vancouver",  description:
+    "Personalized strength training and coaching at Vinsmoke Athletics in Vancouver, BC. Build real strength with expert guidance."};
 
 export default function RootLayout({
   children,
-}: Readonly<{
+}: {
   children: React.ReactNode;
-}>) {
+}) {
   return (
     <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${manrope.variable} antialiased`}
-        >
+      <body className={`${interTight.variable}`}>
+        <ServiceWrapper>
           <Tag />
           {children}
-        
+        </ServiceWrapper>
         <script
-          dangerouslySetInnerHTML={{
-            __html: `
-(function() {
-  if (window.self === window.top) return;
-
-  if (window.__webildEditorInitialized) return;
-  window.__webildEditorInitialized = true;
-
-  let isActive = false;
-  let hoveredElement = null;
-  let selectedElement = null;
-  let originalContent = null;
-  let isEditing = false;
-  let elementTypeLabel = null;
-  let hoverOverlay = null;
-  let scrollTimeout = null;
-  let isScrolling = false;
-
-  const invalidElements = ['html', 'body', 'script', 'style', 'meta', 'link', 'head', 'noscript', 'title'];
-  const hoverClass = 'webild-hover';
-  const selectedClass = 'webild-selected';
-
-  const style = document.createElement('style');
-  style.id = 'webild-inspector-styles';
-  style.textContent = '' +
-    '.webild-hover {' +
-    '  outline: 2px dashed #4d96ff80 !important;' +
-    '  border-radius: 0 !important;' +
-    '  outline-offset: 2px !important;' +
-    '  cursor: pointer !important;' +
-    '  transition: outline 0.15s ease !important;' +
-    '  background-color: #4d96ff05 !important;' +
-    '}' +
-    '.webild-selected {' +
-    '  outline: 2px solid #4d96ff !important;' +
-    '  outline-offset: 2px !important;' +
-    '  transition: outline 0.15s ease !important;' +
-    '  background-color: #4d96ff05 !important;' +
-    '  border-radius: 0 !important;' +
-    '}' +
-    '[contenteditable="true"].webild-selected {' +
-    '  outline: 2px solid #4d96ff !important;' +
-    '  background-color: #4d96ff05 !important;' +
-    '}' +
-    'img.webild-hover,' +
-    'img.webild-selected,' +
-    'video.webild-hover,' +
-    'video.webild-selected {' +
-    '  outline-offset: 2px !important;' +
-    '}' +
-    '.webild-element-type-label {' +
-    '  position: fixed !important;' +
-    '  z-index: 999999 !important;' +
-    '  background: #4d96ff !important;' +
-    '  color: white !important;' +
-    '  padding: 4px 8px !important;' +
-    '  font-size: 11px !important;' +
-    '  font-weight: 600 !important;' +
-    '  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif !important;' +
-    '  pointer-events: none !important;' +
-    '  white-space: nowrap !important;' +
-    '  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15) !important;' +
-    '  letter-spacing: 0.3px !important;' +
-    '  border: 1px solid #4d96ff20 !important;' +
-    '}' +
-    '.webild-element-type-label.label-top {' +
-    '  border-radius: 6px 6px 0 0 !important;' +
-    '}' +
-    '.webild-element-type-label.label-bottom {' +
-    '  border-radius: 0 0 6px 6px !important;' +
-    '}' +
-    '.webild-hover-overlay {' +
-    '  position: fixed !important;' +
-    '  background-color: #4d96ff15 !important;' +
-    '  pointer-events: none !important;' +
-    '  z-index: 999998 !important;' +
-    '  transition: all 0.15s ease !important;' +
-    '}';
-  document.head.appendChild(style);
-  
-  const getUniqueSelector = (element, assignId = false) => {
-    if (element.dataset && element.dataset.webildSelector) {
-      return element.dataset.webildSelector;
-    }
-    
-    const existingId = element.getAttribute('data-webild-id');
-    if (existingId) {
-      return '[data-webild-id="' + existingId + '"]';
-    }
-    
-    if (assignId) {
-      const uniqueId = 'webild-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
-      element.setAttribute('data-webild-id', uniqueId);
-      return '[data-webild-id="' + uniqueId + '"]';
-    }
-    
-    return null;
-  };
-  
-  const getSectionId = (element) => {
-    let current = element;
-    while (current && current !== document.body) {
-      const sectionId = current.getAttribute('data-section');
-      if (sectionId) {
-        return sectionId;
-      }
-      current = current.parentElement;
-    }
-    return 'hero';
-  };
-  
-  const getElementType = (element) => {
-  const tagName = element.tagName.toLowerCase();
-  const computedStyle = window.getComputedStyle(element);
-
-  if (tagName === 'img') {
-    return 'Image';
-  }
-
-  if (tagName === 'video') {
-    return 'Video';
-  }
-
-  const backgroundImage = computedStyle.backgroundImage;
-  if (backgroundImage && backgroundImage !== 'none') {
-    const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
-    if (urlMatch && urlMatch[1] && !urlMatch[1].includes('gradient')) {
-      const area = element.offsetWidth * element.offsetHeight;
-      const hasReasonableSize = area > 1000;
-      const hasFewChildren = element.children.length <= 2;
-      
-      if (hasReasonableSize && hasFewChildren) {
-        return 'Image';
-      }
-    }
-  }
-
-    if (tagName === 'button') return 'Button';
-    if (tagName === 'a' && element.getAttribute('href')) return 'Button';
-    if (element.getAttribute('role') === 'button') return 'Button';
-
-    const buttonClasses = ['btn', 'button', 'cta', 'action-button'];
-    const hasButtonClass = buttonClasses.some(cls =>
-      element.classList.contains(cls) || element.classList.contains(\`btn-\${cls}\`)
-    );
-
-    if (hasButtonClass && element.textContent && element.textContent.trim().length > 0) {
-      return 'Button';
-    }
-
-    const textTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'span', 'label', 'li'];
-    if (textTags.includes(tagName)) {
-      return 'Text';
-    }
-
-    if (tagName === 'div') {
-      const hasDirectText = Array.from(element.childNodes).some(node => 
-        node.nodeType === Node.TEXT_NODE && node.textContent && node.textContent.trim().length > 0
-      );
-      
-      if (hasDirectText && !element.querySelector('div, section, article, main, header, footer')) {
-        return 'Text';
-      }
-      
-      return 'Div';
-    }
-
-    if (tagName === 'article') {
-      return 'Article';
-    }
-
-    if (tagName === 'a' && !element.getAttribute('href')) {
-      return 'Text';
-    }
-
-    return 'Section';
-  };
-
-  const extractOriginalUrl = (url) => {
-    if (!url) return url;
-
-    if (url.includes('/_next/')) {
-      try {
-        const urlObj = new URL(url);
-        const originalPath = urlObj.searchParams.get('url');
-        if (originalPath) {
-          return originalPath;
-        }
-      } catch (e) {
-        return url;
-      }
-    }
-    
-    if (url.includes('.webild.io/')) {
-      try {
-        const urlObj = new URL(url);
-        return urlObj.pathname;
-      } catch (e) {
-        return url;
-      }
-    }
-
-    return url;
-  };
-
-  const getMediaTypeFromUrl = (url) => {
-    const videoExts = ['.mp4', '.webm', '.ogg', '.mov', '.avi', '.mkv', '.m4v', '.wmv'];
-    const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tiff', '.avif'];
-    try {
-      const pathname = new URL(url).pathname.toLowerCase();
-      if (videoExts.some(function(ext) { return pathname.endsWith(ext); })) return 'video';
-      if (imageExts.some(function(ext) { return pathname.endsWith(ext); })) return 'image';
-    } catch(e) {}
-    return 'unknown';
-  };
-
-  const swapMediaElement = (oldEl, newTag, newSrc) => {
-    const newEl = document.createElement(newTag);
-    Array.from(oldEl.attributes).forEach(function(attr) {
-      if (attr.name !== 'src' && attr.name !== 'alt' && attr.name !== 'srcset' && attr.name !== 'autoplay' && attr.name !== 'loop' && attr.name !== 'muted' && attr.name !== 'playsinline') {
-        try { newEl.setAttribute(attr.name, attr.value); } catch(e) {}
-      }
-    });
-    newEl.style.cssText = oldEl.style.cssText;
-    if (newTag === 'video') {
-      newEl.setAttribute('autoplay', '');
-      newEl.setAttribute('loop', '');
-      newEl.setAttribute('muted', '');
-      newEl.setAttribute('playsinline', '');
-    }
-    newEl.src = newSrc;
-    if (oldEl.parentNode) {
-      oldEl.parentNode.replaceChild(newEl, oldEl);
-    }
-    return newEl;
-  };
-
-  const getElementInfo = (element, assignId = false) => {
-    const rect = element.getBoundingClientRect();
-    const tagName = element.tagName.toLowerCase();
-    const selector = getUniqueSelector(element, assignId);
-    const sectionId = getSectionId(element);
-    
-    let className = undefined;
-    try {
-      if (element.className) {
-        if (typeof element.className === 'string') {
-          className = element.className;
-        } else if (element.className.baseVal !== undefined) {
-          className = element.className.baseVal;
-        }
-      }
-    } catch (e) {}
-    
-    const info = {
-      tagName: tagName,
-      id: element.id || undefined,
-      className: className,
-      selector: selector,
-      elementType: null,
-      sectionId: sectionId,
-      boundingBox: {
-        x: rect.left,
-        y: rect.top,
-        width: rect.width,
-        height: rect.height
-      }
-    };
-    
-    if (tagName === 'img') {
-      const originalSrc = extractOriginalUrl(element.src);
-      info.imageData = {
-        src: originalSrc,
-        alt: element.alt || undefined,
-        naturalWidth: element.naturalWidth,
-        naturalHeight: element.naturalHeight,
-        isBackground: false
-      };
-    }
-
-    if (tagName === 'video') {
-      const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
-      const resolvedSrc = extractOriginalUrl(rawSrc);
-      info.imageData = {
-        src: resolvedSrc,
-        alt: element.getAttribute('aria-label') || undefined,
-        isBackground: false,
-        isVideo: true
-      };
-    }
-
-    const computedStyle = window.getComputedStyle(element);
-    const backgroundImage = computedStyle.backgroundImage;
-    if (backgroundImage && backgroundImage !== 'none') {
-      const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
-      if (urlMatch) {
-        const originalBgSrc = extractOriginalUrl(urlMatch[1]);
-        if (tagName !== 'img') {
-          info.imageData = {
-            src: originalBgSrc,
-            isBackground: true
-          };
-        } else {
-          if (!info.imageData) info.imageData = {};
-          info.imageData.backgroundImageSrc = originalBgSrc;
-        }
-      }
-    }
-    
-    const elementType = getElementType(element);
-    info.elementType = elementType;
-    
-    if (elementType === 'Button') {
-      const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || '';
-      const buttonHref = element.getAttribute('href') ||
-                        element.getAttribute('data-href') ||
-                        element.getAttribute('onclick') ||
-                        element.dataset?.link ||
-                        undefined;
-
-      info.buttonData = {
-        text: buttonText,
-        href: buttonHref
-      };
-    }
-
-    if (elementType === 'Text') {
-      info.textContent = element.textContent || '';
-    }
-    
-    return info;
-  };
-  
-  const isValidElement = (element) => {
-    if (!isActive) return false;
-    const tagName = element.tagName?.toLowerCase();
-    if (invalidElements.includes(tagName)) return false;
-    const isImage = tagName === 'img';
-    const isVideo = tagName === 'video';
-    if (isImage || isVideo) return true;
-    const hasInnerHTML = element.innerHTML && element.innerHTML.trim().length > 0;
-    const hasTextContent = element.textContent && element.textContent.trim().length > 0;
-    const hasChildren = element.children && element.children.length > 0;
-    if (!hasInnerHTML && !hasTextContent && !hasChildren) {
-      return false;
-    }
-    const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
-    if (hasBackgroundImage && !hasChildren && !hasTextContent) {
-      return false;
-    }
-    
-    return true;
-  };
-
-  const getMostSpecificElement = (x, y) => {
-    const elements = document.elementsFromPoint(x, y);
-    const validElements = elements.filter(el =>
-      isValidElement(el) &&
-      !el.classList.contains('webild-hover-overlay') &&
-      !el.classList.contains('webild-element-type-label')
-    );
-
-    if (validElements.length === 0) return null;
-    const scoredElements = validElements.map(element => {
-      let score = 0;
-      const rect = element.getBoundingClientRect();
-      const tagName = element.tagName.toLowerCase();
-      const computedStyle = window.getComputedStyle(element);
-      let depth = 0;
-      let current = element;
-      while (current && current !== document.body) {
-        depth++;
-        current = current.parentElement;
-      }
-      score += depth * 2;
-      const hasDirectText = Array.from(element.childNodes).some(node => 
-        node.nodeType === Node.TEXT_NODE && node.textContent && node.textContent.trim().length > 0
-      );
-
-      const hasImages = element.tagName === 'IMG' || element.tagName === 'VIDEO' || computedStyle.backgroundImage !== 'none' || element.querySelector('img') || element.querySelector('video');
-      const isInteractive = ['BUTTON', 'A', 'INPUT', 'SELECT', 'TEXTAREA'].includes(element.tagName);
-      const hasFewChildren = element.children.length <= 3;
-      const area = rect.width * rect.height;
-      const viewportArea = window.innerWidth * window.innerHeight;
-      const isSmallElement = area < viewportArea * 0.1;
-      if (hasDirectText) score += 20;
-      if (hasImages) score += 15;
-      if (isInteractive) score += 25;
-      if (hasFewChildren) score += 10;
-      if (isSmallElement) score += 5;
-      if (area > viewportArea * 0.3) score -= 30;
-      if (element.hasAttribute('data-section')) score -= 15;
-      if (['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tagName)) score += 20;
-      if (['p', 'span', 'label'].includes(tagName)) score += 15;
-      if (tagName === 'div' && !hasDirectText && element.children.length > 2) score -= 10;
-
-      return { element, score };
-    });
-    scoredElements.sort((a, b) => b.score - a.score);
-    return scoredElements[0]?.element || validElements[0];
-  };
-
-  const isTextElement = (element) => {
-    const elementType = getElementType(element);
-    return elementType === 'Text';
-  };
-
-  const isButtonElement = (element) => {
-    const elementType = getElementType(element);
-    return elementType === 'Button';
-  };
-
-  const updateButtonText = (element, newText) => {
-    const textNodes = [];
-    const walker = document.createTreeWalker(
-      element,
-      NodeFilter.SHOW_TEXT,
-      null
-    );
-
-    let node;
-    while (node = walker.nextNode()) {
-      if (node.textContent && node.textContent.trim()) {
-        textNodes.push(node);
-      }
-    }
-
-    if (textNodes.length > 0) {
-      textNodes[0].textContent = newText;
-      for (let i = 1; i < textNodes.length; i++) {
-        textNodes[i].textContent = '';
-      }
-    } else {
-      element.textContent = newText;
-    }
-  };
-
-  const makeEditable = (element, clickEvent) => {
-    if (!isTextElement(element)) return;
-    
-    originalContent = element.textContent;
-    element.contentEditable = 'true';
-    
-    if (!element.dataset.webildOriginalWhiteSpace) {
-      const computedStyle = window.getComputedStyle(element);
-      element.dataset.webildOriginalWhiteSpace = computedStyle.whiteSpace;
-      element.dataset.webildOriginalWordWrap = computedStyle.wordWrap;
-      element.dataset.webildOriginalOverflowWrap = computedStyle.overflowWrap;
-      element.dataset.webildOriginalOverflow = computedStyle.overflow;
-    }
-    
-    element.style.whiteSpace = 'pre-wrap';
-    element.style.wordWrap = 'break-word';
-    element.style.overflowWrap = 'break-word';
-    element.style.overflow = 'visible';
-    
-    element.focus();
-    isEditing = true;
-    
-    window.parent.postMessage({
-      type: 'webild-text-editing-started',
-      data: { selector: getElementInfo(element).selector }
-    }, '*');
-    
-    const handleBeforeInput = (e) => {
-      // Prevent deletion if it would leave the element empty
-      const currentText = element.textContent || '';
-      const inputType = e.inputType;
-      
-      // Check if this is a delete operation that would leave the element empty
-      if ((inputType === 'deleteContentBackward' || inputType === 'deleteContentForward' || inputType === 'deleteByCut') && currentText.length <= 1) {
-        e.preventDefault();
-        element.textContent = ' ';
-        // Move cursor to the beginning
-        const range = document.createRange();
-        const sel = window.getSelection();
-        range.setStart(element.firstChild || element, 0);
-        range.collapse(true);
-        sel.removeAllRanges();
-        sel.addRange(range);
-      }
-    };
-    
-    const handleInput = () => {
-      const elementInfo = getElementInfo(element);
-      let currentText = element.textContent;
-      
-      // Ensure there's always at least a space to keep the element editable
-      if (currentText === '' || currentText === null || currentText.length === 0) {
-        element.textContent = ' ';
-        currentText = ' ';
-        // Move cursor to the beginning
-        try {
-          const range = document.createRange();
-          const sel = window.getSelection();
-          range.setStart(element.firstChild || element, 0);
-          range.collapse(true);
-          sel.removeAllRanges();
-          sel.addRange(range);
-        } catch (e) {
-          // Ignore cursor positioning errors
-        }
-      }
-
-      window.parent.postMessage({
-        type: 'webild-element-changed',
-        data: {
-          type: 'updateText',
-          selector: elementInfo.selector,
-          oldValue: originalContent,
-          newValue: currentText,
-          elementType: elementInfo.elementType,
-          sectionId: elementInfo.sectionId,
-          timestamp: Date.now()
-        }
-      }, '*');
-      
-      if (currentText !== originalContent) {
-        window.parent.postMessage({
-          type: 'webild-text-changed',
-          data: { 
-            selector: elementInfo.selector,
-            hasChanges: true
-          }
-        }, '*');
-      }
-    };
-    
-    element.addEventListener('beforeinput', handleBeforeInput);
-    element.addEventListener('input', handleInput);
-    element.dataset.inputHandler = 'true';
-    element.dataset.beforeInputHandler = 'true';
-    
-    if (clickEvent && element.childNodes.length > 0) {
-      try {
-        let range = null;
-        
-        if (document.caretRangeFromPoint) {
-          range = document.caretRangeFromPoint(clickEvent.clientX, clickEvent.clientY);
-        } else if (document.caretPositionFromPoint) {
-          const position = document.caretPositionFromPoint(clickEvent.clientX, clickEvent.clientY);
-          if (position) {
-            range = document.createRange();
-            range.setStart(position.offsetNode, position.offset);
-            range.collapse(true);
-          }
-        }
-        
-        if (range) {
-          const selection = window.getSelection();
-          selection.removeAllRanges();
-          selection.addRange(range);
-        }
-      } catch (e) {
-        console.warn('[Webild] Could not set caret position:', e);
-      }
-    }
-  };
-  
-  const makeUneditable = (element, save = false) => {
-    if (!element || element.contentEditable !== 'true') return;
-    
-    element.contentEditable = 'false';
-    isEditing = false;
-    
-    if (element.dataset.webildOriginalWhiteSpace) {
-      element.style.whiteSpace = element.dataset.webildOriginalWhiteSpace === 'normal' ? '' : element.dataset.webildOriginalWhiteSpace;
-      delete element.dataset.webildOriginalWhiteSpace;
-    }
-    if (element.dataset.webildOriginalWordWrap) {
-      element.style.wordWrap = element.dataset.webildOriginalWordWrap === 'normal' ? '' : element.dataset.webildOriginalWordWrap;
-      delete element.dataset.webildOriginalWordWrap;
-    }
-    if (element.dataset.webildOriginalOverflowWrap) {
-      element.style.overflowWrap = element.dataset.webildOriginalOverflowWrap === 'normal' ? '' : element.dataset.webildOriginalOverflowWrap;
-      delete element.dataset.webildOriginalOverflowWrap;
-    }
-    if (element.dataset.webildOriginalOverflow) {
-      element.style.overflow = element.dataset.webildOriginalOverflow === 'visible' ? '' : element.dataset.webildOriginalOverflow;
-      delete element.dataset.webildOriginalOverflow;
-    }
-    
-    if (element.dataset.beforeInputHandler === 'true') {
-      element.removeEventListener('beforeinput', () => {});
-      delete element.dataset.beforeInputHandler;
-    }
-    
-    if (element.dataset.inputHandler === 'true') {
-      element.removeEventListener('input', () => {});
-      delete element.dataset.inputHandler;
-    }
-    
-    window.parent.postMessage({
-      type: 'webild-text-editing-ended',
-      data: { selector: getElementInfo(element).selector }
-    }, '*');
-    
-    if (save && originalContent !== element.textContent) {
-      const elementInfo = getElementInfo(element);
-      let finalText = element.textContent;
-      
-      // Trim the final text and convert space-only to empty string for saving
-      if (finalText === ' ' || finalText.trim() === '') {
-        finalText = '';
-        // Update the actual element text to empty for display
-        element.textContent = '';
-      }
-      
-      const change = {
-        type: 'updateText',
-        selector: elementInfo.selector,
-        oldValue: originalContent,
-        newValue: finalText,
-        elementType: elementInfo.elementType,
-        sectionId: elementInfo.sectionId,
-        timestamp: Date.now()
-      };
-
-      saveChangeToStorage(change);
-
-      window.parent.postMessage({
-        type: 'webild-element-changed',
-        data: change
-      }, '*');
-    } else if (!save && originalContent !== null) {
-      element.textContent = originalContent;
-    }
-    
-    originalContent = null;
-  };
-  
-  const createHoverOverlay = (element) => {
-    const rect = element.getBoundingClientRect();
-    const overlay = document.createElement('div');
-    overlay.className = 'webild-hover-overlay';
-    overlay.style.cssText = \`
-      position: fixed !important;
-      top: \${rect.top - 2}px !important;
-      left: \${rect.left - 2}px !important;
-      width: \${rect.width + 4}px !important;
-      height: \${rect.height + 4}px !important;
-      background-color: rgba(90, 113, 230, 0.15) !important;
-      pointer-events: none !important;
-      z-index: 999998 !important;
-      transition: all 0.15s ease !important;
-    \`;
-    document.body.appendChild(overlay);
-    return overlay;
-  };
-  
-  const removeHoverOverlay = () => {
-    if (hoverOverlay) {
-      hoverOverlay.remove();
-      hoverOverlay = null;
-    }
-  };
-  
-  const showElementTypeLabel = (element, elementType) => {
-    if (!elementType) return;
-
-    removeElementTypeLabel();
-
-    const rect = element.getBoundingClientRect();
-    elementTypeLabel = document.createElement('div');
-    elementTypeLabel.className = 'webild-element-type-label';
-    const ariaLabel = element.getAttribute('aria-label');
-    let labelText;
-    
-    if (elementType === 'Div') {
-      labelText = 'Div';
-    } else if (elementType === 'Article') {
-      labelText = 'Article';
-    } else if (elementType === 'Section') {
-      labelText = ariaLabel || 'Section';
-    } else {
-      labelText = elementType;
-    }
-    
-    elementTypeLabel.textContent = labelText;
-    document.body.appendChild(elementTypeLabel);
-    const labelRect = elementTypeLabel.getBoundingClientRect();
-    let labelTop = rect.top - labelRect.height - 2;
-    let labelLeft = rect.left - 3;
-    let isLabelOnTop = true;
-    if (labelTop < 0) {
-      labelTop = rect.bottom + 1;
-      isLabelOnTop = false;
-    }
-    if (labelTop + labelRect.height > window.innerHeight) {
-      labelTop = rect.bottom - labelRect.height;
-      isLabelOnTop = false;
-      if (labelTop < 0) {
-        labelTop = rect.top;
-        isLabelOnTop = true;
-      }
-    }
-    if (labelLeft + labelRect.width > window.innerWidth) {
-      labelLeft = window.innerWidth - labelRect.width;
-    }
-    if (labelLeft < 0) {
-      labelLeft = 0;
-    }
-    if (isLabelOnTop) {
-      elementTypeLabel.classList.add('label-top');
-    } else {
-      elementTypeLabel.classList.add('label-bottom');
-    }
-
-    elementTypeLabel.style.cssText = \`
-      left: \${labelLeft}px !important;
-      top: \${labelTop}px !important;
-      transform: none !important;
-    \`;
-  };
-  
-  const removeElementTypeLabel = () => {
-    if (elementTypeLabel) {
-      elementTypeLabel.remove();
-      elementTypeLabel = null;
-    }
-  };
-  
-  const handleMouseOver = (e) => {
-    if (!isActive) return;
-
-    lastMouseX = e.clientX;
-    lastMouseY = e.clientY;
-
-    const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;
-
-    if (!isValidElement(target) || target === hoveredElement || target === selectedElement) {
-      return;
-    }
-    
-    if (hoveredElement && hoveredElement !== selectedElement) {
-      hoveredElement.classList.remove(hoverClass);
-      if (hoveredElement.dataset.webildOriginalPosition) {
-        hoveredElement.style.position = hoveredElement.dataset.webildOriginalPosition === 'none' ? '' : hoveredElement.dataset.webildOriginalPosition;
-        delete hoveredElement.dataset.webildOriginalPosition;
-      }
-      removeHoverOverlay();
-      removeElementTypeLabel();
-    }
-    
-    hoveredElement = target;
-    
-    const computedStyle = window.getComputedStyle(target);
-    const currentPosition = computedStyle.position;
-    
-    if (currentPosition === 'static' || currentPosition === '') {
-      hoveredElement.dataset.webildOriginalPosition = currentPosition || 'none';
-      hoveredElement.style.position = 'relative';
-    }
-    
-    hoveredElement.classList.add(hoverClass);
-    
-    if ((!selectedElement || selectedElement !== target) && !isScrolling) {
-      hoverOverlay = createHoverOverlay(target);
-    }
-    
-    const elementType = getElementType(target);
-    showElementTypeLabel(target, elementType);
-    
-    window.parent.postMessage({
-      type: 'webild-element-hover',
-      data: getElementInfo(target, false)
-    }, '*');
-  };
-  
-  const handleMouseOut = (e) => {
-    if (!isActive) return;
-    
-    if (hoveredElement && hoveredElement !== selectedElement) {
-      hoveredElement.classList.remove(hoverClass);
-      
-      if (hoveredElement.dataset.webildOriginalPosition) {
-        hoveredElement.style.position = hoveredElement.dataset.webildOriginalPosition === 'none' ? '' : hoveredElement.dataset.webildOriginalPosition;
-        delete hoveredElement.dataset.webildOriginalPosition;
-      }
-      
-      removeHoverOverlay();
-      removeElementTypeLabel();
-      
-      hoveredElement = null;
-      
-      window.parent.postMessage({
-        type: 'webild-element-hover',
-        data: null
-      }, '*');
-    }
-  };
-  
-  const handleClick = (e) => {
-  if (!isActive) return;
-
-  if (isEditing) {
-    e.stopPropagation();
-    return;
-  }
-
-  e.preventDefault();
-  e.stopPropagation();
-
-  const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;  
-  if (!isValidElement(target)) return;
-    
-    if (selectedElement && selectedElement !== target) {
-      makeUneditable(selectedElement, false);
-      selectedElement.classList.remove(selectedClass);
-      selectedElement.classList.remove(hoverClass);
-      
-      if (selectedElement.dataset.webildOriginalPosition) {
-        selectedElement.style.position = selectedElement.dataset.webildOriginalPosition === 'none' ? '' : selectedElement.dataset.webildOriginalPosition;
-        delete selectedElement.dataset.webildOriginalPosition;
-      }
-      
-      removeHoverOverlay();
-      removeElementTypeLabel();
-    }
-    
-    if (selectedElement === target) {
-      if (target.dataset.webildOriginalPosition) {
-        target.style.position = target.dataset.webildOriginalPosition === 'none' ? '' : target.dataset.webildOriginalPosition;
-        delete target.dataset.webildOriginalPosition;
-      }
-      
-      removeHoverOverlay();
-      removeElementTypeLabel();
-      
-      selectedElement = null;
-      window.parent.postMessage({
-        type: 'webild-element-selected',
-        data: null
-      }, '*');
-      return;
-    }
-    
-    selectedElement = target;
-    selectedElement.classList.add(selectedClass);
-    
-    removeHoverOverlay();
-    removeElementTypeLabel();
-    
-    if (hoveredElement === target) {
-      hoveredElement.classList.remove(hoverClass);
-      hoveredElement = null;
-    }
-    
-    const elementInfo = getElementInfo(target, true);
-    selectedElement.dataset.webildSelector = elementInfo.selector;
-    showElementTypeLabel(target, elementInfo.elementType);
-    
-    window.parent.postMessage({
-      type: 'webild-element-selected',
-      data: elementInfo
-    }, '*');
-    
-    if (isTextElement(target)) {
-      setTimeout(() => makeEditable(target, e), 50);
-    }
-  };
-  
-  const handleKeyDown = (e) => {
-    if (!isActive) return;
-    if (!isEditing || !selectedElement) return;
-    
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault();
-      makeUneditable(selectedElement, true);
-    } else if (e.key === 'Escape') {
-      e.preventDefault();
-      makeUneditable(selectedElement, false);
-    }
-  };
-  
-  const handleBlur = (e) => {
-    if (!isActive) return;
-    if (isEditing && selectedElement && e.target === selectedElement) {
-      makeUneditable(selectedElement, true);
-    }
-  };
-  
-  let lastMouseX = 0;
-  let lastMouseY = 0;
-
-  const handleScroll = () => {
-    if (!isActive) return;
-    
-    if (isEditing) return;
-    
-    if (selectedElement) {
-      makeUneditable(selectedElement, false);
-      selectedElement.classList.remove(selectedClass);
-      if (selectedElement.dataset.webildOriginalPosition) {
-        selectedElement.style.position = selectedElement.dataset.webildOriginalPosition === 'none' ? '' : selectedElement.dataset.webildOriginalPosition;
-        delete selectedElement.dataset.webildOriginalPosition;
-      }
-      selectedElement = null;
-
-      window.parent.postMessage({
-        type: 'webild-element-selected',
-        data: null
-      }, '*');
-    }
-
-    if (hoveredElement) {
-      hoveredElement.classList.remove(hoverClass);
-      if (hoveredElement.dataset.webildOriginalPosition) {
-        hoveredElement.style.position = hoveredElement.dataset.webildOriginalPosition === 'none' ? '' : hoveredElement.dataset.webildOriginalPosition;
-        delete hoveredElement.dataset.webildOriginalPosition;
-      }
-      hoveredElement = null;
-
-      window.parent.postMessage({
-        type: 'webild-element-hover',
-        data: null
-      }, '*');
-    }
-
-    removeHoverOverlay();
-    removeElementTypeLabel();
-
-    isScrolling = true;
-
-    if (scrollTimeout) {
-      clearTimeout(scrollTimeout);
-    }
-
-    scrollTimeout = setTimeout(() => {
-      isScrolling = false;
-
-      if (lastMouseX > 0 && lastMouseY > 0) {
-        const target = getMostSpecificElement(lastMouseX, lastMouseY);
-        if (target && isValidElement(target) && target !== selectedElement) {
-          hoveredElement = target;
-
-          const computedStyle = window.getComputedStyle(target);
-          const currentPosition = computedStyle.position;
-
-          if (currentPosition === 'static' || currentPosition === '') {
-            hoveredElement.dataset.webildOriginalPosition = currentPosition || 'none';
-            hoveredElement.style.position = 'relative';
-          }
-
-          hoveredElement.classList.add(hoverClass);
-          hoverOverlay = createHoverOverlay(target);
-
-          const elementType = getElementType(target);
-          showElementTypeLabel(target, elementType);
-
-          window.parent.postMessage({
-            type: 'webild-element-hover',
-            data: getElementInfo(target, false)
-          }, '*');
-        }
-      }
-    }, 150);
-
-    window.parent.postMessage({
-      type: 'webild-iframe-scroll'
-    }, '*');
-  };
-  
-  const getStorageKey = () => {
-    const url = new URL(window.location.href);
-    const pathParts = url.pathname.split('/').filter(Boolean);
-    return \`webild-changes-\${pathParts.join('-')}\`;
-  };
-
-  const saveChangeToStorage = (change) => {
-    try {
-      const storageKey = getStorageKey();
-      const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]');
-
-      const filteredChanges = existingChanges.filter(c => {
-        return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId);
-      });
-      filteredChanges.push(change);
-
-      localStorage.setItem(storageKey, JSON.stringify(filteredChanges));
-
-      window.parent.postMessage({
-        type: 'webild-change-saved-locally',
-        data: { change, allChanges: filteredChanges }
-      }, '*');
-    } catch (error) {
-      console.error('Failed to save change to localStorage:', error);
-    }
-  };
-
-  const clearLocalChanges = () => {
-    try {
-      const storageKey = getStorageKey();
-      localStorage.removeItem(storageKey);
-      window.parent.postMessage({
-        type: 'webild-local-changes-cleared',
-        data: {}
-      }, '*');
-    } catch (error) {
-      console.error('Failed to clear local changes:', error);
-    }
-  };
-
-  const handleMessage = (e) => {
-    if (!e.data || !e.data.type) return;
-
-    if (e.data.type === 'webild-activate-editor') {
-      if (!isActive) {
-        isActive = true;
-        window.parent.postMessage({ type: 'webild-editor-activated' }, '*');
-      }
-      return;
-    }
-
-    if (e.data.type === 'webild-deactivate-editor') {
-      if (isActive) {
-        isActive = false;
-
-        if (selectedElement) {
-          makeUneditable(selectedElement, false);
-          selectedElement.classList.remove(selectedClass);
-          selectedElement = null;
-        }
-        if (hoveredElement) {
-          hoveredElement.classList.remove(hoverClass);
-          hoveredElement = null;
-        }
-
-        removeHoverOverlay();
-        removeElementTypeLabel();
-        window.parent.postMessage({ type: 'webild-editor-deactivated' }, '*');
-      }
-      return;
-    }
-
-    if (e.data.type === 'webild-clear-local-changes') {
-      clearLocalChanges();
-      return;
-    }
-
-    if (e.data.type === 'webild-cancel-changes') {
-      try {
-        const storageKey = getStorageKey();
-        const savedChanges = localStorage.getItem(storageKey);
-        if (savedChanges) {
-          const changes = JSON.parse(savedChanges);
-          changes.forEach(change => {
-            try {
-              const element = document.querySelector(change.selector);
-              if (!element) return;
-
-              if (change.type === 'updateText') {
-                if (isTextElement(element)) {
-                  element.textContent = change.oldValue;
-                }
-              } else if (change.type === 'updateButton') {
-                if (isButtonElement(element)) {
-                  updateButtonText(element, change.oldValue);
-                }
-              } else if (change.type === 'replaceImage') {
-                const revertTag = element.tagName.toLowerCase();
-                const isBackground = revertTag !== 'img' && revertTag !== 'video';
-                if (isBackground) {
-                  element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
-                } else {
-                  const oldMediaType = getMediaTypeFromUrl(change.oldValue);
-                  if (revertTag === 'video' && oldMediaType === 'image') {
-                    swapMediaElement(element, 'img', change.oldValue);
-                  } else if (revertTag === 'img' && oldMediaType === 'video') {
-                    swapMediaElement(element, 'video', change.oldValue);
-                  } else if (revertTag === 'video') {
-                    element.src = change.oldValue;
-                    element.load();
-                  } else {
-                    element.src = change.oldValue;
-                  }
-                }
-              }
-            } catch (err) {
-              console.warn('[Webild] Failed to revert change:', err);
-            }
-          });
-        }
-        clearLocalChanges();
-      } catch (error) {
-        console.error('[Webild] Failed to cancel changes:', error);
-      }
-      return;
-    }
-
-    if (e.data.type === 'webild-update-text') {
-      const { selector, newValue, oldValue, sectionId } = e.data.data;
-      try {
-        let element = null;
-        
-        if (selectedElement && isTextElement(selectedElement)) {
-          element = selectedElement;
-        }
-        else if (selector) {
-          try {
-            element = document.querySelector(selector);
-          } catch (err) {
-            console.warn('[Webild] Invalid selector:', selector);
-          }
-        }
-        
-        if (!element && sectionId) {
-          const sectionElement = document.querySelector('[data-section="' + sectionId + '"]');
-          if (sectionElement) {
-            const textElements = sectionElement.querySelectorAll('h1, h2, h3, h4, h5, h6, p, span, a, button, div');
-            for (let i = 0; i < textElements.length; i++) {
-              const el = textElements[i];
-              if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) {
-                element = el;
-                const newSelector = getUniqueSelector(element, true);
-                if (newSelector) {
-                  element.dataset.webildSelector = newSelector;
-                }
-                break;
-              }
-            }
-          }
-        }
-        
-        if (element && isTextElement(element)) {
-          element.textContent = newValue;
-          const finalSelector = element.dataset.webildSelector || getUniqueSelector(element, true);
-          
-          window.parent.postMessage({
-            type: 'webild-text-update-success',
-            data: {
-              selector: finalSelector,
-              newValue: newValue
-            }
-          }, '*');
-        } else {
-          window.parent.postMessage({
-            type: 'webild-text-update-failed',
-            data: { selector, newValue }
-          }, '*');
-        }
-      } catch (error) {
-        window.parent.postMessage({
-          type: 'webild-text-update-failed',
-          data: { selector, newValue, error: error.message }
-        }, '*');
-      }
-      return;
-    }
-
-    if (e.data.type === 'webild-update-button') {
-      const { selector, text, href } = e.data.data;
-      try {
-        const element = document.querySelector(selector);
-        if (element && isButtonElement(element)) {
-          if (text !== undefined) {
-            updateButtonText(element, text);
-          }
-          if (href !== undefined) {
-            if (element.tagName.toLowerCase() === 'a') {
-              element.href = href;
-            } else {
-              element.setAttribute('data-href', href);
-            }
-          }
-        }
-      } catch (error) {
-        console.error('[Webild] Invalid selector for button update:', selector, error);
-      }
-      return;
-    }
-
-    if (!isActive) return;
-
-    if (e.data.type === 'webild-replace-image') {
-      const { selector, newSrc, isBackground, allowMediaTypeSwap } = e.data.data;
-      let element = null;
-
-      try {
-        element = document.querySelector(selector);
-      } catch {
-        window.parent.postMessage({
-          type: 'webild-image-replacement-error',
-          data: { selector, message: 'Invalid selector: ' + error.message, success: false }
-        }, '*');
-        return;
-      }
-
-      if (!element) {
-        window.parent.postMessage({
-          type: 'webild-image-replacement-error',
-          data: { selector, message: 'Element not found', success: false }
-        }, '*');
-        return;
-      }
-
-      try {
-        let replaced = false;
-        let oldValue = '';
-
-        if (isBackground) {
-          oldValue = window.getComputedStyle(element).backgroundImage;
-          element.style.backgroundImage = \`url('\${newSrc}')\`;
-          replaced = true;
-        } else if (element.tagName.toLowerCase() === 'img') {
-          oldValue = element.src;
-          const newMediaType = getMediaTypeFromUrl(newSrc);
-          if (newMediaType === 'video' && allowMediaTypeSwap) {
-            const swapped = swapMediaElement(element, 'video', newSrc);
-            if (selectedElement === element) selectedElement = swapped;
-            element = swapped;
-          } else {
-            element.src = newSrc;
-          }
-          replaced = true;
-        } else if (element.tagName.toLowerCase() === 'video') {
-          oldValue = element.src || element.currentSrc || '';
-          const newMediaType = getMediaTypeFromUrl(newSrc);
-          const sources = element.querySelectorAll('source');
-          if (newMediaType === 'image' && allowMediaTypeSwap) {
-            const swapped = swapMediaElement(element, 'img', newSrc);
-            if (selectedElement === element) selectedElement = swapped;
-            element = swapped;
-          } else {
-            if (sources.length > 0) {
-              sources.forEach(function(source) { source.src = newSrc; });
-              element.load();
-            } else {
-              element.src = newSrc;
-              element.load();
-            }
-          }
-          replaced = true;
-        } else {
-          const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
-          if (hasBackgroundImage) {
-            oldValue = window.getComputedStyle(element).backgroundImage;
-            element.style.backgroundImage = \`url('\${newSrc}')\`;
-            replaced = true;
-          }
-        }
-
-        if (replaced) {
-          const elementInfo = getElementInfo(element);
-
-          let cleanOldValue = oldValue;
-          if (oldValue.includes('url(')) {
-            const urlMatch = oldValue.match(/url(['"]?([^'")]+)['"]?)/);
-            if (urlMatch) {
-              cleanOldValue = urlMatch[1];
-            }
-          }
-
-          cleanOldValue = extractOriginalUrl(cleanOldValue);
-
-          const change = {
-            type: 'replaceImage',
-            selector: selector,
-            oldValue: cleanOldValue,
-            newValue: newSrc,
-            elementType: elementInfo.elementType,
-            sectionId: elementInfo.sectionId,
-            timestamp: Date.now()
-          };
-
-          saveChangeToStorage(change);
-
-          window.parent.postMessage({
-            type: 'webild-element-changed',
-            data: change
-          }, '*');
-
-          window.parent.postMessage({
-            type: 'webild-image-replaced',
-            data: { selector, newSrc, success: true }
-          }, '*');
-        } else {
-          window.parent.postMessage({
-            type: 'webild-image-replacement-error',
-            data: { selector, message: 'Could not determine how to replace image', success: false }
-          }, '*');
-        }
-      } catch (error) {
-        window.parent.postMessage({
-          type: 'webild-image-replacement-error',
-          data: { selector, message: error.message || 'Failed to replace image', success: false }
-        }, '*');
-      }
-    }
-  };
-  
-  document.addEventListener('mouseover', handleMouseOver, true);
-  document.addEventListener('mouseout', handleMouseOut, true);
-  document.addEventListener('click', handleClick, true);
-  document.addEventListener('keydown', handleKeyDown, true);
-  document.addEventListener('blur', handleBlur, true);
-  window.addEventListener('scroll', handleScroll, true);
-  window.addEventListener('message', handleMessage, true);
-  
-  let lastPathname = window.location.pathname;
-  
-  const notifyPageChange = () => {
-    window.parent.postMessage({
-      type: 'webild-page-changed',
-      data: { pathname: window.location.pathname }
-    }, '*');
-  };
-  
-  window.addEventListener('popstate', () => {
-    if (lastPathname !== window.location.pathname) {
-      lastPathname = window.location.pathname;
-      notifyPageChange();
-    }
-  }, true);
-  
-  const urlCheckInterval = setInterval(() => {
-    if (lastPathname !== window.location.pathname) {
-      lastPathname = window.location.pathname;
-      notifyPageChange();
-    }
-  }, 500);
-  
-  notifyPageChange();
-  
-  window.webildCleanup = () => {
-    isActive = false;
-    
-    if (selectedElement) {
-      makeUneditable(selectedElement, false);
-    }
-    
-    removeHoverOverlay();
-    removeElementTypeLabel();
-    
-    if (urlCheckInterval) {
-      clearInterval(urlCheckInterval);
-    }
-    
-    document.removeEventListener('mouseover', handleMouseOver, true);
-    document.removeEventListener('mouseout', handleMouseOut, true);
-    document.removeEventListener('click', handleClick, true);
-    document.removeEventListener('keydown', handleKeyDown, true);
-    document.removeEventListener('blur', handleBlur, true);
-    window.removeEventListener('scroll', handleScroll, true);
-    window.removeEventListener('message', handleMessage, true);
-    
-    document.querySelectorAll('.' + hoverClass).forEach(el => {
-      el.classList.remove(hoverClass);
-    });
-    document.querySelectorAll('.' + selectedClass).forEach(el => {
-      el.classList.remove(selectedClass);
-    });
-    
-    const styleEl = document.getElementById('webild-inspector-styles');
-    if (styleEl) styleEl.remove();
-    
-    hoveredElement = null;
-    selectedElement = null;
-  };
-  
-  window.parent.postMessage({ type: 'webild-editor-ready' }, '*');
-})();
-`
-          }}
-        />
+          async
+          src="https://cdn.jsdelivr.net/npm/gsap@3.12.2/dist/gsap.min.js"
+        ></script>
+        <script
+          async
+          src="https://cdn.jsdelivr.net/npm/gsap@3.12.2/dist/ScrollTrigger.min.js"
+        ></script>
       
         <script
           dangerouslySetInnerHTML={{
@@ -2796,7 +1401,6 @@ export default function RootLayout({
           }}
         />
       </body>
-      </ServiceWrapper>
     </html>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 09a13de..5667096 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -151,13 +151,17 @@ export default function HomePage() {
           tagIcon={Zap}
           products={[
             {
-              id: "1",              brand: "1-on-1 Coaching",              name: "Personal Training",              price: "Starting at $75/session",              rating: 5,              reviewCount: "50+",              imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg",              imageAlt: "Personal training session"},
+              id: "1",              brand: "1-on-1 Coaching",              name: "Personal Training",              price: "Starting at $75/session",              rating: 5,
+              reviewCount: "50+",              imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg",              imageAlt: "Personal training session"},
             {
-              id: "2",              brand: "Athletic Development",              name: "Strength & Conditioning",              price: "Starting at $85/session",              rating: 5,              reviewCount: "45+",              imageSrc: "http://img.b2bpic.net/free-photo/woman-exercising-weight-bench_329181-14151.jpg",              imageAlt: "Strength and conditioning training"},
+              id: "2",              brand: "Athletic Development",              name: "Strength & Conditioning",              price: "Starting at $85/session",              rating: 5,
+              reviewCount: "45+",              imageSrc: "http://img.b2bpic.net/free-photo/woman-exercising-weight-bench_329181-14151.jpg",              imageAlt: "Strength and conditioning training"},
             {
-              id: "3",              brand: "Foundation Building",              name: "Beginner Strength Programs",              price: "Starting at $199/month",              rating: 5,              reviewCount: "38+",              imageSrc: "http://img.b2bpic.net/free-photo/gym-instructor-guiding-woman-while-exercising-with-dumbbell_23-2147827468.jpg",              imageAlt: "Beginner strength training program"},
+              id: "3",              brand: "Foundation Building",              name: "Beginner Strength Programs",              price: "Starting at $199/month",              rating: 5,
+              reviewCount: "38+",              imageSrc: "http://img.b2bpic.net/free-photo/gym-instructor-guiding-woman-while-exercising-with-dumbbell_23-2147827468.jpg",              imageAlt: "Beginner strength training program"},
             {
-              id: "4",              brand: "Tailored Solutions",              name: "Customized Workout Plans",              price: "Starting at $149/month",              rating: 5,              reviewCount: "42+",              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg",              imageAlt: "Custom workout plan design"},
+              id: "4",              brand: "Tailored Solutions",              name: "Customized Workout Plans",              price: "Starting at $149/month",              rating: 5,
+              reviewCount: "42+",              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg",              imageAlt: "Custom workout plan design"},
           ]}
           gridVariant="two-columns-alternating-heights"
           animationType="slide-up"
@@ -243,4 +247,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index b3790b8..8dc4b52 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -1,15 +1,50 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import Link from "next/link";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import HeroBillboardTestimonial from "@/components/sections/hero/HeroBillboardTestimonial";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
-import TextAbout from "@/components/sections/about/TextAbout";
-import FeatureCardNine from "@/components/sections/feature/FeatureCardNine";
+import FeatureCardTwelve from "@/components/sections/feature/FeatureCardTwelve";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
+import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Zap, Shield } from "lucide-react";
+import { Zap, Shield, Target, Star, MapPin } from "lucide-react";
 
 export default function ServicesPage() {
+  const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
+  ];
+
+  const footerColumns = [
+    {
+      title: "Navigate",      items: [
+        { label: "Home", href: "/" },
+        { label: "About", href: "/about" },
+        { label: "Services", href: "/services" },
+        { label: "Contact", href: "/contact" },
+      ],
+    },
+    {
+      title: "Services",      items: [
+        { label: "Personal Training", href: "/services" },
+        { label: "Strength & Conditioning", href: "/services" },
+        { label: "Custom Programs", href: "/services" },
+        { label: "Book a Session", href: "/contact" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Our Philosophy", href: "/about" },
+        { label: "Contact", href: "/contact" },
+        { label: "Privacy Policy", href: "#" },
+      ],
+    },
+  ];
+
   return (
     <ThemeProvider
       defaultButtonVariant="hover-bubble"
@@ -23,176 +58,174 @@ export default function ServicesPage() {
       secondaryButtonStyle="solid"
       headingFontWeight="extrabold"
     >
-      {/* Navbar */}
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
+          navItems={navItems}
           brandName="VINSMOKE"
-          navItems={[
-            { name: "Home", id: "/" },
-            { name: "About", id: "/about" },
-            { name: "Services", id: "/services" },
-            { name: "Contact", id: "/contact" },
-          ]}
           bottomLeftText="Vancouver, BC"
           bottomRightText="488 Helmcken St"
         />
       </div>
 
-      {/* Services Overview Section */}
+      <div id="hero" data-section="hero">
+        <HeroBillboardTestimonial
+          title="Transform Your Strength"
+          description="Choose from our comprehensive training services designed to meet you where you are and take you where you want to be. From beginner fundamentals to elite-level conditioning."
+          tag="Our Services"
+          tagIcon={Zap}
+          background={{ variant: "glowing-orb" }}
+          imageSrc="http://img.b2bpic.net/free-photo/handsome-man-showing-mucles_23-2147775529.jpg"
+          imageAlt="Comprehensive strength training services"
+          mediaAnimation="slide-up"
+          testimonials={[
+            {
+              name: "Marcus Chen",              handle: "12-Week Program",              testimonial: "The variety and expertise across all services is unmatched. Found exactly what I needed.",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/man-doing-some-business-deal-with-client_329181-10302.jpg"},
+            {
+              name: "Sarah Mitchell",              handle: "Custom Programs",              testimonial: "Every service is tailored and professional. Worth every penny for results.",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-athlete-ready-run_23-2148876522.jpg"},
+          ]}
+          buttons={[
+            {
+              text: "Book Your First Session",              href: "/contact"},
+          ]}
+          buttonAnimation="blur-reveal"
+          useInvertedBackground={false}
+        />
+      </div>
+
       <div id="services" data-section="services">
         <ProductCardTwo
-          title="Training Services"
-          description="Choose the training approach that matches your goals and experience level."
-          tag="Our Offerings"
-          tagIcon={Zap}
+          title="Our Training Programs"
+          description="Choose the service that aligns with your fitness goals and experience level."
+          tag="Three Core Offerings"
+          tagIcon={Shield}
           products={[
             {
-              id: "1",
-              brand: "1-on-1 Coaching",
-              name: "Personal Training",
-              price: "Starting at $75/session",
-              rating: 5,
-              reviewCount: "50+",
-              imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg?_wi=2",
-              imageAlt: "Personal training session one-on-one coaching",
-            },
+              id: "1",              brand: "One-on-One Coaching",              name: "Personal Training Sessions",              price: "$75 per session",              rating: 5,
+              reviewCount: "50+",              imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg",              imageAlt: "Personal training session with expert coach"},
             {
-              id: "2",
-              brand: "Athletic Development",
-              name: "Strength & Conditioning",
-              price: "Starting at $85/session",
-              rating: 5,
-              reviewCount: "45+",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-exercising-weight-bench_329181-14151.jpg?_wi=2",
-              imageAlt: "strength and conditioning athletic training",
-            },
+              id: "2",              brand: "Athletic Development",              name: "Strength & Conditioning",              price: "$85 per session",              rating: 5,
+              reviewCount: "45+",              imageSrc: "http://img.b2bpic.net/free-photo/woman-exercising-weight-bench_329181-14151.jpg",              imageAlt: "Advanced strength and conditioning training"},
             {
-              id: "3",
-              brand: "Foundation Building",
-              name: "Beginner Strength Programs",
-              price: "Starting at $199/month",
-              rating: 5,
-              reviewCount: "38+",
-              imageSrc: "http://img.b2bpic.net/free-photo/gym-instructor-guiding-woman-while-exercising-with-dumbbell_23-2147827468.jpg?_wi=2",
-              imageAlt: "beginner fitness training foundation exercises",
-            },
+              id: "3",              brand: "Foundation Building",              name: "Beginner Strength Programs",              price: "$199 per month",              rating: 5,
+              reviewCount: "38+",              imageSrc: "http://img.b2bpic.net/free-photo/gym-instructor-guiding-woman-while-exercising-with-dumbbell_23-2147827468.jpg",              imageAlt: "Beginner-friendly strength training program"},
             {
-              id: "4",
-              brand: "Tailored Solutions",
-              name: "Customized Workout Plans",
-              price: "Starting at $149/month",
-              rating: 5,
-              reviewCount: "42+",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=2",
-              imageAlt: "customized workout plan personalized fitness",
-            },
+              id: "4",              brand: "Customized Solutions",              name: "Custom Workout Plans",              price: "$149 per month",              rating: 5,
+              reviewCount: "42+",              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg",              imageAlt: "Personalized custom workout plan design"},
           ]}
           gridVariant="two-columns-alternating-heights"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={true}
+          buttons={[
+            {
+              text: "Learn More",              href: "#details"},
+          ]}
         />
       </div>
 
-      {/* Detailed Service Breakdown */}
-      <div id="service-details" data-section="service-details">
-        <FeatureCardNine
-          title="How Our Training Programs Work"
-          description="Each program is structured for maximum results and sustainable progress."
+      <div id="details" data-section="details">
+        <FeatureCardTwelve
           features={[
             {
-              id: 1,
-              title: "Assessment & Planning",
-              description: "We start with a comprehensive assessment of your fitness level, goals, and lifestyle. This informs your personalized training program designed specifically for YOU.",
-              phoneOne: {
-                imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg?_wi=3",
-              },
-              phoneTwo: {
-                imageSrc: "http://img.b2bpic.net/free-photo/young-friends-working-together-fitness-class_23-2148284916.jpg?_wi=4",
-              },
+              id: "personal-training",              label: "Personal Training",              title: "One-on-One Personalized Coaching",              items: [
+                "Expert form correction and real-time feedback",                "Customized workout programs for your goals",                "Progressive programming with built-in accountability",                "Flexible scheduling and online or in-studio options"],
+              buttons: [
+                {
+                  text: "Book a Session",                  href: "/contact"},
+              ],
             },
             {
-              id: 2,
-              title: "Structured Programming",
-              description: "Your workouts follow proven periodization principles. Progressive overload, proper form, and strategic recovery built into every session for optimal gains.",
-              phoneOne: {
-                imageSrc: "http://img.b2bpic.net/free-photo/woman-exercising-weight-bench_329181-14151.jpg?_wi=3",
-              },
-              phoneTwo: {
-                imageSrc: "http://img.b2bpic.net/free-photo/gym-instructor-guiding-woman-while-exercising-with-dumbbell_23-2147827468.jpg?_wi=3",
-              },
+              id: "strength-conditioning",              label: "Strength & Conditioning",              title: "Athletic Development and Performance",              items: [
+                "Sport-specific training and conditioning protocols",                "Injury prevention and mobility work integrated",                "Periodized programs for peak performance",                "Perfect for athletes and serious lifters"],
+              buttons: [
+                {
+                  text: "Schedule Training",                  href: "/contact"},
+              ],
             },
             {
-              id: 3,
-              title: "Accountability & Coaching",
-              description: "Regular check-ins, form corrections, and program adjustments keep you on track. Your coach monitors progress and adapts your program as you get stronger.",
-              phoneOne: {
-                imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=3",
-              },
-              phoneTwo: {
-                imageSrc: "http://img.b2bpic.net/free-photo/crop-closeup-portrait-woman-exercising-gym_651396-1078.jpg?_wi=4",
-              },
+              id: "custom-programs",              label: "Custom Programs",              title: "Tailored Workout Plans for Your Lifestyle",              items: [
+                "Personalized programs based on your unique situation",                "Adaptable to your schedule and equipment access",                "Ongoing support and program adjustments",                "Best value for long-term consistency"],
+              buttons: [
+                {
+                  text: "Start Your Program",                  href: "/contact"},
+              ],
             },
           ]}
-          showStepNumbers={true}
-          textboxLayout="default"
           animationType="slide-up"
+          title="Service Details"
+          description="Explore the specifics of each service and find the perfect fit for your fitness journey."
+          textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      {/* Philosophy Section */}
-      <div id="philosophy" data-section="philosophy">
-        <TextAbout
-          tag="Our Approach"
-          tagIcon={Shield}
-          title="We believe in strength training built on science, delivered with expertise, and maintained through discipline. Every program is personalized, every session is purposeful, and every result is earned."
-          useInvertedBackground={true}
-          buttons={[
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardSix
+          title="What Clients Say About Our Services"
+          description="Real results from real people who have experienced our training firsthand."
+          tag="Client Testimonials"
+          tagIcon={Star}
+          testimonials={[
             {
-              text: "Book Your Consultation",
-              href: "/contact",
-            },
+              id: "1",              name: "Marcus Chen",              handle: "@marcuschen",              testimonial: "The personal training sessions transformed my approach. Expert guidance every step of the way.",              imageSrc: "http://img.b2bpic.net/free-photo/man-doing-some-business-deal-with-client_329181-10302.jpg",              imageAlt: "Marcus Chen"},
+            {
+              id: "2",              name: "Sarah Mitchell",              handle: "@sarahmitch_fitness",              testimonial: "The custom program adjusted perfectly to my schedule. Consistency finally stuck!",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-athlete-ready-run_23-2148876522.jpg",              imageAlt: "Sarah Mitchell"},
+            {
+              id: "3",              name: "David Thompson",              handle: "@davidthompson88",              testimonial: "Strength & Conditioning elevated my athletic performance. Sport-specific training is game-changing.",              imageSrc: "http://img.b2bpic.net/free-photo/view-woman-helping-man-exercise-gym_52683-98091.jpg",              imageAlt: "David Thompson"},
+            {
+              id: "4",              name: "Jessica Liu",              handle: "@jessicaliu_trains",              testimonial: "All three services exceeded expectations. Quality coaching across the board.",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-face-african-american-girl-looking-away_1262-3098.jpg",              imageAlt: "Jessica Liu"},
           ]}
+          animationType="blur-reveal"
+          textboxLayout="default"
+          useInvertedBackground={true}
+          speed={40}
+          topMarqueeDirection="left"
+        />
+      </div>
+
+      <div id="cta" data-section="cta">
+        <ContactCTA
+          tag="Ready to Get Started?"
+          tagIcon={Zap}
+          title="Choose Your Service and Begin Today"
+          description="Book a consultation to discuss which service is best for your goals. Our coaching team will help you select the perfect program and get you started on your transformation."
+          background={{ variant: "glowing-orb" }}
+          buttons={[
+            {
+              text: "Book a Consultation",              href: "/contact"},
+            {
+              text: "View Pricing",              href: "#services"},
+          ]}
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="location" data-section="location">
+        <ContactCTA
+          tag="Visit Our Studio"
+          tagIcon={MapPin}
+          title="488 Helmcken St, Vancouver, BC"
+          description="Stop by our Vancouver location to meet the team, see our facility, and learn more about our services in person."
+          background={{ variant: "plain" }}
+          buttons={[
+            {
+              text: "Get Directions",              href: "https://maps.google.com/?q=488+Helmcken+St+Vancouver+BC"},
+            {
+              text: "Contact Us",              href: "/contact"},
+          ]}
+          useInvertedBackground={true}
         />
       </div>
 
-      {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterSimple
-          columns={[
-            {
-              title: "Navigate",
-              items: [
-                { label: "Home", href: "/" },
-                { label: "About", href: "/about" },
-                { label: "Services", href: "/services" },
-                { label: "Contact", href: "/contact" },
-              ],
-            },
-            {
-              title: "Services",
-              items: [
-                { label: "Personal Training", href: "/services" },
-                { label: "Strength & Conditioning", href: "/services" },
-                { label: "Custom Programs", href: "/services" },
-                { label: "Book a Session", href: "/contact" },
-              ],
-            },
-            {
-              title: "Company",
-              items: [
-                { label: "About Us", href: "/about" },
-                { label: "Our Philosophy", href: "/services" },
-                { label: "Contact", href: "/contact" },
-                { label: "Privacy Policy", href: "#" },
-              ],
-            },
-          ]}
+          columns={footerColumns}
           bottomLeftText="© 2025 Vinsmoke Athletics. All rights reserved."
           bottomRightText="488 Helmcken St, Vancouver, BC"
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/styles/variables.css b/src/app/styles/variables.css
index 018e8e2..167cfb2 100644
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #000000;
-  --card: #0c0c0c;
+  --background: #0a0a0a;
+  --card: #1a1a1a;
   --foreground: #ffffff;
-  --primary-cta: #106EFB;
+  --primary-cta: #e34400;
   --primary-cta-text: #ffffff;
-  --secondary-cta: #000000;
+  --secondary-cta: #1a1a1a;
   --secondary-cta-text: #ffffff;
-  --accent: #535353;
-  --background-accent: #106EFB;
+  --accent: #e34400;
+  --background-accent: #e34400;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);