diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4a644bc..2d7944c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
-import FooterMedia from '@/components/sections/footer/FooterMedia';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -31,16 +31,11 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "Solutions",          id: "features"},
-        {
-          name: "Products",          id: "products"},
-        {
-          name: "Testimonials",          id: "testimonials"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "hero" },
+        { name: "Solutions", id: "features" },
+        { name: "Products", id: "products" },
+        { name: "Testimonials", id: "testimonials" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="POS Hub"
     />
@@ -48,50 +43,33 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroSplitKpi
-      background={{
-        variant: "gradient-bars"}}
+      background={{ variant: "gradient-bars" }}
       title="Enterprise POS Machines, Multiple Brands, One Partner"
       description="Compare leading POS systems from trusted manufacturers with transparent pricing and expert guidance. We handle setup, support, and everything in between."
       kpis={[
-        {
-          value: "50+",          label: "Models Available"},
-        {
-          value: "100%",          label: "Vendor Reliability"},
-        {
-          value: "24/7",          label: "Technical Support"},
+        { value: "50+", label: "Models Available" },
+        { value: "100%", label: "Vendor Reliability" },
+        { value: "24/7", label: "Technical Support" },
       ]}
       enableKpiAnimation={true}
-      buttons={[
-        {
-          text: "Explore Our Models",          href: "#products"},
-      ]}
+      buttons={[{ text: "Explore Our Models", href: "#products" }]}
       imageSrc="http://img.b2bpic.net/free-photo/top-view-circuit-boards-with-copy-space_23-2148419209.jpg?_wi=1"
       imageAlt="Modern POS systems"
       mediaAnimation="slide-up"
       avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/studio-portrait-serious-bearded-male-dressed-suit_613910-5687.jpg",          alt: "Sarah"},
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-female-personal-shopper-working_23-2148924143.jpg",          alt: "Michael"},
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-sensual-blonde-business-woman-dressed-formal-suit-blue-shirt-isolated-dark-background_613910-6341.jpg",          alt: "Emily"},
-        {
-          src: "http://img.b2bpic.net/free-photo/office-worker-reading-annual-reports_482257-75598.jpg",          alt: "David"},
-        {
-          src: "http://img.b2bpic.net/free-photo/vertical-shot-friendly-asian-girl-smiling-serving-coffee-barista-giving-you-cup-coffee-prepare_1258-138286.jpg",          alt: "Alex"},
+        { src: "http://img.b2bpic.net/free-photo/studio-portrait-serious-bearded-male-dressed-suit_613910-5687.jpg", alt: "Sarah" },
+        { src: "http://img.b2bpic.net/free-photo/portrait-female-personal-shopper-working_23-2148924143.jpg", alt: "Michael" },
+        { src: "http://img.b2bpic.net/free-photo/portrait-sensual-blonde-business-woman-dressed-formal-suit-blue-shirt-isolated-dark-background_613910-6341.jpg", alt: "Emily" },
+        { src: "http://img.b2bpic.net/free-photo/office-worker-reading-annual-reports_482257-75598.jpg", alt: "David" },
+        { src: "http://img.b2bpic.net/free-photo/vertical-shot-friendly-asian-girl-smiling-serving-coffee-barista-giving-you-cup-coffee-prepare_1258-138286.jpg", alt: "Alex" },
       ]}
       avatarText="Trusted by 500+ businesses"
       marqueeItems={[
-        {
-          type: "text",          text: "Retail Industry"},
-        {
-          type: "text",          text: "Hospitality POS"},
-        {
-          type: "text",          text: "Enterprise Hardware"},
-        {
-          type: "text",          text: "Secure Payments"},
-        {
-          type: "text",          text: "Technical Support"},
+        { type: "text", text: "Retail Industry" },
+        { type: "text", text: "Hospitality POS" },
+        { type: "text", text: "Enterprise Hardware" },
+        { type: "text", text: "Secure Payments" },
+        { type: "text", text: "Technical Support" },
       ]}
     />
   </div>
@@ -102,15 +80,9 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={false}
       features={[
-        {
-          icon: Zap,
-          title: "Fast Deployment",          description: "Get your business up and running with pre-configured terminals and rapid integration."},
-        {
-          icon: ShieldCheck,
-          title: "Verified Quality",          description: "Every machine undergoes rigorous testing to ensure enterprise-grade stability and reliability."},
-        {
-          icon: TrendingUp,
-          title: "Scalable Infrastructure",          description: "Our solutions grow with your business, from single locations to enterprise-wide rollouts."},
+        { icon: Zap, title: "Fast Deployment", description: "Get your business up and running with pre-configured terminals and rapid integration." },
+        { icon: ShieldCheck, title: "Verified Quality", description: "Every machine undergoes rigorous testing to ensure enterprise-grade stability and reliability." },
+        { icon: TrendingUp, title: "Scalable Infrastructure", description: "Our solutions grow with your business, from single locations to enterprise-wide rollouts." },
       ]}
       title="Why Choose Our POS Solutions?"
       description="We simplify your procurement process with vendor diversity and deep technical expertise."
