diff --git a/src/app/page.tsx b/src/app/page.tsx
index 482a7d8..b6b44a0 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,15 +3,15 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterCard from '@/components/sections/footer/FooterCard';
 import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import { Award, ShoppingBag, Users, Leaf, DollarSign, Truck, Smile } from "lucide-react";
+import { Award, ShoppingBag, Users, Leaf, DollarSign, Truck, Smile, MapPin, Phone, Mail } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -31,14 +31,10 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleCentered
       navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "About",          id: "about"},
-        {
-          name: "Products",          id: "products"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "hero" },
+        { name: "About", id: "about" },
+        { name: "Products", id: "products" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="Hassan General Store"
     />
@@ -46,21 +42,13 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroBillboardGallery
-      background={{
-        variant: "gradient-bars"}}
+      background={{ variant: "gradient-bars" }}
       title="Welcome to Hassan General Store"
       description="Your neighborhood destination for fresh, high-quality groceries and essential household items."
       mediaItems={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/client-shopping-local-retailer_23-2149349422.jpg?_wi=1",          imageAlt: "Fresh produce market stall"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/mangoes-market_1398-2249.jpg?_wi=1",          imageAlt: "Friendly grocer smiling"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/locally-grown-farming-products-empty-farmers-market-stand_482257-77589.jpg?_wi=1",          imageAlt: "Organic vegetables shelf"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/sesonal-vegetable-market-with-variety-agriculture-products-shelfs-boxes_613910-5422.jpg",          imageAlt: "Seasonal vegetable market variety"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/couple-supporting-local-merchant_482257-76594.jpg",          imageAlt: "Couple supporting local merchant"},
+        { imageSrc: "http://img.b2bpic.net/free-photo/client-shopping-local-retailer_23-2149349422.jpg?_wi=1", imageAlt: "Fresh produce market stall" },
+        { imageSrc: "http://img.b2bpic.net/free-photo/mangoes-market_1398-2249.jpg?_wi=1", imageAlt: "Friendly grocer smiling" },
+        { imageSrc: "http://img.b2bpic.net/free-photo/locally-grown-farming-products-empty-farmers-market-stand_482257-77589.jpg?_wi=1", imageAlt: "Organic vegetables shelf" },
       ]}
       mediaAnimation="slide-up"
     />
