diff --git a/src/app/page.tsx b/src/app/page.tsx
index 13905b1..d9f7304 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 FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
-import FooterCard from '@/components/sections/footer/FooterCard';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroOverlayTestimonial from '@/components/sections/hero/HeroOverlayTestimonial';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
@@ -32,21 +32,13 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
-          id: "home",
-        },
+          name: "Home",          id: "home"},
         {
-          name: "Menu",
-          id: "menu",
-        },
+          name: "Menu",          id: "menu"},
         {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
         {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "Contact",          id: "contact"},
       ]}
       brandName="Grillesta"
     />
@@ -58,63 +50,33 @@ export default function LandingPage() {
       description="Crafted with passion, served with love. Grillesta Cafe brings you the finest ingredients in a warm, inviting atmosphere designed for moments that matter."
       testimonials={[
         {
-          name: "Elena Ross",
-          handle: "@elena",
-          testimonial: "The best lattes in town, hands down.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-with-dark-long-hair-talking-phone-coffee-shop_273609-2803.jpg",
-        },
+          name: "Elena Ross",          handle: "@elena",          testimonial: "The best lattes in town, hands down.",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-with-dark-long-hair-talking-phone-coffee-shop_273609-2803.jpg"},
         {
-          name: "Marcus Chen",
-          handle: "@mchen",
-          testimonial: "Consistently fresh and friendly staff.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-friends-having-cocktails_23-2150244992.jpg",
-        },
+          name: "Marcus Chen",          handle: "@mchen",          testimonial: "Consistently fresh and friendly staff.",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-friends-having-cocktails_23-2150244992.jpg"},
         {
-          name: "Sarah Miller",
-          handle: "@sarahm",
-          testimonial: "My go-to spot for remote work sessions.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/roommates-spending-time-together_23-2149359311.jpg",
-        },
+          name: "Sarah Miller",          handle: "@sarahm",          testimonial: "My go-to spot for remote work sessions.",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/roommates-spending-time-together_23-2149359311.jpg"},
         {
-          name: "James O'Neill",
-          handle: "@joneill",
-          testimonial: "Excellent artisanal snacks and brews.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/team-young-colleagues-having-meeting-cafe_273609-16250.jpg",
-        },
+          name: "James O'Neill",          handle: "@joneill",          testimonial: "Excellent artisanal snacks and brews.",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/team-young-colleagues-having-meeting-cafe_273609-16250.jpg"},
         {
-          name: "Linda V.",
-          handle: "@lindav",
-          testimonial: "A wonderful, inclusive community hub.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/dark-skinned-young-female-friend-has-positive-expression-make-selfie-drink-smoothie-spend-recreation-time-cafeteria-people-recreation-time-lifestyle-concept_273609-2429.jpg",
-        },
+          name: "Linda V.",          handle: "@lindav",          testimonial: "A wonderful, inclusive community hub.",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/dark-skinned-young-female-friend-has-positive-expression-make-selfie-drink-smoothie-spend-recreation-time-cafeteria-people-recreation-time-lifestyle-concept_273609-2429.jpg"},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/bearded-hipster-using-laptop-cafe_171337-18088.jpg"
       avatars={[
         {
-          src: "http://img.b2bpic.net/free-photo/young-attractive-woman-striped-trench-coat-happily-talking-cellphone-sitting-near-big-window-while-spending-time-modern-cafe_574295-4851.jpg",
-          alt: "Customer profile 1",
-        },
+          src: "http://img.b2bpic.net/free-photo/young-attractive-woman-striped-trench-coat-happily-talking-cellphone-sitting-near-big-window-while-spending-time-modern-cafe_574295-4851.jpg",          alt: "Customer profile 1"},
         {
-          src: "http://img.b2bpic.net/free-photo/closeup-white-coffee-cup-wooden-table_53876-31719.jpg",
-          alt: "Customer profile 2",
-        },
+          src: "http://img.b2bpic.net/free-photo/closeup-white-coffee-cup-wooden-table_53876-31719.jpg",          alt: "Customer profile 2"},
         {
-          src: "http://img.b2bpic.net/free-photo/coffee-cup-wooden-table-with-gradient-photo-style_53876-14314.jpg",
-          alt: "Customer profile 3",
-        },
+          src: "http://img.b2bpic.net/free-photo/coffee-cup-wooden-table-with-gradient-photo-style_53876-14314.jpg",          alt: "Customer profile 3"},
         {
-          src: "http://img.b2bpic.net/free-photo/trendy-coffee-shop-city_53876-30213.jpg",
-          alt: "Customer profile 4",
-        },
+          src: "http://img.b2bpic.net/free-photo/trendy-coffee-shop-city_53876-30213.jpg",          alt: "Customer profile 4"},
         {
-          src: "http://img.b2bpic.net/free-photo/great-coffee-is-only-this-place_329181-2889.jpg",
-          alt: "Customer profile 5",
-        },
+          src: "http://img.b2bpic.net/free-photo/great-coffee-is-only-this-place_329181-2889.jpg",          alt: "Customer profile 5"},
       ]}
       avatarText="Loved by over 500+ locals"
     />
