diff --git a/src/app/page.tsx b/src/app/page.tsx
index 749a141..b97772f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,16 +1,16 @@
 "use client";
 
 import ReactLenis from "lenis/react";
-import HeroCentered from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
+import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import FeatureBorderGlow from "@/components/sections/feature/FeatureCardTen";
+import FeatureCardTen from "@/components/sections/feature/FeatureCardTen";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardSix";
-import PricingCardEight from "@/components/sections/pricing/PricingCardOne";
-import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
-import ContactCenter from "@/components/sections/contact/ContactSplitForm";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
+import PricingCardOne from "@/components/sections/pricing/PricingCardOne";
+import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
+import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
 import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
-import { Zap, Shield, Rocket, Target, Sparkles, Crown, Mail, Users, CalendarCheck, Music, ClipboardList, BarChart3, Globe } from "lucide-react";
+import { Music, Sparkles, ClipboardList, Users } from "lucide-react";
 
 export default function SaasTemplatePage() {
     const navItems = [
@@ -21,21 +21,15 @@ export default function SaasTemplatePage() {
         { name: "Contact", id: "contact" },
     ];
 
-    const avatars = [
-        { src: "http://img.b2bpic.net/free-photo/woman-holding-headphones-head-shopping-mall_23-2148397215.jpg", alt: "Agent 1" },
-        { src: "http://img.b2bpic.net/free-photo/close-up-person-working-alternative-energy_23-2149311496.jpg", alt: "Agent 2" },
-        { src: "http://img.b2bpic.net/free-photo/online-shopping-cute-cheerful-young-woman-smiling-holding-smartphone-showing-peace-vsign-camera-standing-against-blue-background_1258-123594.jpg", alt: "Agent 3" },
-        { src: "http://img.b2bpic.net/free-photo/cheerful-man-with-diagram_23-2147669294.jpg", alt: "Agent 4" },
-    ];
-
     return (
         <ThemeProvider defaultButtonVariant="hover-bubble" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="gradient-bordered" primaryButtonStyle="primary-glow" secondaryButtonStyle="layered" headingFontWeight="medium">
             <ReactLenis root>
                 <NavbarLayoutFloatingInline
                     navItems={navItems}
                     brandName="GigFlow"
+                    button={{ text: "Get Started", href: "#contact" }}
                 />
-                <HeroCentered
+                <HeroCarouselLogo
                     logoText="GigFlow"
                     description="The ultimate B2B operating system for music booking agents. Automate show contracts, manage artist rosters, and track commissions in real-time."
                     buttons={[
@@ -47,69 +41,71 @@ export default function SaasTemplatePage() {
                         { imageSrc: "http://img.b2bpic.net/free-photo/booking-agent-office_23-2149023412.jpg", imageAlt: "Management" }
                     ]}
                 />
-                <FeatureBorderGlow
-                    id="features"
-                    data-section="features"
-                    tag="Powerful Tools"
-                    tagIcon={Music}
-                    title="Designed for Booking Professionals"
-                    description="Move beyond spreadsheets with an industry-grade platform built specifically for the complexities of live music booking."
-                    animationType="slide-up"
-                    textboxLayout="default"
-                    useInvertedBackground={false}
-                    features={[
-                        { icon: ClipboardList, title: "Smart Contract Automation", description: "Draft, send, and track show contracts with automated reminders and e-signatures built-in.", media: { imageSrc: "http://img.b2bpic.net/free-photo/contract-signing_23-2148737299.jpg" }, items: [] },
-                        { icon: Users, title: "Centralized Artist Management", description: "Organize your entire roster's tour dates, contact info, and availability in one searchable database.", media: { imageSrc: "http://img.b2bpic.net/free-photo/roster-management_23-2149102434.jpg" }, items: [] }
-                    ]}
-                />
-                <MetricCardEleven
-                    id="metrics"
-                    data-section="metrics"
-                    title="Impact by the Numbers"
-                    description="Quantifiable growth for modern booking agencies."
-                    animationType="slide-up"
-                    useInvertedBackground={true}
-                    metrics={[
-                        { id: "m1", value: "50%", title: "Less Admin Time", description: "Average reduction in contract processing time per show.", imageSrc: "http://img.b2bpic.net/free-photo/graph-analytics_23-2149234123.jpg" },
-                        { id: "m2", value: "10x", title: "Scaling Potential", description: "Manage ten times the number of shows with the same team size.", imageSrc: "http://img.b2bpic.net/free-photo/scaling-growth_23-2149293412.jpg" },
-                        { id: "m3", value: "99.9%", title: "Data Accuracy", description: "Eliminate human error in commission and deal calculations.", imageSrc: "http://img.b2bpic.net/free-photo/data-accuracy_23-2149342412.jpg" }
-                    ]}
-                />
-                <TestimonialCardFifteen
-                    id="testimonials"
-                    data-section="testimonials"
-                    title="Voices of Success"
-                    animationType="slide-up"
-                    useInvertedBackground={false}
-                    testimonials={[
-                        { id: "t1", name: "Marcus Thorne", handle: "@apex_talent", testimonial: "GigFlow saved our agency 20+ hours of admin work per week.", imageSrc: "http://img.b2bpic.net/free-photo/man-in-suit_23-2149123123.jpg" }
-                    ]}
-                />
-                <PricingCardEight
-                    id="pricing"
-                    data-section="pricing"
-                    tag="Transparent Pricing"
-                    tagIcon={Sparkles}
-                    title="Plans Tailored for Your Growth"
-                    animationType="opacity"
-                    useInvertedBackground={false}
-                    plans={[
-                        { id: "solo", badge: "Solo Agent", price: "$49/mo", subtitle: "Perfect for freelancers", features: ["10 Artists", "Basic Contracts"] },
-                        { id: "growth", badge: "Growth", price: "$149/mo", subtitle: "Best for teams", features: ["Unlimited Artists", "Priority Support"] }
-                    ]}
-                />
-                <ContactCenter
-                    id="contact"
-                    data-section="contact"
-                    title="Ready to Streamline Your Agency?"
-                    description="See how GigFlow can reduce your admin overhead."
-                    inputs={[
-                        { name: "email", type: "email", placeholder: "Business Email", required: true },
-                        { name: "name", type: "text", placeholder: "Full Name", required: true }
-                    ]}
-                    useInvertedBackground={true}
-                />
-                <FooterBaseReveal
+                <div id="features" data-section="features">
+                    <FeatureCardTen
+                        tag="Powerful Tools"
+                        tagIcon={Music}
+                        title="Designed for Booking Professionals"
+                        description="Move beyond spreadsheets with an industry-grade platform built specifically for the complexities of live music booking."
+                        animationType="slide-up"
+                        textboxLayout="default"
+                        useInvertedBackground={false}
+                        features={[
+                            { title: "Smart Contract Automation", description: "Draft, send, and track show contracts with automated reminders and e-signatures built-in.", media: { imageSrc: "http://img.b2bpic.net/free-photo/contract-signing_23-2148737299.jpg" }, items: [{ icon: ClipboardList, text: "E-signatures" }, { icon: ClipboardList, text: "Reminders" }], reverse: false },
+                            { title: "Centralized Artist Management", description: "Organize your entire roster's tour dates, contact info, and availability in one searchable database.", media: { imageSrc: "http://img.b2bpic.net/free-photo/roster-management_23-2149102434.jpg" }, items: [{ icon: Users, text: "Roster Management" }, { icon: Users, text: "Searchable Database" }], reverse: true }
+                        ]}
+                    />
+                </div>
+                <div id="metrics" data-section="metrics">
+                    <MetricCardEleven
+                        title="Impact by the Numbers"
+                        description="Quantifiable growth for modern booking agencies."
+                        animationType="slide-up"
+                        useInvertedBackground={true}
+                        metrics={[
+                            { id: "m1", value: "50%", title: "Less Admin Time", description: "Average reduction in contract processing time per show.", imageSrc: "http://img.b2bpic.net/free-photo/graph-analytics_23-2149234123.jpg" },
+                            { id: "m2", value: "10x", title: "Scaling Potential", description: "Manage ten times the number of shows with the same team size.", imageSrc: "http://img.b2bpic.net/free-photo/scaling-growth_23-2149293412.jpg" },
+                            { id: "m3", value: "99.9%", title: "Data Accuracy", description: "Eliminate human error in commission and deal calculations.", imageSrc: "http://img.b2bpic.net/free-photo/data-accuracy_23-2149342412.jpg" }
+                        ]}
+                    />
+                </div>
+                <div id="testimonials" data-section="testimonials">
+                    <TestimonialCardSix
+                        title="Voices of Success"
+                        animationType="slide-up"
+                        useInvertedBackground={false}
+                        textboxLayout="default"
+                        testimonials={[
+                            { id: "t1", name: "Marcus Thorne", handle: "@apex_talent", testimonial: "GigFlow saved our agency 20+ hours of admin work per week.", imageSrc: "http://img.b2bpic.net/free-photo/man-in-suit_23-2149123123.jpg" }
+                        ]}
+                    />
+                </div>
+                <div id="pricing" data-section="pricing">
+                    <PricingCardOne
+                        tag="Transparent Pricing"
+                        tagIcon={Sparkles}
+                        title="Plans Tailored for Your Growth"
+                        animationType="slide-up"
+                        textboxLayout="default"
+                        useInvertedBackground={false}
+                        plans={[
+                            { id: "solo", badge: "Solo Agent", price: "$49/mo", subtitle: "Perfect for freelancers", features: ["10 Artists", "Basic Contracts"] },
+                            { id: "growth", badge: "Growth", price: "$149/mo", subtitle: "Best for teams", features: ["Unlimited Artists", "Priority Support"] }
+                        ]}
+                    />
+                </div>
+                <div id="contact" data-section="contact">
+                    <ContactSplitForm
+                        title="Ready to Streamline Your Agency?"
+                        description="See how GigFlow can reduce your admin overhead."
+                        inputs={[
+                            { name: "email", type: "email", placeholder: "Business Email", required: true },
+                            { name: "name", type: "text", placeholder: "Full Name", required: true }
+                        ]}
+                        useInvertedBackground={true}
+                    />
+                </div>
+                <FooterBaseCard
                     logoText="GigFlow"
                     columns={[
                         { title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }] },