@@ -71,15 +59,9 @@ export default function LandingPage() {
       useInvertedBackground={false}
       title="Committed to Quality"
       metrics={[
-        {
-          icon: ShoppingBag,
-          label: "Product Variety",          value: "500+"},
-        {
-          icon: Award,
-          label: "Years Served",          value: "10+"},
-        {
-          icon: Users,
-          label: "Happy Neighbors",          value: "2k+"},
+        { icon: ShoppingBag, label: "Product Variety", value: "500+" },
+        { icon: Award, label: "Years Served", value: "10+" },
+        { icon: Users, label: "Happy Neighbors", value: "2k+" },
       ]}
       metricsAnimation="blur-reveal"
     />
@@ -92,18 +74,9 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       products={[
-        {
-          id: "p1",          name: "Organic Vegetables",          price: "$2.99",          variant: "Fresh",          imageSrc: "http://img.b2bpic.net/free-photo/food-vegetable-colorful-background-tasty-fresh-vegetables-wooden-table-top-view-with-copy-space_1220-1490.jpg"},
-        {
-          id: "p2",          name: "Seasonal Fruits",          price: "$3.49",          variant: "Fresh",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-red-yellow-apples-plums-feykhoas-pears-persimmons-wicker-baskets-also-ground_140725-90151.jpg"},
-        {
-          id: "p3",          name: "Dairy Products",          price: "$4.50",          variant: "Chilled",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-futuristic-soft-drink_23-2151281790.jpg"},
-        {
-          id: "p4",          name: "Artisan Bread",          price: "$2.50",          variant: "Baked",          imageSrc: "http://img.b2bpic.net/free-photo/large-loaves-bread-counter-bakery_169016-19951.jpg"},
-        {
-          id: "p5",          name: "Pantry Staples",          price: "$5.00",          variant: "Essential",          imageSrc: "http://img.b2bpic.net/free-photo/3d-rendering-cartoon-shopping-cart_23-2151680626.jpg"},
-        {
-          id: "p6",          name: "Assorted Goods",          price: "$1.99",          variant: "Package",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-bread-reusable-bag-with-bulk-pasta-nuts_23-2148493532.jpg"},
+        { id: "p1", name: "Organic Vegetables", price: "$2.99", variant: "Fresh", imageSrc: "http://img.b2bpic.net/free-photo/food-vegetable-colorful-background-tasty-fresh-vegetables-wooden-table-top-view-with-copy-space_1220-1490.jpg" },
+        { id: "p2", name: "Seasonal Fruits", price: "$3.49", variant: "Fresh", imageSrc: "http://img.b2bpic.net/free-photo/top-view-red-yellow-apples-plums-feykhoas-pears-persimmons-wicker-baskets-also-ground_140725-90151.jpg" },
+        { id: "p3", name: "Dairy Products", price: "$4.50", variant: "Chilled", imageSrc: "http://img.b2bpic.net/free-photo/close-up-futuristic-soft-drink_23-2151281790.jpg" },
       ]}
       title="Fresh Arrivals"
       description="Browse our hand-picked selection of fresh groceries."
@@ -115,21 +88,13 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       features={[
-        {
-          title: "Farm-Fresh",          description: "Locally sourced produce delivered daily.",          buttonIcon: Leaf,
-          imageSrc: "http://img.b2bpic.net/free-photo/vegetables-bread-shopping-bag-wooden-surface_169016-20848.jpg",          imageAlt: "grocery store icon set"},
-        {
-          title: "Affordable Prices",          description: "Competitive rates for all families.",          buttonIcon: DollarSign,
-          imageSrc: "http://img.b2bpic.net/free-photo/client-shopping-local-retailer_23-2149349422.jpg?_wi=2",          imageAlt: "grocery store icon set"},
-        {
-          title: "Quick Delivery",          description: "Get essentials at your doorstep.",          buttonIcon: Truck,
-          imageSrc: "http://img.b2bpic.net/free-photo/mangoes-market_1398-2249.jpg?_wi=2",          imageAlt: "grocery store icon set"},
-        {
-          title: "Exceptional Service",          description: "Always here to help you shop.",          buttonIcon: Smile,
-          imageSrc: "http://img.b2bpic.net/free-photo/locally-grown-farming-products-empty-farmers-market-stand_482257-77589.jpg?_wi=2",          imageAlt: "grocery store icon set"},
+        { title: "Farm-Fresh", description: "Locally sourced produce delivered daily.", buttonIcon: Leaf },
+        { title: "Affordable Prices", description: "Competitive rates for all families.", buttonIcon: DollarSign },
+        { title: "Quick Delivery", description: "Get essentials at your doorstep.", buttonIcon: Truck },
+        { title: "Exceptional Service", description: "Always here to help you shop.", buttonIcon: Smile },
       ]}
       title="Why Choose Us?"
-      description="Experience convenience and quality like never before at Hassan General Store."
+      description="Experience convenience and quality like never before."
     />
   </div>
 
@@ -139,16 +104,9 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       testimonials={[
-        {
-          id: "1",          name: "Ahmed K.",          handle: "@ahmedk",          testimonial: "Fresh and high quality products every time.",          imageSrc: "http://img.b2bpic.net/free-photo/mother-with-daughter-supermarket_1157-21968.jpg"},
-        {
-          id: "2",          name: "Sarah M.",          handle: "@sarahm",          testimonial: "The best corner store in the neighborhood.",          imageSrc: "http://img.b2bpic.net/free-photo/girl-red-holding-bananas-fruits-store_627829-9465.jpg"},
-        {
-          id: "3",          name: "John D.",          handle: "@johnd",          testimonial: "Great service and friendly staff.",          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-supermarket-with-vegetables-fruits-buying-groceries_169016-19098.jpg"},
-        {
-          id: "4",          name: "Fatima Z.",          handle: "@fatimaz",          testimonial: "Always fresh, always reliable.",          imageSrc: "http://img.b2bpic.net/free-photo/cute-little-girl-supermarket_1157-21969.jpg"},
-        {
-          id: "5",          name: "Ali B.",          handle: "@alib",          testimonial: "A staple of our community.",          imageSrc: "http://img.b2bpic.net/free-photo/smiley-woman-with-grocery-bags-having-juice-outdoors_23-2148781528.jpg"},
+        { id: "1", name: "Ahmed K.", handle: "@ahmedk", testimonial: "Fresh and high quality products every time." },
+        { id: "2", name: "Sarah M.", handle: "@sarahm", testimonial: "The best corner store in the neighborhood." },
+        { id: "3", name: "John D.", handle: "@johnd", testimonial: "Great service and friendly staff." },
       ]}
       title="Community Voices"
       description="What our neighbors are saying about us."
@@ -156,66 +114,44 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitText
+      <FaqDouble
+      title="Frequently Asked Questions"
+      description="Everything you need to know about shopping with us."
+      faqsAnimation="slide-up"
+      textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
-        {
-          id: "q1",          title: "Do you deliver?",          content: "Yes, we offer doorstep delivery services."},
-        {
-          id: "q2",          title: "Are you open daily?",          content: "We operate from 8 AM to 10 PM daily."},
-        {
-          id: "q3",          title: "Do you accept cards?",          content: "Yes, all major cards are accepted."},
+        { id: "q1", title: "Do you offer home delivery?", content: "Yes! We deliver fresh groceries directly to your doorstep within 2 hours." },
+        { id: "q2", title: "What are your operating hours?", content: "We are open 7 days a week, from 8 AM until 10 PM." },
+        { id: "q3", title: "How do I place an order?", content: "You can visit our store, call us, or use our mobile app to place your order." },
+        { id: "q4", title: "Do you accept food stamps/EBT?", content: "Yes, we are an authorized EBT retailer and accept all major debit and credit cards." },
       ]}
-      sideTitle="Questions?"
-      faqsAnimation="blur-reveal"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactSplitForm
-      useInvertedBackground={false}
-      title="Reach Out"
-      description="We would love to hear from our neighbors. Send us a message."
-      inputs={[
-        {
-          name: "name",          type: "text",          placeholder: "Your Name",          required: true,
-        },
-        {
-          name: "email",          type: "email",          placeholder: "Your Email",          required: true,
-        },
-      ]}
-      textarea={{
-        name: "message",        placeholder: "How can we help?",        rows: 4,
-        required: true,
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/asian-couple-shopping-flowers-barcelona_657883-571.jpg"
+      <ContactCTA
+      tag="Contact Us"
+      title="Have Questions or Need Assistance?"
+      description="Our team is ready to help you with orders, product inquiries, or feedback. Reach out today."
+      buttons={[{ text: "Call Us Now", href: "tel:+1234567890" }, { text: "Email Support", href: "mailto:support@hassanstore.com" }]}
+      useInvertedBackground={true}
+      background={{ variant: "sparkles-gradient" }}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBaseReveal
+      <FooterCard
       logoText="Hassan General Store"
-      columns={[
-        {
-          title: "Quick Links",          items: [
-            {
-              label: "Products",              href: "#products"},
-            {
-              label: "FAQ",              href: "#faq"},
-          ],
-        },
-        {
-          title: "Contact",          items: [
-            {
-              label: "Message Us",              href: "#contact"},
-            {
-              label: "Location",              href: "#"},
-          ],
-        },
+      copyrightText="© 2025 Hassan General Store. Serving the community with pride."
+      socialLinks={[
+        { icon: MapPin, href: "#", ariaLabel: "Location" },
+        { icon: Phone, href: "tel:+1234567890", ariaLabel: "Phone" },
+        { icon: Mail, href: "mailto:info@hassanstore.com", ariaLabel: "Email" },
       ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file