diff --git a/src/app/page.tsx b/src/app/page.tsx
index 004ed5e..b8cd52e 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 ContactText from '@/components/sections/contact/ContactText';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardSixteen from '@/components/sections/feature/FeatureCardSixteen';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroCentered from '@/components/sections/hero/HeroCentered';
 import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -34,25 +34,15 @@ export default function LandingPage() {
       <NavbarLayoutFloatingOverlay
       navItems={[
         {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
         {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
         {
-          name: "Programs",
-          id: "features",
-        },
+          name: "Programs",          id: "features"},
         {
-          name: "Team",
-          id: "team",
-        },
+          name: "Team",          id: "team"},
         {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "Contact",          id: "contact"},
       ]}
       brandName="Kidz Kollege"
     />
@@ -61,67 +51,42 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroCentered
       background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
       title="Building bright futures through quality early childhood education."
       description="Kidz Kollege Nursery School in Kampala provides a nurturing environment where learning begins with joy and confidence."
       avatars={[
         {
-          src: "http://img.b2bpic.net/free-photo/close-up-little-girl-having-fun-birthday-party_1098-1319.jpg",
-          alt: "smiling toddler classroom",
-        },
+          src: "http://img.b2bpic.net/free-photo/close-up-little-girl-having-fun-birthday-party_1098-1319.jpg",          alt: "smiling toddler classroom"},
         {
-          src: "http://img.b2bpic.net/free-photo/girl-sitting-studying_23-2147666589.jpg",
-          alt: "little boy playing blocks",
-        },
+          src: "http://img.b2bpic.net/free-photo/girl-sitting-studying_23-2147666589.jpg",          alt: "little boy playing blocks"},
         {
-          src: "http://img.b2bpic.net/free-photo/little-smiling-girl-hugging-favorite-toys-while-sitting-table_1153-9458.jpg",
-          alt: "happy girl smiling nursery",
-        },
+          src: "http://img.b2bpic.net/free-photo/little-smiling-girl-hugging-favorite-toys-while-sitting-table_1153-9458.jpg",          alt: "happy girl smiling nursery"},
         {
-          src: "http://img.b2bpic.net/free-photo/african-american-schoolboy-using-hands-sanitizer-classroom_637285-8706.jpg",
-          alt: "young boy reading book",
-        },
+          src: "http://img.b2bpic.net/free-photo/african-american-schoolboy-using-hands-sanitizer-classroom_637285-8706.jpg",          alt: "young boy reading book"},
         {
-          src: "http://img.b2bpic.net/free-photo/little-boy-kitchen-helps-mom-cook-child-is-involved-cooking_1321-1375.jpg",
-          alt: "diverse group children nursery",
-        },
+          src: "http://img.b2bpic.net/free-photo/little-boy-kitchen-helps-mom-cook-child-is-involved-cooking_1321-1375.jpg",          alt: "diverse group children nursery"},
       ]}
       buttons={[
         {
-          text: "Learn More",
-          href: "#about",
-        },
+          text: "Learn More",          href: "#about"},
         {
-          text: "Call Us Now",
-          href: "tel:0761677146",
-        },
+          text: "Call Us Now",          href: "tel:0761677146"},
       ]}
       marqueeItems={[
         {
-          type: "text-icon",
-          text: "Quality Care",
-          icon: Heart,
+          type: "text-icon",          text: "Quality Care",          icon: Heart,
         },
         {
-          type: "text-icon",
-          text: "Creative Play",
-          icon: Palette,
+          type: "text-icon",          text: "Creative Play",          icon: Palette,
         },
         {
-          type: "text-icon",
-          text: "Safe Space",
-          icon: Shield,
+          type: "text-icon",          text: "Safe Space",          icon: Shield,
         },
         {
-          type: "text-icon",
-          text: "Early Learning",
-          icon: BookOpen,
+          type: "text-icon",          text: "Early Learning",          icon: BookOpen,
         },
         {
-          type: "text-icon",
-          text: "Happy Kids",
-          icon: Smile,
+          type: "text-icon",          text: "Happy Kids",          icon: Smile,
         },
       ]}
     />