@@ -124,18 +96,12 @@ export default function LandingPage() {
       animationType="slide-up"
       useInvertedBackground={false}
       products={[
-        {
-          id: "p1",          name: "Retail Terminal Pro",          price: "$899",          variant: "Standard",          imageSrc: "http://img.b2bpic.net/free-photo/shop-cashier-offering-customer-enter-pin-code-while-operating-payment-process-cropped-shot-closeup-hand-shopping-purchase-concept_74855-11999.jpg?_wi=1"},
-        {
-          id: "p2",          name: "Mobile Scanner X",          price: "$450",          variant: "Portable",          imageSrc: "http://img.b2bpic.net/free-photo/person-paying-using-nfc-technology_23-2149893836.jpg"},
-        {
-          id: "p3",          name: "Compact Hub Station",          price: "$699",          variant: "All-in-One",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-baker-bakery-shop_23-2149233716.jpg"},
-        {
-          id: "p4",          name: "Touch Pro Monitor",          price: "$399",          variant: "Retail",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-pos-machine_23-2149233707.jpg"},
-        {
-          id: "p5",          name: "SecurePay Reader",          price: "$199",          variant: "Card Reader",          imageSrc: "http://img.b2bpic.net/free-photo/hand-swiping-credit-card-store-female-hands-with-credit-card-bank-terminal-color-image-pos-credit-cards_1212-825.jpg"},
-        {
-          id: "p6",          name: "Integrated Printer Bundle",          price: "$1200",          variant: "Pro",          imageSrc: "http://img.b2bpic.net/free-photo/female-staff-using-credit-card-terminal-cash-counter_171337-2414.jpg"},
+        { id: "p1", name: "Retail Terminal Pro", price: "$899", variant: "Standard", imageSrc: "http://img.b2bpic.net/free-photo/shop-cashier-offering-customer-enter-pin-code-while-operating-payment-process-cropped-shot-closeup-hand-shopping-purchase-concept_74855-11999.jpg?_wi=1" },
+        { id: "p2", name: "Mobile Scanner X", price: "$450", variant: "Portable", imageSrc: "http://img.b2bpic.net/free-photo/person-paying-using-nfc-technology_23-2149893836.jpg" },
+        { id: "p3", name: "Compact Hub Station", price: "$699", variant: "All-in-One", imageSrc: "http://img.b2bpic.net/free-photo/close-up-baker-bakery-shop_23-2149233716.jpg" },
+        { id: "p4", name: "Touch Pro Monitor", price: "$399", variant: "Retail", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-pos-machine_23-2149233707.jpg" },
+        { id: "p5", name: "SecurePay Reader", price: "$199", variant: "Card Reader", imageSrc: "http://img.b2bpic.net/free-photo/hand-swiping-credit-card-store-female-hands-with-credit-card-bank-terminal-color-image-pos-credit-cards_1212-825.jpg" },
+        { id: "p6", name: "Integrated Printer Bundle", price: "$1200", variant: "Pro", imageSrc: "http://img.b2bpic.net/free-photo/female-staff-using-credit-card-terminal-cash-counter_171337-2414.jpg" },
       ]}
       title="Leading POS Hardware Collection"
       description="Premium terminals selected for retail and restaurant performance."
@@ -148,12 +114,9 @@ export default function LandingPage() {
       title="Business Impact Metrics"
       tag="Reliability Driven"
       metrics={[
-        {
-          id: "m1",          value: "99.9%",          description: "Uptime on all distributed terminals"},
-        {
-          id: "m2",          value: "24h",          description: "Average response time for support"},
-        {
-          id: "m3",          value: "500+",          description: "Enterprise clients served globally"},
+        { id: "m1", value: "99.9%", description: "Uptime on all distributed terminals" },
+        { id: "m2", value: "24h", description: "Average response time for support" },
+        { id: "m3", value: "500+", description: "Enterprise clients served globally" },
       ]}
       metricsAnimation="slide-up"
     />
@@ -175,51 +138,37 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitText
-      sideTitle="Frequently Asked Questions"
-      sideDescription="Have questions about our POS solutions? Find answers here."
+      <FaqBase
+      title="Frequently Asked Questions"
+      description="Find clear, concise answers about our POS solutions and hardware."
+      tag="Help Center"
       faqs={[
-        {
-          id: "f1",          title: "What brands do you carry?",          content: "We carry a wide range of leading brands including Honeywell, Verifone, and more."},
-        {
-          id: "f2",          title: "Do you offer technical support?",          content: "Yes, we provide 24/7 technical support and expert guidance."},
-        {
-          id: "f3",          title: "Are your prices transparent?",          content: "Yes, our pricing is fully transparent with no hidden fees."},
+        { id: "f1", title: "What brands do you carry?", content: "We carry a wide range of leading brands including Honeywell, Verifone, and more." },
+        { id: "f2", title: "Do you offer technical support?", content: "Yes, we provide 24/7 technical support and expert guidance." },
+        { id: "f3", title: "Are your prices transparent?", content: "Yes, our pricing is fully transparent with no hidden fees." },
       ]}
       faqsAnimation="blur-reveal"
+      textboxLayout="default"
       useInvertedBackground={false}
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactSplit
+      <ContactCTA
       title="Ready to Modernize Your POS?"
       description="Contact our experts today to discuss your hardware needs and receive a transparent quote."
       tag="Get In Touch"
-      mediaPosition="right"
-      imageSrc="http://img.b2bpic.net/free-photo/contact-us-communication-connection-business-concept_53876-126848.jpg"
-      background={{
-          variant: "plain"
-      }}
+      buttons={[{ text: "Schedule a Consultation" }]}
       useInvertedBackground={false}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterMedia
+      <FooterBaseReveal
       logoText="POS Hub"
-      imageSrc="http://img.b2bpic.net/free-photo/top-view-circuit-boards-with-copy-space_23-2148419209.jpg"
       columns={[
-        {
-          title: "Company",          items: [
-            { label: "About Us", href: "#" },
-            { label: "Contact", href: "#" },
-          ]},
-        {
-          title: "Resources",          items: [
-            { label: "Help Center", href: "#" },
-            { label: "Blog", href: "#" },
-          ]},
+        { title: "Company", items: [{ label: "About Us", href: "#" }, { label: "Contact", href: "#" }] },
+        { title: "Resources", items: [{ label: "Help Center", href: "#" }, { label: "Blog", href: "#" }] },
       ]}
     />
   </div>