diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0b475ba..f99debd 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,10 +6,10 @@ import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCa
 import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
 import FeatureCardTwentyOne from "@/components/sections/feature/FeatureCardTwentyOne";
-import TestimonialCardSixteen from "@/components/sections/testimonial/TestimonialCardSixteen";
-import ContactSplit from "@/components/sections/contact/ContactSplit";
-import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
-import { Coffee, MapPin } from "lucide-react";
+import TestimonialCardThirteen from "@/components/sections/testimonial/TestimonialCardThirteen";
+import ContactCTA from "@/components/sections/contact/ContactCTA";
+import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
+import { Coffee, MapPin, Phone, Clock, Mail } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -33,11 +33,12 @@ export default function LandingPage() {
             { name: "About", id: "about" },
             { name: "Menu", id: "menu" },
             { name: "Gallery", id: "gallery" },
-            { name: "Reviews", id: "testimonials" },
-            { name: "Visit Us", id: "contact" },
+            { name: "Reviews", id: "reviews" },
+            { name: "Visit Us", id: "visit" },
           ]}
           button={{
-            text: "Order Online",            href: "https://boltfood.com"}}
+            text: "Order Online",            href: "https://boltfood.com"
+          }}
         />
       </div>
 
@@ -47,15 +48,18 @@ export default function LandingPage() {
           description="Fresh Coffee & Artisan Pastries in Accra"
           buttons={[
             { text: "View Menu", href: "#menu" },
-            { text: "Visit Us", href: "#contact" },
+            { text: "Visit Us", href: "#visit" },
           ]}
           slides={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-breakfast-arrangement-with-coffee-pastry_23-2148623195.jpg",              imageAlt: "Fresh coffee and pastries"},
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-breakfast-arrangement-with-coffee-pastry_23-2148623195.jpg",              imageAlt: "Fresh coffee and pastries"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/cafe-interior-with-orange-sofa-three-tables-three-black-chairs_181624-8624.jpg",              imageAlt: "Specialty latte with latte art"},
+              imageSrc: "http://img.b2bpic.net/free-photo/cafe-interior-with-orange-sofa-three-tables-three-black-chairs_181624-8624.jpg",              imageAlt: "Specialty latte with latte art"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-black-tea-with-baked-food_23-2147860375.jpg",              imageAlt: "Chocolate croissant and coffee"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-black-tea-with-baked-food_23-2147860375.jpg",              imageAlt: "Chocolate croissant and coffee"
+            },
           ]}
           autoplayDelay={4000}
           showDimOverlay={true}
@@ -66,7 +70,8 @@ export default function LandingPage() {
         <TextSplitAbout
           title="About The Good Baker"
           description={[
-            "Welcome to The Good Baker, Accra's premier destination for handcrafted coffee and freshly baked pastries. Nestled in the heart of Amal Suites on Garden Street, our cafe celebrates the art of traditional baking and specialty coffee preparation.",            "We believe in the power of quality ingredients and expert craftsmanship. Every croissant is butter-layered to perfection, every coffee bean is carefully selected from premium roasters, and every sandwich is prepared with fresh, locally-sourced ingredients. Our welcoming staff creates a relaxing ambience where you can escape the hustle and bustle of the city.",            "Whether you're stopping by for your morning cappuccino, a leisurely lunch, or an afternoon pastry break, The Good Baker is your sanctuary for exceptional taste and warm hospitality."]}
+            "Welcome to The Good Baker, Accra's premier destination for handcrafted coffee and freshly baked pastries. Nestled in the heart of Amal Suites on Garden Street, our cafe celebrates the art of traditional baking and specialty coffee preparation.",            "We believe in the power of quality ingredients and expert craftsmanship. Every croissant is butter-layered to perfection, every coffee bean is carefully selected from premium roasters, and every sandwich is prepared with fresh, locally-sourced ingredients. Our welcoming staff creates a relaxing ambience where you can escape the hustle and bustle of the city.",            "Whether you're stopping by for your morning cappuccino, a leisurely lunch, or an afternoon pastry break, The Good Baker is your sanctuary for exceptional taste and warm hospitality."
+          ]}
           buttons={[{ text: "See Our Menu", href: "#menu" }]}
           showBorder={true}
           useInvertedBackground={false}