@@ -128,17 +90,11 @@ export default function LandingPage() {
       description="Born from a love for traditional techniques and modern flair, our cafe serves as a community hub for quality food enthusiasts. We source locally to ensure every bite is fresh, ethical, and delicious."
       bulletPoints={[
         {
-          title: "Locally Sourced",
-          description: "We partner with local farmers for the freshest seasonal ingredients.",
-        },
+          title: "Locally Sourced",          description: "We partner with local farmers for the freshest seasonal ingredients."},
         {
-          title: "Artisanal Coffee",
-          description: "Expertly roasted beans to start your day with perfection.",
-        },
+          title: "Artisanal Coffee",          description: "Expertly roasted beans to start your day with perfection."},
         {
-          title: "Cozy Atmosphere",
-          description: "A warm space curated for work, relaxation, and conversation.",
-        },
+          title: "Cozy Atmosphere",          description: "A warm space curated for work, relaxation, and conversation."},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/african-boy-caucasian-girls-are-laughing-cosy-open-air-cafe-hot-sunny-day_8353-9768.jpg"
     />
@@ -152,47 +108,17 @@ export default function LandingPage() {
       useInvertedBackground={true}
       products={[
         {
-          id: "1",
-          name: "Signature Latte",
-          price: "$5.50",
-          variant: "Small/Large",
-          imageSrc: "http://img.b2bpic.net/free-photo/food-delicious-photo-crousant_624325-1728.jpg",
-        },
+          id: "1",          name: "Signature Latte",          price: "$5.50",          variant: "Small/Large",          imageSrc: "http://img.b2bpic.net/free-photo/food-delicious-photo-crousant_624325-1728.jpg"},
         {
-          id: "2",
-          name: "Avocado Toast",
-          price: "$12.00",
-          variant: "Classic/Spicy",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-shot-bowl-tomato-soup-plate-fresh-salad-table_181624-41154.jpg",
-        },
+          id: "2",          name: "Avocado Toast",          price: "$12.00",          variant: "Classic/Spicy",          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-shot-bowl-tomato-soup-plate-fresh-salad-table_181624-41154.jpg"},
         {
-          id: "3",
-          name: "Artisan Pastry",
-          price: "$4.25",
-          variant: "Sweet/Salty",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-seafood-meals-with-notepad_23-2148643670.jpg",
-        },
+          id: "3",          name: "Artisan Pastry",          price: "$4.25",          variant: "Sweet/Salty",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-seafood-meals-with-notepad_23-2148643670.jpg"},
         {
-          id: "4",
-          name: "Farmhouse Salad",
-          price: "$14.50",
-          variant: "Large",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-chilling-out-with-coffee-cafe_53876-13954.jpg",
-        },
+          id: "4",          name: "Farmhouse Salad",          price: "$14.50",          variant: "Large",          imageSrc: "http://img.b2bpic.net/free-photo/woman-chilling-out-with-coffee-cafe_53876-13954.jpg"},
         {
-          id: "5",
-          name: "Roasted Tomato Soup",
-          price: "$8.00",
-          variant: "Bowl",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-breakfast-sandwiches-with-salmon-avocado_23-2148797014.jpg",
-        },
+          id: "5",          name: "Roasted Tomato Soup",          price: "$8.00",          variant: "Bowl",          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-breakfast-sandwiches-with-salmon-avocado_23-2148797014.jpg"},
         {
-          id: "6",
-          name: "Cold Brew Special",
-          price: "$6.00",
-          variant: "Iced",
-          imageSrc: "http://img.b2bpic.net/free-photo/red-lentil-soup-with-spices-checked-tablecloth_114579-4504.jpg",
-        },
+          id: "6",          name: "Cold Brew Special",          price: "$6.00",          variant: "Iced",          imageSrc: "http://img.b2bpic.net/free-photo/red-lentil-soup-with-spices-checked-tablecloth_114579-4504.jpg"},
       ]}
       title="Fresh Daily Menu"
       description="From morning brews to hearty lunch plates, explore our selection of freshly prepared dishes designed to delight your senses."
