diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 5399144..cd56cb9 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,31 +3,25 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import AboutMetric from '@/components/sections/about/AboutMetric';
-import TeamCardTen from '@/components/sections/team/TeamCardTen';
+import TeamCardSix from '@/components/sections/team/TeamCardSix';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
-import { Zap, Heart, Sparkles } from "lucide-react";
 
 export default function AboutPage() {
   return (
     <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarStyleApple navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Reviews", id: "/reviews" }, { name: "Contact", id: "/#contact" }]} brandName="VU Nails & Spa" />
-        <AboutMetric 
-          title="Our Story: Quality & Care"
-          metrics={[
-            { icon: Sparkles, label: "Expertise", value: "10+ Years" },
-            { icon: Heart, label: "Philosophy", value: "Affordable Luxury" },
-            { icon: Zap, label: "Environment", value: "Clean & Calm" }
-          ]}
-          metricsAnimation="slide-up"
-          useInvertedBackground={false}
-        />
-        <TeamCardTen 
+        <NavbarStyleApple navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Reviews", id: "/reviews" }, { name: "Contact", id: "/contact" }]} brandName="VU Nails & Spa" />
+        <TeamCardSix 
           title="Meet Our Professional Staff"
           tag="Friendly & Talented"
-          memberVariant="card"
-          members={[{ id: "1", name: "Natalie", role: "Lead Artist" }, { id: "2", name: "Kevin", role: "Technician" }]}
+          animationType="slide-up"
+          textboxLayout="default"
+          gridVariant="uniform-all-items-equal"
+          useInvertedBackground={false}
+          members={[
+            { id: "1", name: "Natalie", role: "Lead Artist" },
+            { id: "2", name: "Kevin", role: "Technician" }
+          ]}
         />
         <FooterBaseReveal logoText="VU Nails & Spa" columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} />
       </ReactLenis>
diff --git a/src/app/booking/page.tsx b/src/app/booking/page.tsx
index eabb766..0e78e55 100644
--- a/src/app/booking/page.tsx
+++ b/src/app/booking/page.tsx
@@ -7,9 +7,9 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 export default function BookingPage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <NavbarStyleApple 
-        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/#services" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]} 
+        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/services" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]} 
         brandName="VU Nails & Spa" 
       />
       <main className="pt-32">
@@ -18,6 +18,7 @@ export default function BookingPage() {
           description="Secure your appointment by filling out the details below. We look forward to pampering you!"
           inputs={[{ name: "name", type: "text", placeholder: "Name", required: true }, { name: "date", type: "date", placeholder: "Preferred Date", required: true }]} 
           buttonText="Book Now"
+          useInvertedBackground={false}
         />
       </main>
       <FooterBaseReveal logoText="VU Nails & Spa" columns={[]} />
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 9d28a16..fc59784 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -7,9 +7,9 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 export default function ContactPage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <NavbarStyleApple 
-        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/#services" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]} 
+        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/services" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]} 
         brandName="VU Nails & Spa" 
       />
       <main className="pt-32">
@@ -18,6 +18,7 @@ export default function ContactPage() {
           description="Have questions? Reach out to our team or call us today!"
           inputs={[{ name: "name", type: "text", placeholder: "Name", required: true }, { name: "email", type: "email", placeholder: "Email", required: true }]} 
           buttonText="Call Today"
+          useInvertedBackground={false}
         />
       </main>
       <FooterBaseReveal logoText="VU Nails & Spa" columns={[]} />
diff --git a/src/app/gallery/page.tsx b/src/app/gallery/page.tsx
index b2f0690..d0d73b1 100644
--- a/src/app/gallery/page.tsx
+++ b/src/app/gallery/page.tsx
@@ -3,36 +3,21 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 export default function GalleryPage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <ReactLenis root>
         <NavbarStyleApple
           navItems={[
             { name: "Home", id: "/" },
             { name: "Services", id: "/services" },
             { name: "Gallery", id: "/gallery" },
-            { name: "Contact", id: "/#contact" },
+            { name: "Contact", id: "/contact" },
           ]}
           brandName="VU Nails & Spa"
         />
-        <ProductCardFour
-          title="Our Gallery"
-          description="A showcase of our latest custom nail art designs and the serene atmosphere of our salon."
-          textboxLayout="default"
-          useInvertedBackground={true}
-          gridVariant="bento-grid"
-          animationType="slide-up"
-          products={[
-            { id: "1", name: "Floral Elegance", price: "", variant: "Art", imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-with-beautiful-nails_23-2149311563.jpg" },
-            { id: "2", name: "Modern Minimalist", price: "", variant: "Acrylic", imageSrc: "http://img.b2bpic.net/free-photo/female-hands-with-purple-nail-design-holding-black-cup_127675-2628.jpg" },
-            { id: "3", name: "Salon Lounge", price: "", variant: "Atmosphere", imageSrc: "http://img.b2bpic.net/free-photo/modern-reception-counter-with-classy-interior-design_482257-101081.jpg" },
-            { id: "4", name: "Neon Artistry", price: "", variant: "Art", imageSrc: "http://img.b2bpic.net/free-photo/mirror-hairdressing-salon_23-2147670185.jpg" }
-          ]}
-        />
         <FooterBaseReveal
           logoText="VU Nails & Spa"
           columns={[
diff --git a/src/app/page.tsx b/src/app/page.tsx
index afeb07b..aac1313 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,17 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
-import FaqBase from '@/components/sections/faq/FaqBase';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import PricingCardOne from '@/components/sections/pricing/PricingCardOne';
-import TeamCardSix from '@/components/sections/team/TeamCardSix';
-import TestimonialCardTwelve from '@/components/sections/testimonial/TestimonialCardTwelve';
-import { CalendarDays, MessageCircle, Star } from "lucide-react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import { Star, MessageCircle, CalendarDays } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -29,77 +22,39 @@ export default function LandingPage() {
         headingFontWeight="normal"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleApple
-      navItems={[
-        { name: "Home", id: "/" },
-        { name: "Services", id: "/#services" },
-        { name: "Booking", id: "/booking" },
-        { name: "Contact", id: "/contact" }
-      ]}
-      brandName="VU Nails & Spa"
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
+              { name: "Booking", id: "/booking" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="VU Nails & Spa"
+          />
+        </div>
 
-  <div id="hero" data-section="hero">
-      <HeroBillboard
-      background={{ variant: "radial-gradient" }}
-      title="Where Nail Art Meets Perfection"
-      description="Top-rated nail salon known for precision, creativity, and a welcoming experience. We bring your vision to life."
-      buttons={[{ text: "Book Appointment", href: "/booking" }, { text: "View Services", href: "#services" }]}
-      imageSrc="http://img.b2bpic.net/free-photo/winter-sports-gear-accessories_482257-76733.jpg"
-    />
-  </div>
+        <div id="metrics" data-section="metrics">
+          <MetricCardThree
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            metrics={[{ id: "m1", icon: Star, title: "Customer Rating", value: "4.7★" }, { id: "m2", icon: MessageCircle, title: "Reviews", value: "180+" }, { id: "m3", icon: CalendarDays, title: "Availability", value: "7 Days" }]}
+            title="Why Clients Love Us"
+            description="Consistently providing 5-star service."
+          />
+        </div>
 
-  <div id="metrics" data-section="metrics">
-      <MetricCardThree
-      animationType="slide-up"
-      textboxLayout="default"
-      metrics={[{ id: "m1", icon: Star, title: "Customer Rating", value: "4.7★" }, { id: "m2", icon: MessageCircle, title: "Reviews", value: "180+" }, { id: "m3", icon: CalendarDays, title: "Availability", value: "7 Days" }]}
-      title="Why Clients Love Us"
-      description="Consistently providing 5-star service that keeps our community coming back."
-    />
-  </div>
-
-  <div id="services" data-section="services">
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={true}
-      features={[{ title: "Custom Nail Art", description: "Intricate hand-painted designs personalized to your style.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-with-beautiful-nails_23-2149311563.jpg" }, { title: "Acrylic & Dip", description: "Long-lasting finishes applied with industry-leading precision.", imageSrc: "http://img.b2bpic.net/free-photo/female-hands-with-purple-nail-design-holding-black-cup_127675-2628.jpg" }, { title: "Spa Pedicures", description: "Indulge in a relaxing environment for total foot care.", imageSrc: "http://img.b2bpic.net/free-photo/women-having-beauty-treatment-sauna_23-2149241458.jpg" }]}
-      title="Our Signature Services"
-      description="From custom hand-painted art to relaxing spa pedicures, experience precision at every step."
-    />
-  </div>
-
-  <div id="pricing" data-section="pricing">
-      <PricingCardOne
-      animationType="slide-up"
-      textboxLayout="default"
-      plans={[{ id: "p1", badge: "Popular", price: "$45", subtitle: "Manicures", features: ["Classic Polish", "Clean Cuticle Care", "Long-Lasting Gloss"] }, { id: "p2", badge: "Artistry", price: "$65+", subtitle: "Acrylic / Dip", features: ["Full Application", "Shaping", "Custom Finish"] }, { id: "p3", badge: "Custom", price: "$80+", subtitle: "Hand-Painted Art", features: ["Consultation", "Detailed Artistry", "Premium Finishes"] }]}
-      title="Premium Quality, Affordable Prices"
-      description="Transparent pricing for high-end results that stay beautiful longer."
-    />
-  </div>
-
-  <div id="team" data-section="team">
-      <TeamCardSix
-      animationType="slide-up"
-      textboxLayout="default"
-      gridVariant="uniform-all-items-equal"
-      useInvertedBackground={true}
-      members={[{ id: "t1", name: "Natalie", role: "Lead Artist", imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-beautiful-woman-looking-camera-while-standing-counter-movie-house_613910-21690.jpg" }, { id: "t2", name: "Kevin", role: "Nail Technician", imageSrc: "http://img.b2bpic.net/free-photo/person-preparing-their-drag-outfit_23-2149490852.jpg" }, { id: "t3", name: "Tina", role: "Nail Technician", imageSrc: "http://img.b2bpic.net/free-photo/merry-young-adult-enjoying-christmas-conversation-video-call-room-decorated-festivity-celebration-talking-woman-preparing-drink-wine-kitchen-with-joyful-ornaments_482257-28400.jpg" }]}
-      title="Meet Your Nail Artists"
-      description="Friendly, professional, and dedicated to the perfect set. Meet the talent behind the designs."
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterBaseReveal
-      logoText="VU Nails & Spa"
-      columns={[{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Booking", href: "/booking" }, { label: "Contact", href: "/contact" }] }, { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Reviews", href: "/#testimonials" }] }, { title: "Business", items: [{ label: "Call: (555) 123-4567", href: "tel:5551234567" }, { label: "Address: 123 Salon St, City", href: "#" }] }]}
-      copyrightText="© 2025 VU Nails & Spa. All rights reserved."
-    />
-  </div>
+        <div id="pricing" data-section="pricing">
+          <PricingCardOne
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            plans={[{ id: "p1", badge: "Popular", price: "$45", subtitle: "Manicures", features: ["Classic Polish", "Clean Cuticle Care"] }, { id: "p2", badge: "Artistry", price: "$65+", subtitle: "Acrylic", features: ["Full Application", "Shaping"] }, { id: "p3", badge: "Custom", price: "$80+", subtitle: "Hand-Painted", features: ["Consultation", "Detailed Artistry"] }]}
+            title="Premium Quality, Affordable Prices"
+            description="Transparent pricing for high-end results."
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );
diff --git a/src/app/reviews/page.tsx b/src/app/reviews/page.tsx
index 6c6feed..4209c2d 100644
--- a/src/app/reviews/page.tsx
+++ b/src/app/reviews/page.tsx
@@ -10,12 +10,14 @@ export default function ReviewsPage() {
   return (
     <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarStyleApple navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Reviews", id: "/reviews" }, { name: "Contact", id: "/#contact" }]} brandName="VU Nails & Spa" />
+        <NavbarStyleApple navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Reviews", id: "/reviews" }, { name: "Contact", id: "/contact" }]} brandName="VU Nails & Spa" />
         <TestimonialCardTwo 
           title="What Our Loyal Customers Say"
           tag="4.7-Star Rating"
           animationType="slide-up"
           textboxLayout="default"
+          description="See why our community loves us."
+          useInvertedBackground={false}
           testimonials={[
             { id: "1", name: "Sarah J.", role: "Regular Customer", testimonial: "The best nail salon in town, always clean and professional." },
             { id: "2", name: "Emily R.", role: "Local Resident", testimonial: "Fantastic service and reasonable prices. Highly recommend!" }
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index f412078..c34ac3d 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -3,39 +3,21 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 export default function ServicesPage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="icon-arrow" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="compact" sizing="mediumLargeSizeMediumTitles" background="fluid" cardStyle="glass-elevated" primaryButtonStyle="diagonal-gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
       <ReactLenis root>
         <NavbarStyleApple
           navItems={[
             { name: "Home", id: "/" },
             { name: "Services", id: "/services" },
             { name: "Gallery", id: "/gallery" },
-            { name: "Contact", id: "/#contact" },
+            { name: "Contact", id: "/contact" },
           ]}
           brandName="VU Nails & Spa"
         />
-        <FeatureCardSix
-          title="Our Signature Nail Art Services"
-          description="We specialize in hand-painted custom nail art, high-quality acrylics, and rejuvenating spa treatments tailored to your unique style."
-          textboxLayout="default"
-          useInvertedBackground={false}
-          features={[
-            {
-              title: "Hand-Painted Custom Art",              description: "Unique, intricate designs created specifically for you by our lead artists.",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-with-beautiful-nails_23-2149311563.jpg"
-            },
-            {
-              title: "Acrylic & Dip Powders",              description: "Long-lasting, durable finishes that look natural and feel great.",              imageSrc: "http://img.b2bpic.net/free-photo/female-hands-with-purple-nail-design-holding-black-cup_127675-2628.jpg"
-            },
-            {
-              title: "Deluxe Spa Pedicures",              description: "Total relaxation with premium foot treatments in a tranquil setting.",              imageSrc: "http://img.b2bpic.net/free-photo/women-having-beauty-treatment-sauna_23-2149241458.jpg"
-            }
-          ]}
-        />
         <FooterBaseReveal
           logoText="VU Nails & Spa"
           columns={[