@@ -82,37 +87,48 @@ export default function LandingPage() {
           products={[
             {
               id: "1",              brand: "The Good Baker",              name: "Cappuccino",              price: "GHS 12.00",              rating: 5,
-              reviewCount: "180+",              imageSrc: "http://img.b2bpic.net/free-photo/latte-macchiato-black-coffee-milk-espresso-milk-foam_141793-4470.jpg",              imageAlt: "Cappuccino with latte art"},
+              reviewCount: "180+",              imageSrc: "http://img.b2bpic.net/free-photo/latte-macchiato-black-coffee-milk-espresso-milk-foam_141793-4470.jpg",              imageAlt: "Cappuccino with latte art"
+            },
             {
               id: "2",              brand: "The Good Baker",              name: "Latte",              price: "GHS 12.00",              rating: 5,
-              reviewCount: "160+",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-smartphone_23-2149045740.jpg",              imageAlt: "Creamy latte coffee"},
+              reviewCount: "160+",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-smartphone_23-2149045740.jpg",              imageAlt: "Creamy latte coffee"
+            },
             {
               id: "3",              brand: "The Good Baker",              name: "Hot Chocolate",              price: "GHS 10.00",              rating: 5,
-              reviewCount: "140+",              imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-assortment-with-mugs-with-tasty-beverage_23-2148325633.jpg",              imageAlt: "Hot chocolate with marshmallows"},
+              reviewCount: "140+",              imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-assortment-with-mugs-with-tasty-beverage_23-2148325633.jpg",              imageAlt: "Hot chocolate with marshmallows"
+            },
             {
               id: "4",              brand: "The Good Baker",              name: "Cheese Croissant",              price: "GHS 8.50",              rating: 5,
-              reviewCount: "95+",              imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011668.jpg",              imageAlt: "Savory cheese croissant"},
+              reviewCount: "95+",              imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011668.jpg",              imageAlt: "Savory cheese croissant"
+            },
             {
               id: "5",              brand: "The Good Baker",              name: "Chocolate Croissant",              price: "GHS 8.50",              rating: 5,
-              reviewCount: "110+",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-delicious-pastry-plate_23-2148414091.jpg",              imageAlt: "Chocolate filled croissant"},
+              reviewCount: "110+",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-delicious-pastry-plate_23-2148414091.jpg",              imageAlt: "Chocolate filled croissant"
+            },
             {
               id: "6",              brand: "The Good Baker",              name: "Tuna Bagel",              price: "GHS 15.00",              rating: 5,
-              reviewCount: "85+",              imageSrc: "http://img.b2bpic.net/free-photo/hamburgers-white-plate_181624-8125.jpg",              imageAlt: "Fresh tuna bagel sandwich"},
+              reviewCount: "85+",              imageSrc: "http://img.b2bpic.net/free-photo/hamburgers-white-plate_181624-8125.jpg",              imageAlt: "Fresh tuna bagel sandwich"
+            },
             {
               id: "7",              brand: "The Good Baker",              name: "Caprese Sandwich",              price: "GHS 18.00",              rating: 5,
-              reviewCount: "92+",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-tasty-toasts-with-tomatoes-olives-wooden-board-white-background-lunch-food-bread-horizontal-meal-dinner-snack-sandwich-burger_140725-156367.jpg",              imageAlt: "Caprese sandwich with tomato and mozzarella"},
+              reviewCount: "92+",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-tasty-toasts-with-tomatoes-olives-wooden-board-white-background-lunch-food-bread-horizontal-meal-dinner-snack-sandwich-burger_140725-156367.jpg",              imageAlt: "Caprese sandwich with tomato and mozzarella"
+            },
             {
               id: "8",              brand: "The Good Baker",              name: "Lemon Tart",              price: "GHS 9.00",              rating: 5,
-              reviewCount: "75+",              imageSrc: "http://img.b2bpic.net/free-photo/delicious-mini-lemon-pies-with-fresh-lemons-top-view_114579-9629.jpg",              imageAlt: "Lemon curd tart dessert"},
+              reviewCount: "75+",              imageSrc: "http://img.b2bpic.net/free-photo/delicious-mini-lemon-pies-with-fresh-lemons-top-view_114579-9629.jpg",              imageAlt: "Lemon curd tart dessert"
+            },
             {
               id: "9",              brand: "The Good Baker",              name: "Mille Feuille",              price: "GHS 10.50",              rating: 5,
-              reviewCount: "88+",              imageSrc: "http://img.b2bpic.net/free-photo/opera-cake-dessert-wooden-table_123827-20788.jpg",              imageAlt: "French mille feuille pastry"},
+              reviewCount: "88+",              imageSrc: "http://img.b2bpic.net/free-photo/opera-cake-dessert-wooden-table_123827-20788.jpg",              imageAlt: "French mille feuille pastry"
+            },
             {
               id: "10",              brand: "The Good Baker",              name: "Salmon Citrus Salad",              price: "GHS 22.00",              rating: 5,
-              reviewCount: "78+",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-raw-meat-slice-with-greens-radish-garlic-white-background_140725-140475.jpg",              imageAlt: "Fresh salmon citrus salad"},
+              reviewCount: "78+",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-raw-meat-slice-with-greens-radish-garlic-white-background_140725-140475.jpg",              imageAlt: "Fresh salmon citrus salad"
+            },
             {
               id: "11",              brand: "The Good Baker",              name: "Caesar Salad",              price: "GHS 16.00",              rating: 5,
-              reviewCount: "82+",              imageSrc: "http://img.b2bpic.net/free-photo/person-eating-caesar-salad-with-shrimp-restaurant_23-2148076286.jpg",              imageAlt: "Classic caesar salad"},
+              reviewCount: "82+",              imageSrc: "http://img.b2bpic.net/free-photo/person-eating-caesar-salad-with-shrimp-restaurant_23-2148076286.jpg",              imageAlt: "Classic caesar salad"
+            },
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -130,13 +146,17 @@ export default function LandingPage() {
           imageAlt="Premium roasted coffee beans"
           accordionItems={[
             {
-              id: "1",              title: "Premium Coffee Selection",              content: "We source our coffee beans from renowned roasters, ensuring every cup delivers exceptional flavor and aroma. Our baristas are trained to perfection, crafting each drink with care."},
+              id: "1",              title: "Premium Coffee Selection",              content: "We source our coffee beans from renowned roasters, ensuring every cup delivers exceptional flavor and aroma. Our baristas are trained to perfection, crafting each drink with care."
+            },
             {
-              id: "2",              title: "Artisan Pastry Creations",              content: "Every pastry is baked fresh daily using traditional techniques and premium ingredients. From croissants to tarts, each item is a masterpiece of flavor and texture."},
+              id: "2",              title: "Artisan Pastry Creations",              content: "Every pastry is baked fresh daily using traditional techniques and premium ingredients. From croissants to tarts, each item is a masterpiece of flavor and texture."
+            },
             {
-              id: "3",              title: "Welcoming Ambience",              content: "Our cafe is designed to be your perfect escape—comfortable seating, warm lighting, and a relaxing atmosphere that invites you to linger and enjoy the moment."},
+              id: "3",              title: "Welcoming Ambience",              content: "Our cafe is designed to be your perfect escape—comfortable seating, warm lighting, and a relaxing atmosphere that invites you to linger and enjoy the moment."
+            },
             {
-              id: "4",              title: "Fresh Daily Ingredients",              content: "All our sandwiches and salads are prepared with fresh, locally-sourced ingredients. Quality ingredients mean better nutrition and better taste."},
+              id: "4",              title: "Fresh Daily Ingredients",              content: "All our sandwiches and salads are prepared with fresh, locally-sourced ingredients. Quality ingredients mean better nutrition and better taste."
+            },
           ]}
           mediaAnimation="slide-up"
           useInvertedBackground={false}