@@ -148,21 +113,11 @@ export default function LandingPage() {
       useInvertedBackground={false}
       negativeCard={{
         items: [
-          "Limited capacity for small groups",
-          "Strict routine requirements",
-          "Uniform attendance expected",
-          "Age-appropriate assessment",
-          "Regular parent feedback",
-        ],
+          "Limited capacity for small groups",          "Strict routine requirements",          "Uniform attendance expected",          "Age-appropriate assessment",          "Regular parent feedback"],
       }}
       positiveCard={{
         items: [
-          "Experienced & caring teachers",
-          "Secure, child-friendly environment",
-          "Creative & interactive learning",
-          "Holistic development programs",
-          "Play-based curriculum",
-        ],
+          "Experienced & caring teachers",          "Secure, child-friendly environment",          "Creative & interactive learning",          "Holistic development programs",          "Play-based curriculum"],
       }}
       title="Why Choose Kidz Kollege?"
       description="We believe in a happy learning experience that fosters curiosity and growth in every child."
@@ -176,31 +131,16 @@ export default function LandingPage() {
       useInvertedBackground={false}
       metrics={[
         {
-          id: "m1",
-          value: "5.0",
-          title: "Satisfaction Rating",
-          items: [
-            "Trusted by families",
-            "High positive feedback",
-          ],
+          id: "m1",          value: "5.0",          title: "Satisfaction Rating",          items: [
+            "Trusted by families",            "High positive feedback"],
         },
         {
-          id: "m2",
-          value: "2900",
-          title: "Location",
-          items: [
-            "Valley Road",
-            "Kampala",
-          ],
+          id: "m2",          value: "2900",          title: "Location",          items: [
+            "Valley Road",            "Kampala"],
         },
         {
-          id: "m3",
-          value: "6AM",
-          title: "Opening Time",
-          items: [
-            "Convenient schedule",
-            "Open until 5 PM",
-          ],
+          id: "m3",          value: "6AM",          title: "Opening Time",          items: [
+            "Convenient schedule",            "Open until 5 PM"],
         },
       ]}
       title="Quick Facts"
@@ -216,23 +156,11 @@ export default function LandingPage() {
       useInvertedBackground={false}
       members={[
         {
-          id: "t1",
-          name: "Teacher Jane",
-          role: "Head Educator",
-          imageSrc: "http://img.b2bpic.net/free-photo/world-book-day-blonde-girl-with-ponytails-pink-backpack-uniform_140725-161797.jpg",
-        },
+          id: "t1",          name: "Teacher Jane",          role: "Head Educator",          imageSrc: "http://img.b2bpic.net/free-photo/world-book-day-blonde-girl-with-ponytails-pink-backpack-uniform_140725-161797.jpg"},
         {
-          id: "t2",
-          name: "Teacher Mark",
-          role: "Music Specialist",
-          imageSrc: "http://img.b2bpic.net/free-photo/boy-playing-with-brain-teaser-toys_23-2149512010.jpg",
-        },
+          id: "t2",          name: "Teacher Mark",          role: "Music Specialist",          imageSrc: "http://img.b2bpic.net/free-photo/boy-playing-with-brain-teaser-toys_23-2149512010.jpg"},
         {
-          id: "t3",
-          name: "Teacher Sarah",
-          role: "Early Development Lead",
-          imageSrc: "http://img.b2bpic.net/free-photo/little-girl-sitting-table-with-books_1157-33822.jpg",
-        },
+          id: "t3",          name: "Teacher Sarah",          role: "Early Development Lead",          imageSrc: "http://img.b2bpic.net/free-photo/little-girl-sitting-table-with-books_1157-33822.jpg"},
       ]}
       title="Our Caring Teachers"
       description="Meet the passionate team nurturing our young learners every day."
