diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 02003b8..7d9dac2 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,11 +3,12 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import SplitAbout from "@/components/sections/about/SplitAbout";
-import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
-import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
+import FaqDouble from "@/components/sections/faq/FaqDouble";
+import ContactSplit from "@/components/sections/contact/ContactSplit";
 import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
-import { Sparkles, Star, Shield } from "lucide-react";
+import { Zap, Sparkles, Award, Users, Headphones, HelpCircle, Mail } from "lucide-react";
 
 const navItems = [
   { name: "Home", id: "home" },
@@ -71,40 +72,62 @@ export default function AboutPage() {
         <NavbarStyleApple brandName="GamingPC Hub" navItems={navItems} />
       </div>
 
-      {/* About Section - Extended */}
-      <div id="about-section" data-section="about-section" className="bg-gray-900 bg-opacity-50 py-16 md:py-24">
-        <SplitAbout
-          title="Our Mission: Democratizing Gaming PC Knowledge"
-          description="Founded in 2020, Gaming PC Hub emerged from a passion to make high-performance gaming accessible to everyone. We believe that every gamer, streamer, and content creator deserves expert guidance to build the perfect system. Our mission is to provide transparent, comprehensive information about gaming hardware components, unbiased reviews, and personalized recommendations that empower our community to make informed decisions."
-          tag="OUR MISSION"
+      {/* Hero Section */}
+      <div id="hero" data-section="hero" className="relative overflow-hidden py-20 md:py-32 lg:py-40">
+        <HeroBillboardGallery
+          title="About Gaming PC Hub"
+          description="Discover our story, mission, and passion for gaming excellence. We're dedicated to empowering gamers and content creators worldwide."
+          background={{ variant: "gradient-bars" }}
+          tag="OUR JOURNEY"
           tagIcon={Sparkles}
           tagAnimation="blur-reveal"
-          buttons={[{ text: "Join Our Community", href: "/contact" }]}
+          buttons={[
+            { text: "Get Started", href: "/products" },
+            { text: "Learn More", href: "#about-section" },
+          ]}
+          buttonAnimation="slide-up"
+          mediaItems={[
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-photograph-of-a-modern-gami-1773406109243-5d63256c.png",              imageAlt: "Gaming PC Hub team and office environment"},
+          ]}
+          mediaAnimation="blur-reveal"
+          className="w-full"
+          containerClassName="px-4 md:px-8"
+          textBoxClassName="max-w-2xl"
+          titleClassName="text-5xl md:text-7xl font-bold tracking-tight"
+          descriptionClassName="text-lg md:text-xl text-gray-300 mt-6"
+          tagClassName="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-opacity-10 border border-current"
+          buttonContainerClassName="flex flex-col md:flex-row gap-4 mt-8"
+          buttonClassName="px-8 py-3 rounded-lg font-semibold transition-all duration-300"
+        />
+      </div>
+
+      {/* About Section */}
+      <div id="about-section" data-section="about-section" className="bg-gray-900 bg-opacity-50 py-16 md:py-24">
+        <SplitAbout
+          title="Who We Are"
+          description="Gaming PC Hub is the premier destination for gaming PC information, reviews, and premium hardware solutions. Since our founding in 2020, we've been committed to helping gamers and content creators build systems that exceed their expectations."
+          tag="OUR STORY"
+          tagIcon={Sparkles}
+          tagAnimation="blur-reveal"
+          buttons={[{ text: "Explore Products", href: "/products" }]}
           buttonAnimation="slide-up"
           bulletPoints={[
             {
-              title: "Expert Team",
-              description: "Our dedicated team comprises certified hardware engineers, competitive gamers, and content creators with decades of combined experience in the gaming industry.",
-              icon: Award,
+              title: "Expert Curation",              description: "Hand-picked gaming components tested for performance and reliability",              icon: Award,
             },
             {
-              title: "Transparency First",
-              description: "We provide unbiased, detailed reviews of gaming components without compromising integrity. Every recommendation is thoroughly tested and validated.",
-              icon: Shield,
+              title: "Community Driven",              description: "Real reviews and insights from experienced gamers worldwide",              icon: Users,
             },
             {
-              title: "Community Focused",
-              description: "Gaming PC Hub is built on community feedback. We listen, learn, and continuously improve our services based on real user experiences and needs.",
-              icon: Users,
+              title: "Premium Support",              description: "24/7 expert guidance to help you find the perfect gaming setup",              icon: Headphones,
             },
             {
-              title: "Innovation Driven",
-              description: "We stay ahead of industry trends, constantly researching and evaluating the latest gaming hardware innovations to bring cutting-edge solutions to our users.",
-              icon: Sparkles,
+              title: "Best Prices",              description: "Competitive pricing and exclusive deals on top gaming hardware",              icon: Zap,
             },
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-photograph-of-a-modern-gami-1773406109243-5d63256c.png?_wi=2"
-          imageAlt="Gaming PC Hub expert team and facilities"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/a-professional-high-end-gaming-pc-setup--1773406108882-3c45e3fd.png"
+          imageAlt="Gaming PC Hub facility and workspace"
           mediaAnimation="slide-up"
           imagePosition="right"
           textboxLayout="default"
@@ -119,134 +142,71 @@ export default function AboutPage() {
         />
       </div>
 
-      {/* Values Section */}
-      <div id="values-section" data-section="values-section" className="py-16 md:py-24">
-        <SplitAbout
-          title="Our Core Values"
-          description="These principles guide every decision we make and shape how we interact with our community. They define who we are and what Gaming PC Hub stands for in the gaming hardware space."
-          tag="WHAT WE BELIEVE"
-          tagIcon={Shield}
-          tagAnimation="blur-reveal"
-          buttons={[{ text: "Explore Our Standards", href: "#" }]}
-          buttonAnimation="slide-up"
-          bulletPoints={[
+      {/* FAQ Section */}
+      <div id="faq-section" data-section="faq-section" className="bg-gray-900 bg-opacity-30 py-16 md:py-24">
+        <FaqDouble
+          faqs={[
             {
-              title: "Quality Over Marketing",
-              description: "We prioritize genuine performance and reliability over flashy marketing claims. Our recommendations are backed by rigorous testing and real-world data.",
-              icon: Award,
-            },
+              id: "faq-1",              title: "When was Gaming PC Hub founded?",              content: "Gaming PC Hub was founded in 2020 with a mission to democratize access to high-quality gaming hardware information and expert guidance."},
             {
-              title: "Accessibility",
-              description: "Gaming excellence shouldn't be exclusive. We offer solutions at every price point and provide guidance for all skill levels, from beginners to professionals.",
-              icon: Sparkles,
-            },
+              id: "faq-2",              title: "What makes Gaming PC Hub different?",              content: "We combine expert knowledge with community feedback to provide unbiased hardware recommendations. Our team personally tests every component we recommend."},
             {
-              title: "Education",
-              description: "We believe informed gamers make better choices. Our detailed guides, tutorials, and educational content empower you to understand your hardware.",
-              icon: BookOpen,
-            },
+              id: "faq-3",              title: "How do you select products?",              content: "We use a rigorous evaluation process involving performance benchmarks, reliability testing, and real-world gaming scenarios to select the best hardware."},
             {
-              title: "Sustainability",
-              description: "We promote responsible consumption of gaming hardware, encouraging upgrades that matter and proper disposal of outdated components.",
-              icon: Leaf,
-            },
+              id: "faq-4",              title: "Do you offer custom builds?",              content: "Yes! Our expert team can help you design a custom PC build tailored to your specific gaming needs, budget, and preferences."},
+            {
+              id: "faq-5",              title: "What support options do you provide?",              content: "We offer 24/7 email and chat support, comprehensive build guides, video tutorials, and phone consultations for larger purchases."},
+            {
+              id: "faq-6",              title: "Can I return or exchange products?",              content: "Yes, we offer a 30-day return policy on all products. If you're not satisfied, we'll help you find the right alternative."},
+            {
+              id: "faq-7",              title: "Do you ship internationally?",              content: "We currently ship to most countries in North America and Europe. Check our shipping page for specific international rates and timelines."},
+            {
+              id: "faq-8",              title: "How often do you update recommendations?",              content: "We update our hardware recommendations monthly to reflect new releases, price changes, and performance benchmarks."},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-male-1773406108560-ac75c88d.png"
-          imageAlt="Our leadership team"
-          mediaAnimation="slide-up"
-          imagePosition="left"
+          title="About Us FAQ"
+          description="Get answers to common questions about Gaming PC Hub, our products, and services."
+          tag="FREQUENTLY ASKED"
+          tagIcon={HelpCircle}
+          tagAnimation="blur-reveal"
+          buttons={[{ text: "Contact Support", href: "/contact" }]}
+          buttonAnimation="slide-up"
+          faqsAnimation="blur-reveal"
           textboxLayout="default"
           useInvertedBackground={true}
+          animationType="smooth"
           className="w-full"
           containerClassName="px-4 md:px-8"
-          titleClassName="text-4xl md:text-5xl font-bold"
-          descriptionClassName="text-lg text-gray-300 mt-4"
-          bulletPointClassName="flex flex-col gap-2 mb-6"
-          bulletTitleClassName="font-semibold text-lg"
-          bulletDescriptionClassName="text-gray-400"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
+          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
         />
       </div>
 
-      {/* Testimonials Section */}
-      <div id="testimonial-section" data-section="testimonial-section" className="relative py-16 md:py-24">
-        <TestimonialCardFive
-          testimonials={[
-            {
-              id: "testimonial-1",
-              name: "Alex Chen",
-              date: "2 weeks ago",
-              title: "Professional Esports Player",
-              quote: "Gaming PC Hub helped me build my competitive setup. The hardware recommendations are spot-on, and the performance is incredible. I've never experienced frame rates this smooth! They truly understand what competitive gamers need.",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-male-1773406108686-e7d632a6.png",
-              avatarAlt: "Alex Chen",
-            },
-            {
-              id: "testimonial-2",
-              name: "Sarah Mitchell",
-              date: "1 month ago",
-              title: "Content Creator",
-              quote: "As a content creator, I needed a powerful PC for 4K editing and streaming. Gaming PC Hub's experts guided me through every step. My production quality has doubled! The personalized support made all the difference.",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-fema-1773406108462-d0faffe7.png",
-              avatarAlt: "Sarah Mitchell",
-            },
-            {
-              id: "testimonial-3",
-              name: "Marcus Johnson",
-              date: "1 month ago",
-              title: "Gaming Tech Entrepreneur",
-              quote: "The product selection and technical expertise at Gaming PC Hub is unmatched. I've built multiple systems using their recommendations. Always excellent quality and support! They're my go-to resource for all gaming hardware needs.",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-male-1773406108560-ac75c88d.png",
-              avatarAlt: "Marcus Johnson",
-            },
-          ]}
-          title="What Our Community Says"
-          description="Hear directly from gamers and professionals who have transformed their systems with Gaming PC Hub's guidance and recommendations."
-          tag="COMMUNITY LOVE"
-          tagIcon={Star}
+      {/* Contact Section */}
+      <div id="contact-section" data-section="contact-section" className="bg-gradient-to-r from-gray-900 to-black py-16 md:py-24">
+        <ContactSplit
+          tag="GET IN TOUCH"
+          title="Connect With Our Team"
+          description="Have questions or want to learn more about Gaming PC Hub? Our expert team is here to help."
+          tagIcon={Mail}
           tagAnimation="blur-reveal"
-          buttons={[{ text: "Read More Reviews", href: "/" }]}
-          buttonAnimation="slide-up"
-          textboxLayout="default"
+          background={{ variant: "animated-grid" }}
           useInvertedBackground={false}
+          mediaPosition="right"
+          mediaAnimation="blur-reveal"
+          inputPlaceholder="Enter your email address"
+          buttonText="Send Message"
+          termsText="By contacting us, you agree to our Terms of Service and Privacy Policy."
+          onSubmit={null}
           className="w-full"
           containerClassName="px-4 md:px-8"
-          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
-          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
-        />
-      </div>
-
-      {/* Social Proof Section - Partners */}
-      <div id="socialproof-section" data-section="socialproof-section" className="py-16 md:py-24">
-        <SocialProofOne
-          names={["NVIDIA", "Intel", "AMD", "CORSAIR", "Razer", "Samsung", "MSI", "ASUS"]}
-          logos={[
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/a-professional-high-end-gaming-pc-setup--1773406108882-3c45e3fd.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/close-up-professional-product-photo-of-a-1773406109341-f34ff138.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-macro-photography-of-a-high-1773406109745-0b1acddd.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-product-photography-of-a-pr-1773406109314-e8f291c6.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-flat-lay-photography-of-pre-1773406109145-a885fecc.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-product-photography-of-a-pr-1773406108773-fddf6c3f.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-product-photography-of-a-cu-1773406108750-e4d765c6.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-product-photography-of-a-pr-1773406109225-d4145a56.png",
-          ]}
-          title="Industry Partnerships"
-          description="We collaborate exclusively with the world's most trusted gaming hardware manufacturers to ensure our recommendations represent the best technology available."
-          tag="TRUSTED PARTNERS"
-          tagIcon={Shield}
-          tagAnimation="blur-reveal"
-          buttons={[{ text: "View All Partnerships", href: "/" }]}
-          buttonAnimation="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={true}
-          speed={40}
-          showCard={true}
-          className="w-full"
-          containerClassName="px-4 md:px-8"
-          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
-          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
+          contentClassName="max-w-5xl"
+          tagClassName="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-opacity-10 border border-current"
+          titleClassName="text-4xl md:text-5xl font-bold mt-4"
+          descriptionClassName="text-lg text-gray-300 mt-4"
+          formWrapperClassName="mt-8"
+          inputClassName="w-full px-6 py-3 rounded-lg border border-gray-600 bg-gray-900 text-white placeholder-gray-400 focus:outline-none focus:border-current"
+          buttonClassName="mt-4 px-8 py-3 rounded-lg font-semibold transition-all duration-300"
+          termsClassName="mt-4 text-sm text-gray-400"
         />
       </div>
 
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index fa0bfa0..905daaa 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,58 +1,58 @@
 "use client";
 
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
-import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Mail, Award, Star } from 'lucide-react';
-import Link from 'next/link';
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
+import ContactSplit from "@/components/sections/contact/ContactSplit";
+import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
+import { Zap, Sparkles, Award, Mail } from "lucide-react";
+
+const navItems = [
+  { name: "Home", id: "home" },
+  { name: "Products", id: "products" },
+  { name: "About", id: "about" },
+  { name: "Pricing", id: "pricing" },
+  { name: "Contact", id: "contact" },
+];
+
+const footerColumns = [
+  {
+    items: [
+      { label: "Home", href: "/" },
+      { label: "Products", href: "/products" },
+      { label: "About", href: "/about" },
+      { label: "Pricing", href: "/pricing" },
+    ],
+  },
+  {
+    items: [
+      { label: "Build Guides", href: "#" },
+      { label: "PC Reviews", href: "#" },
+      { label: "Gaming News", href: "#" },
+      { label: "Comparisons", href: "#" },
+    ],
+  },
+  {
+    items: [
+      { label: "Support", href: "/contact" },
+      { label: "FAQ", href: "#faq" },
+      { label: "Contact", href: "/contact" },
+      { label: "Careers", href: "#" },
+    ],
+  },
+  {
+    items: [
+      { label: "Privacy Policy", href: "#" },
+      { label: "Terms of Service", href: "#" },
+      { label: "Cookie Policy", href: "#" },
+      { label: "Legal", href: "#" },
+    ],
+  },
+];
 
 export default function ContactPage() {
-  const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Products", id: "products" },
-    { name: "About", id: "about" },
-    { name: "Pricing", id: "pricing" },
-    { name: "Contact", id: "contact" },
-  ];
-
-  const footerColumns = [
-    {
-      items: [
-        { label: "Home", href: "/" },
-        { label: "Products", href: "/products" },
-        { label: "About", href: "/about" },
-        { label: "Pricing", href: "#pricing" },
-      ],
-    },
-    {
-      items: [
-        { label: "Build Guides", href: "#" },
-        { label: "PC Reviews", href: "#" },
-        { label: "Gaming News", href: "#" },
-        { label: "Comparisons", href: "#" },
-      ],
-    },
-    {
-      items: [
-        { label: "Support", href: "/contact" },
-        { label: "FAQ", href: "#faq" },
-        { label: "Contact", href: "/contact" },
-        { label: "Careers", href: "#" },
-      ],
-    },
-    {
-      items: [
-        { label: "Privacy Policy", href: "#" },
-        { label: "Terms of Service", href: "#" },
-        { label: "Cookie Policy", href: "#" },
-        { label: "Legal", href: "#" },
-      ],
-    },
-  ];
-
   return (
     <ThemeProvider
       defaultButtonVariant="expand-hover"
@@ -66,31 +66,90 @@ export default function ContactPage() {
       secondaryButtonStyle="solid"
       headingFontWeight="bold"
     >
+      {/* Navbar */}
       <div id="nav" data-section="nav">
-        <NavbarStyleApple
-          brandName="GamingPC Hub"
-          navItems={navItems}
+        <NavbarStyleApple brandName="GamingPC Hub" navItems={navItems} />
+      </div>
+
+      {/* Hero Section */}
+      <div id="hero" data-section="hero" className="relative overflow-hidden py-20 md:py-32 lg:py-40">
+        <HeroBillboardGallery
+          title="Get in Touch"
+          description="Have questions about gaming PCs or need personalized recommendations? Our expert team is ready to help you find the perfect gaming solution."
+          background={{ variant: "gradient-bars" }}
+          tag="SUPPORT & INQUIRIES"
+          tagIcon={Zap}
+          tagAnimation="blur-reveal"
+          buttons={[
+            { text: "Chat With Us", href: "#contact-section" },
+            { text: "Browse Products", href: "/products" },
+          ]}
+          buttonAnimation="slide-up"
+          mediaItems={[
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-photograph-of-a-modern-gami-1773406109243-5d63256c.png",              imageAlt: "Gaming PC Hub support team and workspace"},
+          ]}
+          mediaAnimation="blur-reveal"
+          className="w-full"
+          containerClassName="px-4 md:px-8"
+          textBoxClassName="max-w-2xl"
+          titleClassName="text-5xl md:text-7xl font-bold tracking-tight"
+          descriptionClassName="text-lg md:text-xl text-gray-300 mt-6"
+          tagClassName="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-opacity-10 border border-current"
+          buttonContainerClassName="flex flex-col md:flex-row gap-4 mt-8"
+          buttonClassName="px-8 py-3 rounded-lg font-semibold transition-all duration-300"
         />
       </div>
 
-      <div id="contact-section" data-section="contact-section">
+      {/* Metrics Section */}
+      <div id="metrics-section" data-section="metrics-section" className="py-16 md:py-24">
+        <MetricCardTwo
+          metrics={[
+            { id: "metric-1", value: "24/7", description: "Support Available" },
+            { id: "metric-2", value: "<2hrs", description: "Average Response Time" },
+            { id: "metric-3", value: "98%", description: "Customer Satisfaction" },
+            { id: "metric-4", value: "500K+", description: "Happy Customers" },
+            { id: "metric-5", value: "4.9★", description: "Average Rating" },
+            { id: "metric-6", value: "10+", description: "Languages Supported" },
+          ]}
+          carouselMode="buttons"
+          gridVariant="uniform-all-items-equal"
+          animationType="scale-rotate"
+          uniformGridCustomHeightClasses="min-h-60 2xl:min-h-72"
+          title="Why Choose Gaming PC Hub"
+          description="Our commitment to excellence and customer satisfaction is reflected in these numbers."
+          tag="CUSTOMER SUPPORT"
+          tagIcon={Award}
+          tagAnimation="blur-reveal"
+          buttons={[{ text: "Start Today", href: "#contact-section" }]}
+          buttonAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={true}
+          className="w-full"
+          containerClassName="px-4 md:px-8"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
+          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
+        />
+      </div>
+
+      {/* Contact Section */}
+      <div id="contact-section" data-section="contact-section" className="bg-gradient-to-r from-gray-900 to-black py-16 md:py-24">
         <ContactSplit
           tag="GET IN TOUCH"
           title="Connect With Our Gaming Experts"
           description="Have questions about gaming PCs or need personalized recommendations? Our expert team is ready to help you find the perfect gaming solution."
           tagIcon={Mail}
           tagAnimation="blur-reveal"
-          background={{
-            variant: "animated-grid",
-          }}
+          background={{ variant: "animated-grid" }}
           useInvertedBackground={false}
           mediaPosition="right"
+          mediaAnimation="blur-reveal"
           inputPlaceholder="Enter your email address"
           buttonText="Send Message"
           termsText="By contacting us, you agree to our Terms of Service and Privacy Policy."
           onSubmit={null}
           className="w-full"
-          containerClassName="px-4 md:px-8 py-16 md:py-24"
+          containerClassName="px-4 md:px-8"
           contentClassName="max-w-5xl"
           tagClassName="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-opacity-10 border border-current"
           titleClassName="text-4xl md:text-5xl font-bold mt-4"
@@ -102,131 +161,8 @@ export default function ContactPage() {
         />
       </div>
 
-      <div id="metrics-section" data-section="metrics-section">
-        <MetricCardTwo
-          metrics={[
-            {
-              id: "metric-1",
-              value: "500K+",
-              description: "Gaming Enthusiasts Worldwide",
-            },
-            {
-              id: "metric-2",
-              value: "2000+",
-              description: "Products Reviewed",
-            },
-            {
-              id: "metric-3",
-              value: "98%",
-              description: "Customer Satisfaction",
-            },
-            {
-              id: "metric-4",
-              value: "24/7",
-              description: "Expert Support Available",
-            },
-            {
-              id: "metric-5",
-              value: "4.9★",
-              description: "Average Rating",
-            },
-            {
-              id: "metric-6",
-              value: "$500M+",
-              description: "Hardware Listed",
-            },
-          ]}
-          carouselMode="buttons"
-          gridVariant="uniform-all-items-equal"
-          animationType="scale-rotate"
-          uniformGridCustomHeightClasses="min-h-60 2xl:min-h-72"
-          title="By The Numbers"
-          description="Gaming PC Hub is the trusted source for gaming hardware information and products."
-          tag="OUR IMPACT"
-          tagIcon={Award}
-          tagAnimation="blur-reveal"
-          buttons={[
-            {
-              text: "Join Our Community",
-              href: "/contact",
-            },
-          ]}
-          buttonAnimation="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={true}
-          className="w-full"
-          containerClassName="px-4 md:px-8 py-16 md:py-24"
-          titleClassName="text-4xl md:text-5xl font-bold"
-          descriptionClassName="text-lg text-gray-300 mt-4"
-        />
-      </div>
-
-      <div id="testimonial-section" data-section="testimonial-section">
-        <TestimonialCardFive
-          testimonials={[
-            {
-              id: "testimonial-1",
-              name: "Alex Chen",
-              date: "2 weeks ago",
-              title: "Professional Esports Player",
-              quote: "Gaming PC Hub helped me build my competitive setup. The hardware recommendations are spot-on, and the performance is incredible. I've never experienced frame rates this smooth!",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-male-1773406108686-e7d632a6.png",
-              avatarAlt: "Alex Chen",
-            },
-            {
-              id: "testimonial-2",
-              name: "Sarah Mitchell",
-              date: "1 month ago",
-              title: "Content Creator",
-              quote: "As a content creator, I needed a powerful PC for 4K editing and streaming. Gaming PC Hub's experts guided me through every step. My production quality has doubled!",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-fema-1773406108462-d0faffe7.png",
-              avatarAlt: "Sarah Mitchell",
-            },
-            {
-              id: "testimonial-3",
-              name: "Marcus Johnson",
-              date: "1 month ago",
-              title: "Gaming Tech Entrepreneur",
-              quote: "The product selection and technical expertise at Gaming PC Hub is unmatched. I've built multiple systems using their recommendations. Always excellent quality and support!",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-male-1773406108560-ac75c88d.png",
-              avatarAlt: "Marcus Johnson",
-            },
-            {
-              id: "testimonial-4",
-              name: "Jessica Wong",
-              date: "3 weeks ago",
-              title: "Tech Industry Leader",
-              quote: "We recommend Gaming PC Hub to all our team members. Their dedication to quality and customer satisfaction is exceptional. Truly a game-changer in the gaming hardware space!",
-              tag: "Verified Purchase",
-              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AtJIJgcxShqOlYL2lWELzHhPVq/professional-headshot-portrait-of-a-fema-1773406109193-cfb3dd32.png",
-              avatarAlt: "Jessica Wong",
-            },
-          ]}
-          title="What Our Customers Say"
-          description="Real feedback from gaming professionals who trust Gaming PC Hub for their setup needs."
-          tag="TESTIMONIALS"
-          tagIcon={Star}
-          tagAnimation="blur-reveal"
-          buttons={[
-            {
-              text: "View All Reviews",
-              href: "/products",
-            },
-          ]}
-          buttonAnimation="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-          className="w-full"
-          containerClassName="px-4 md:px-8 py-16 md:py-24"
-          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
-          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
+      {/* Footer */}
+      <div id="footer" data-section="footer" className="bg-black border-t border-gray-800 py-12">
         <FooterLogoEmphasis
           logoText="Gaming PC Hub"
           columns={footerColumns}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index b635db5..9cd9b32 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -184,7 +184,7 @@ export default function HomePage() {
           carouselMode="buttons"
           className="w-full"
           containerClassName="px-4 md:px-8"
-          titleClassName="text-4xl md:text-5xl font-bold"
+          itemClassName="text-4xl md:text-5xl font-bold"
           descriptionClassName="text-lg text-gray-300 mt-4"
         />
       </div>
@@ -236,8 +236,8 @@ export default function HomePage() {
           useInvertedBackground={false}
           className="w-full"
           containerClassName="px-4 md:px-8"
-          titleClassName="text-4xl md:text-5xl font-bold"
-          descriptionClassName="text-lg text-gray-300 mt-4"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
+          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
         />
       </div>
 
@@ -267,8 +267,8 @@ export default function HomePage() {
           useInvertedBackground={true}
           className="w-full"
           containerClassName="px-4 md:px-8"
-          titleClassName="text-4xl md:text-5xl font-bold"
-          descriptionClassName="text-lg text-gray-300 mt-4"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
+          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
         />
       </div>
 
@@ -333,8 +333,8 @@ export default function HomePage() {
           useInvertedBackground={true}
           className="w-full"
           containerClassName="px-4 md:px-8"
-          titleClassName="text-4xl md:text-5xl font-bold"
-          descriptionClassName="text-lg text-gray-300 mt-4"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold"
+          textBoxDescriptionClassName="text-lg text-gray-300 mt-4"
         />
       </div>
 
@@ -421,6 +421,7 @@ export default function HomePage() {
           background={{ variant: "animated-grid" }}
           useInvertedBackground={false}
           mediaPosition="right"
+          mediaAnimation="blur-reveal"
           inputPlaceholder="Enter your email address"
           buttonText="Send Message"
           termsText="By contacting us, you agree to our Terms of Service and Privacy Policy."