@@ -144,82 +164,90 @@ export default function LandingPage() {
         />
       </div>
 
-      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardSixteen
+      <div id="reviews" data-section="reviews">
+        <TestimonialCardThirteen
           title="What Our Customers Say"
-          description="Join hundreds of satisfied customers who have made The Good Baker their favorite cafe in Accra. With a 4.4/5 rating from 530+ reviews, we're proud to serve our community with excellence."
+          description="Join hundreds of satisfied customers who have made The Good Baker their favorite cafe in Accra. With a 4.5/5 rating from 530+ reviews, we're proud to serve our community with excellence."
           tag="Customer Reviews"
           testimonials={[
             {
-              id: "1",              name: "Ama Osei",              role: "Business Owner",              company: "Creative Solutions Ltd",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/serious-executive-with-short-hair-crossed-arms_1149-89.jpg"},
+              id: "1",              name: "Ama Osei",              handle: "@amaosei",              testimonial: "The cappuccino here is absolutely perfect. Every visit is a delightful experience!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/serious-executive-with-short-hair-crossed-arms_1149-89.jpg",              imageAlt: "Ama Osei"
+            },
             {
-              id: "2",              name: "Kwaku Mensah",              role: "Software Developer",              company: "Tech Innovations",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-dress-code-holding-black-jacket-smiling_114579-19029.jpg"},
+              id: "2",              name: "Kwaku Mensah",              handle: "@kwakumensah",              testimonial: "Best place to work on my projects. Great coffee and amazing pastries!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-dress-code-holding-black-jacket-smiling_114579-19029.jpg",              imageAlt: "Kwaku Mensah"
+            },
             {
-              id: "3",              name: "Abena Boateng",              role: "Marketing Manager",              company: "Global Brands Africa",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-positive-executive-work_1098-519.jpg"},
+              id: "3",              name: "Abena Boateng",              handle: "@abenaboateng",              testimonial: "The team here makes everyone feel welcome. Truly a gem in Accra!",              rating: 4,
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-positive-executive-work_1098-519.jpg",              imageAlt: "Abena Boateng"
+            },
             {
-              id: "4",              name: "Yaw Asante",              role: "Designer",              company: "Creative Studio",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1563.jpg"},
-          ]}
-          kpiItems={[
-            { value: "530+", label: "Happy Customers" },
-            { value: "4.4/5", label: "Average Rating" },
-            { value: "10K+", label: "Monthly Visitors" },
+              id: "4",              name: "Yaw Asante",              handle: "@yawasante",              testimonial: "Premium quality, authentic taste. The Good Baker is my go-to cafe!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1563.jpg",              imageAlt: "Yaw Asante"
+            },
           ]}
+          showRating={true}
+          carouselMode="buttons"
           animationType="slide-up"
+          title="What Our Customers Say"
+          description="Join hundreds of satisfied customers who have made The Good Baker their favorite cafe in Accra. With a 4.5/5 rating from 530+ reviews, we're proud to serve our community with excellence."
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="contact" data-section="contact">
-        <ContactSplit
+      <div id="visit" data-section="visit">
+        <ContactCTA
           tag="Visit Us"
-          title="Join Us at The Good Baker"
-          description="Located in the heart of Accra at Amal Suites, Garden Street. Open daily from morning to midnight. Experience the warmth of our cafe and the excellence of our offerings."
           tagIcon={MapPin}
-          imageSrc="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"
-          imageAlt="The Good Baker cafe interior"
-          mediaAnimation="slide-up"
-          mediaPosition="right"
-          useInvertedBackground={false}
-          inputPlaceholder="Enter your email"
-          buttonText="Subscribe"
-          termsText="We respect your privacy. Unsubscribe at any time."
+          title="Visit The Good Baker"
+          description="Located in the heart of Accra at Amal Suites, Garden Street. Open daily from morning to midnight. Experience the warmth of our cafe and the excellence of our offerings. Visit us today!"
+          buttons={[
+            { text: "Get Directions", href: "https://maps.google.com/?q=Amal+Suites+Garden+Street+Accra" },
+            { text: "Call Us", href: "tel:+233302956995" },
+          ]}
           background={{ variant: "sparkles-gradient" }}
+          useInvertedBackground={false}
         />
       </div>
 
       <div id="footer" data-section="footer">
-        <FooterLogoEmphasis
+        <FooterBaseCard
           logoText="THE GOOD BAKER"
           columns={[
             {
-              items: [
+              title: "Navigation",              items: [
                 { label: "About", href: "#about" },
                 { label: "Menu", href: "#menu" },
                 { label: "Gallery", href: "#gallery" },
-              ],
+                { label: "Reviews", href: "#reviews" },
+              ]
             },
             {
-              items: [
-                { label: "Reviews", href: "#testimonials" },
-                { label: "Visit Us", href: "#contact" },
-                { label: "Order Online", href: "https://boltfood.com" },
-              ],
-            },
-            {
-              items: [
+              title: "Contact",              items: [
                 { label: "Phone: 030 295 6995", href: "tel:+233302956995" },
+                { label: "Email: info@thegoodbaker.com", href: "mailto:info@thegoodbaker.com" },
                 { label: "Amal Suites, Garden Street", href: "#" },
-                { label: "Open Daily 7 AM - 12 AM", href: "#" },
-              ],
+              ]
+            },
+            {
+              title: "Hours",              items: [
+                { label: "Monday - Friday: 7 AM - 12 AM", href: "#" },
+                { label: "Saturday: 7 AM - 1 AM", href: "#" },
+                { label: "Sunday: 8 AM - 11 PM", href: "#" },
+              ]
+            },
+            {
+              title: "Order Online",              items: [
+                { label: "Bolt Food", href: "https://boltfood.com" },
+                { label: "View Menu", href: "#menu" },
+              ]
             },
           ]}
+          copyrightText="© 2025 The Good Baker. All rights reserved."
         />
       </div>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file