@@ -245,60 +173,15 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "1",
-          name: "Parent Name",
-          date: "2024",
-          title: "Excellent Care",
-          quote: "My child loves it here, the teachers are so supportive.",
-          tag: "Parent",
-          avatarSrc: "http://img.b2bpic.net/free-photo/lovely-little-girl-sitting-classroom_23-2147663537.jpg",
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-wqbudvh3.jpg",
-          imageAlt: "smiling toddler classroom",
-        },
+          id: "1",          name: "Parent Name",          date: "2024",          title: "Excellent Care",          quote: "My child loves it here, the teachers are so supportive.",          tag: "Parent",          avatarSrc: "http://img.b2bpic.net/free-photo/lovely-little-girl-sitting-classroom_23-2147663537.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-wqbudvh3.jpg",          imageAlt: "smiling toddler classroom"},
         {
-          id: "2",
-          name: "Parent Name",
-          date: "2024",
-          title: "Safe & Fun",
-          quote: "The environment is extremely safe and engaging.",
-          tag: "Parent",
-          avatarSrc: "http://img.b2bpic.net/free-photo/elementary-students-receiving-support-from-tutor-working-homework_482257-118640.jpg",
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-4rs07iv6.jpg?_wi=2",
-          imageAlt: "smiling toddler classroom",
-        },
+          id: "2",          name: "Parent Name",          date: "2024",          title: "Safe & Fun",          quote: "The environment is extremely safe and engaging.",          tag: "Parent",          avatarSrc: "http://img.b2bpic.net/free-photo/elementary-students-receiving-support-from-tutor-working-homework_482257-118640.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-4rs07iv6.jpg?_wi=2",          imageAlt: "smiling toddler classroom"},
         {
-          id: "3",
-          name: "Parent Name",
-          date: "2024",
-          title: "Great Growth",
-          quote: "Holistic growth is evident in my child's progress.",
-          tag: "Parent",
-          avatarSrc: "http://img.b2bpic.net/free-photo/childhood-innocent-concept-portrait-charming-cute-little-girl-with-gathered-fair-hair-big-beautiful-eyes-sitting-by-window-having-happy-facial-expression-smiling_343059-4413.jpg",
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-rh2fr8g2.jpg",
-          imageAlt: "smiling toddler classroom",
-        },
+          id: "3",          name: "Parent Name",          date: "2024",          title: "Great Growth",          quote: "Holistic growth is evident in my child's progress.",          tag: "Parent",          avatarSrc: "http://img.b2bpic.net/free-photo/childhood-innocent-concept-portrait-charming-cute-little-girl-with-gathered-fair-hair-big-beautiful-eyes-sitting-by-window-having-happy-facial-expression-smiling_343059-4413.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DdUxs1Mz8S6R0SWzqdTsdCjx00/uploaded-1778611766042-rh2fr8g2.jpg",          imageAlt: "smiling toddler classroom"},
         {
-          id: "4",
-          name: "Parent Name",
-          date: "2024",
-          title: "Highly Recommended",
-          quote: "The best decision for our family's early education.",
-          tag: "Parent",
-          avatarSrc: "http://img.b2bpic.net/free-photo/happy-kids-elementary-school_53876-46935.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-little-girl-having-fun-birthday-party_1098-1319.jpg",
-          imageAlt: "smiling toddler classroom",
-        },
+          id: "4",          name: "Parent Name",          date: "2024",          title: "Highly Recommended",          quote: "The best decision for our family's early education.",          tag: "Parent",          avatarSrc: "http://img.b2bpic.net/free-photo/happy-kids-elementary-school_53876-46935.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-little-girl-having-fun-birthday-party_1098-1319.jpg",          imageAlt: "smiling toddler classroom"},
         {
-          id: "5",
-          name: "Parent Name",
-          date: "2024",
-          title: "Exceptional",
-          quote: "Happy kids, happy parents. Incredible school.",
-          tag: "Parent",
-          avatarSrc: "http://img.b2bpic.net/free-photo/little-boy-kitchen-helps-mom-cook-child-is-involved-cooking_1321-1375.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-studying_23-2147666589.jpg",
-          imageAlt: "smiling toddler classroom",
-        },
+          id: "5",          name: "Parent Name",          date: "2024",          title: "Exceptional",          quote: "Happy kids, happy parents. Incredible school.",          tag: "Parent",          avatarSrc: "http://img.b2bpic.net/free-photo/little-boy-kitchen-helps-mom-cook-child-is-involved-cooking_1321-1375.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-studying_23-2147666589.jpg",          imageAlt: "smiling toddler classroom"},
       ]}
       title="Community Voices"
       description="What our wonderful families say about our nursery school."