@@ -206,38 +132,17 @@ export default function LandingPage() {
       useInvertedBackground={false}
       features={[
         {
-          id: "f1",
-          title: "Sustainable Practices",
-          author: "Ethos",
-          description: "Committed to minimal waste and eco-friendly packaging.",
-          tags: [
-            "Eco",
-            "Green",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/bar-concept-with-barman-putting-milk-coffee_23-2147798051.jpg",
-        },
+          id: "f1",          title: "Sustainable Practices",          author: "Ethos",          description: "Committed to minimal waste and eco-friendly packaging.",          tags: [
+            "Eco",            "Green"],
+          imageSrc: "http://img.b2bpic.net/free-photo/bar-concept-with-barman-putting-milk-coffee_23-2147798051.jpg"},
         {
-          id: "f2",
-          title: "Expert Staff",
-          author: "Team",
-          description: "Our trained baristas ensure consistent quality in every cup.",
-          tags: [
-            "Pro",
-            "Expert",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-people-eating-break-time_23-2149256937.jpg",
-        },
+          id: "f2",          title: "Expert Staff",          author: "Team",          description: "Our trained baristas ensure consistent quality in every cup.",          tags: [
+            "Pro",            "Expert"],
+          imageSrc: "http://img.b2bpic.net/free-photo/close-up-people-eating-break-time_23-2149256937.jpg"},
         {
-          id: "f3",
-          title: "Inclusive Space",
-          author: "Community",
-          description: "Welcome to a space accessible and open to all.",
-          tags: [
-            "Local",
-            "Friendly",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/coffee-business-concept-handsome-bearded-man-apron-making-coffee-while-standing-cafe_1258-103897.jpg",
-        },
+          id: "f3",          title: "Inclusive Space",          author: "Community",          description: "Welcome to a space accessible and open to all.",          tags: [
+            "Local",            "Friendly"],
+          imageSrc: "http://img.b2bpic.net/free-photo/coffee-business-concept-handsome-bearded-man-apron-making-coffee-while-standing-cafe_1258-103897.jpg"},
       ]}
       title="Why Choose Us"
       description="We pride ourselves on providing more than just coffee—we provide a lifestyle experience where quality is never compromised."
@@ -252,45 +157,20 @@ export default function LandingPage() {
       useInvertedBackground={true}
       testimonials={[
         {
-          id: "1",
-          name: "Sarah J.",
-          role: "Regular",
-          company: "Grillesta",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/people-leisure-lifestyle-concept-successful-young-man-black-hat-casual-t-shirt-having-coffee-sitting-sidewalk-restaurant_273609-1754.jpg",
-        },
+          id: "1",          name: "Sarah J.",          role: "Regular",          company: "Grillesta",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/people-leisure-lifestyle-concept-successful-young-man-black-hat-casual-t-shirt-having-coffee-sitting-sidewalk-restaurant_273609-1754.jpg"},
         {
-          id: "2",
-          name: "Mike T.",
-          role: "Student",
-          company: "Grillesta",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/person-cafe-enjoying-book_23-2150064689.jpg",
-        },
+          id: "2",          name: "Mike T.",          role: "Student",          company: "Grillesta",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/person-cafe-enjoying-book_23-2150064689.jpg"},
         {
-          id: "3",
-          name: "Anna W.",
-          role: "Guest",
-          company: "Grillesta",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-reddish-man-drinking-coffee-while-looking-right_158595-3729.jpg",
-        },
+          id: "3",          name: "Anna W.",          role: "Guest",          company: "Grillesta",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/young-reddish-man-drinking-coffee-while-looking-right_158595-3729.jpg"},
         {
-          id: "4",
-          name: "Tom D.",
-          role: "Visitor",
-          company: "Grillesta",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/candid-indoor-shot-cute-homosexual-couple-holding-hands-looking-camera-with-happy-smiles_273609-9025.jpg",
-        },
+          id: "4",          name: "Tom D.",          role: "Visitor",          company: "Grillesta",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/candid-indoor-shot-cute-homosexual-couple-holding-hands-looking-camera-with-happy-smiles_273609-9025.jpg"},
         {
-          id: "5",
-          name: "Beth K.",
-          role: "Local",
-          company: "Grillesta",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-asian-hipster-sitting-cafe-writing-notebook_1098-17604.jpg",
-        },
+          id: "5",          name: "Beth K.",          role: "Local",          company: "Grillesta",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/young-asian-hipster-sitting-cafe-writing-notebook_1098-17604.jpg"},
       ]}
       title="Loved by Locals"
       description="Don't just take our word for it. Hear what our community has to say about their Grillesta experience."
@@ -302,59 +182,49 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       names={[
-        "Microsoft",
-        "Google",
-        "Apple",
-        "Amazon",
-        "Netflix",
-        "Facebook",
-        "Twitter",
-      ]}
+        "Microsoft",        "Google",        "Apple",        "Amazon",        "Netflix",        "Facebook",        "Twitter"]}
       title="Community Partners"
       description="Proudly working with local businesses and organizations to support the neighborhood."
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitText
+      <FaqDouble
       useInvertedBackground={true}
       faqs={[
         {
-          id: "q1",
-          title: "Do you offer vegan options?",
-          content: "Yes, we have a variety of plant-based menu items available daily.",
-        },
+          id: "q1",          title: "Do you offer vegan options?",          content: "Yes, we have a variety of plant-based menu items available daily."},
         {
-          id: "q2",
-          title: "Can I book space for events?",
-          content: "Yes, our space is available for private event bookings outside peak hours.",
-        },
+          id: "q2",          title: "Can I book space for events?",          content: "Yes, our space is available for private event bookings outside peak hours."},
         {
-          id: "q3",
-          title: "Is there free Wi-Fi?",
-          content: "Absolutely, enjoy high-speed Wi-Fi while you enjoy your meal.",
-        },
+          id: "q3",          title: "Is there free Wi-Fi?",          content: "Absolutely, enjoy high-speed Wi-Fi while you enjoy your meal."},
       ]}
-      sideTitle="Questions?"
-      sideDescription="Check our common FAQs or reach out directly."
+      title="Questions?"
+      description="Check our common FAQs or reach out directly."
       faqsAnimation="slide-up"
+      textboxLayout="default"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactSplitForm
+      title="Get in Touch"
+      description="Have a question or want to chat about catering? Reach out to us below!"
+      inputs={[
+        { name: "name", type: "text", placeholder: "Name" },
+        { name: "email", type: "email", placeholder: "Email" }
+      ]}
       useInvertedBackground={false}
-      background={{
-        variant: "gradient-bars",
-      }}
-      text="Join us today for a coffee or meal. We're open daily from 7:00 AM to 8:00 PM."
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterCard
+      <FooterBase
       logoText="Grillesta"
-      copyrightText="© 2025 Grillesta Cafe. All rights reserved."
+      columns={[
+        { title: "Company", items: [{ label: "About", href: "#about" }, { label: "Contact", href: "#contact" }] },
+        { title: "Support", items: [{ label: "FAQ", href: "#faq" }] }
+      ]}
     />
   </div>
       </ReactLenis>