@@ -310,92 +193,58 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       names={[
-        "Kampala Schools Network",
-        "Early Years Union",
-        "Child Education Fund",
-        "Local Partners",
-        "Kampala Development Board",
-        "Youth Foundation",
-        "Nursery Association",
-      ]}
+        "Kampala Schools Network",        "Early Years Union",        "Child Education Fund",        "Local Partners",        "Kampala Development Board",        "Youth Foundation",        "Nursery Association"]}
       title="Our Trusted Partners"
       description="Proudly working with institutions committed to child development."
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitText
+      <FaqBase
+      title="Common Questions"
+      description="Find answers to frequently asked questions about our nursery school."
+      faqsAnimation="slide-up"
+      textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
         {
-          id: "q1",
-          title: "What are the school hours?",
-          content: "We open at 6:00 AM and close at 5:00 PM.",
-        },
+          id: "q1",          title: "What are the school hours?",          content: "We open at 6:00 AM and close at 5:00 PM."},
         {
-          id: "q2",
-          title: "What is the location?",
-          content: "We are located at 2900 Valley Rd, Kampala.",
-        },
+          id: "q2",          title: "What is the location?",          content: "We are located at 2900 Valley Rd, Kampala."},
         {
-          id: "q3",
-          title: "How can I contact you?",
-          content: "Call us directly at 0761 677146.",
-        },
+          id: "q3",          title: "How can I contact you?",          content: "Call us directly at 0761 677146."},
       ]}
-      sideTitle="Common Questions"
-      faqsAnimation="slide-up"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
-      useInvertedBackground={false}
-      background={{
-        variant: "sparkles-gradient",
-      }}
-      text="Join our school community. Visit us at 2900 Valley Rd, Kampala, or reach out to us at 0761 677146."
-      buttons={[
-        {
-          text: "Call School",
-          href: "tel:0761677146",
-        },
+      <ContactSplitForm
+      title="Get in Touch"
+      description="Have questions or want to schedule a visit? Fill out the form below."
+      inputs={[
+        { name: "name", type: "text", placeholder: "Your Name", required: true },
+        { name: "email", type: "email", placeholder: "Your Email", required: true },
       ]}
+      textarea={{ name: "message", placeholder: "Your message for us...", required: true }}
+      useInvertedBackground={false}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBaseReveal
+      <FooterBase
       logoText="Kidz Kollege"
       columns={[
         {
-          title: "Links",
-          items: [
-            {
-              label: "Home",
-              href: "#hero",
-            },
-            {
-              label: "About",
-              href: "#about",
-            },
-            {
-              label: "Programs",
-              href: "#features",
-            },
+          title: "Links",          items: [
+            { label: "Home", href: "#hero" },
+            { label: "About", href: "#about" },
+            { label: "Programs", href: "#features" },
           ],
         },
         {
-          title: "Contact",
-          items: [
-            {
-              label: "0761 677146",
-              href: "tel:0761677146",
-            },
-            {
-              label: "2900 Valley Rd, Kampala",
-              href: "#",
-            },
+          title: "Contact",          items: [
+            { label: "0761 677146", href: "tel:0761677146" },
+            { label: "2900 Valley Rd, Kampala", href: "#" },
           ],
         },
       ]}