diff --git a/src/app/location/page.tsx b/src/app/location/page.tsx
index fce4096..4951e7d 100644
--- a/src/app/location/page.tsx
+++ b/src/app/location/page.tsx
@@ -2,14 +2,11 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FaqBase from '@/components/sections/faq/FaqBase';
-import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import { HelpCircle, MapPin, Smile } from "lucide-react";
+import ContactCTABackground from '@/components/sections/contact/ContactCTABackground';
+import MapAndAddress from '@/components/sections/contact/MapAndAddress';
 
-export default function LandingPage() {
+export default function LocationPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="icon-arrow"
@@ -24,196 +21,50 @@ export default function LandingPage() {
         headingFontWeight="bold"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
-      navItems={[
-        {
-          name: "Home",
-          id: "home",
-          href: "/",
-        },
-        {
-          name: "Menu",
-          id: "menu",
-          href: "/menu",
-        },
-        {
-          name: "About",
-          id: "about",
-          href: "/about",
-        },
-        {
-          name: "Location",
-          id: "location",
-          href: "/location",
-        },
-        {
-          name: "Order",
-          id: "order",
-          href: "/order",
-        },
-      ]}
-      brandName="Mutt & Jeff's"
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              {
+                name: "Home",                id: "/"},
+              {
+                name: "Menu",                id: "/menu"},
+              {
+                name: "About",                id: "/about"},
+              {
+                name: "Location",                id: "/location"},
+              {
+                name: "Order",                id: "/order"},
+            ]}
+            brandName="Mutt & Jeff's"
+          />
+        </div>
 
-  <div id="contact" data-section="contact">
-      <ContactSplit
-      useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
-      tag="Your Neighborhood Eatery"
-      title="Find Us & Say Hello!"
-      description="Mutt & Jeff's is conveniently located in the heart of the city, easily accessible for all your comfort food cravings. Stop by, dine-in, or pick up your order!"
-      tagIcon={MapPin}
-      imageSrc="http://img.b2bpic.net/free-vector/background-delicious-burger-hand-drawn-style_23-2147624763.jpg?_wi=4"
-      imageAlt="Illustration of a local diner with welcoming lights"
-      mediaAnimation="slide-up"
-      mediaPosition="right"
-      inputPlaceholder="Your message..."
-      buttonText="Get Directions"
-      termsText="123 Comfort Food Lane, Flavorville, TX 75001 - Open Mon-Sat 11 AM - 9 PM"
-    />
-  </div>
+        <div id="our-location" data-section="our-location">
+          <MapAndAddress
+            useInvertedBackground={false}
+            title="Find Us at Mutt & Jeff’s"
+            description="We're conveniently located at the heart of the community. Come on down and enjoy a true Southern comfort meal!"
+            address="123 Main Street, Anytown, USA 12345"
+            phone="(555) 123-4567"
+            email="info@muttjeffs.com"
+            mapEmbedUrl="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3153.280194685377!2d-122.41941588468165!3d37.77492927975895!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x80858087e5b5e7d1%3A0x46b7a4c7e4e1e0a!2sGolden%20Gate%20Bridge!5e0!3m2!1sen!2sus!4v1617196013620!5m2!1sen!2sus"
+          />
+        </div>
 
-  <div id="faq" data-section="faq">
-      <FaqBase
-      textboxLayout="default"
-      useInvertedBackground={false}
-      faqs={[
-        {
-          id: "1",
-          title: "Is there parking available?",
-          content: "Yes, we have a dedicated parking lot for our customers located directly behind the restaurant. Street parking is also available nearby.",
-        },
-        {
-          id: "2",
-          title: "Do you take reservations?",
-          content: "We operate on a first-come, first-served basis for parties under 6. For larger groups, please call ahead to check availability and special arrangements.",
-        },
-        {
-          id: "3",
-          title: "Is the restaurant wheelchair accessible?",
-          content: "Absolutely! Our entrance, dining area, and restrooms are fully wheelchair accessible to ensure comfort for all our guests.",
-        },
-        {
-          id: "4",
-          title: "Are pets allowed?",
-          content: "We welcome service animals inside the restaurant. For other pets, we have limited outdoor patio seating where they are welcome to join you.",
-        },
-      ]}
-      title="Questions About Your Visit?"
-      description="Find answers to common questions regarding our location, parking, and dining experience."
-      tag="Good to Know"
-      tagIcon={HelpCircle}
-      faqsAnimation="slide-up"
-    />
-  </div>
-
-  <div id="contact" data-section="contact">
-      <ContactCTA
-      useInvertedBackground={false}
-      background={{
-        variant: "gradient-bars",
-      }}
-      tag="Ready to Indulge?"
-      tagIcon={Smile}
-      title="We Can't Wait to Serve You!"
-      description="Experience the warmth and flavor that makes Mutt & Jeff's a local favorite. Come on down!"
-      buttons={[
-        {
-          text: "Get Directions",
-          href: "https://maps.google.com/?q=123 Comfort Food Lane, Flavorville, TX",
-        },
-        {
-          text: "View Our Menu",
-          href: "/menu",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterBase
-      columns={[
-        {
-          title: "Menu",
-          items: [
-            {
-              label: "Appetizers",
-              href: "/menu#appetizers",
-            },
-            {
-              label: "Entrées",
-              href: "/menu#entrees",
-            },
-            {
-              label: "Sandwiches",
-              href: "/menu#sandwiches",
-            },
-            {
-              label: "Desserts",
-              href: "/menu#desserts",
-            },
-          ],
-        },
-        {
-          title: "About Us",
-          items: [
-            {
-              label: "Our Story",
-              href: "/about",
-            },
-            {
-              label: "Our Team",
-              href: "/about#team",
-            },
-            {
-              label: "Values",
-              href: "/about#values",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Location & Hours",
-              href: "/location",
-            },
-            {
-              label: "Contact Us",
-              href: "/location",
-            },
-            {
-              label: "FAQs",
-              href: "/location#faq",
-            },
-          ],
-        },
-        {
-          title: "Order",
-          items: [
-            {
-              label: "Order Online",
-              href: "/order",
-            },
-            {
-              label: "Pickup",
-              href: "/order",
-            },
-            {
-              label: "Delivery",
-              href: "/order",
-            },
-          ],
-        },
-      ]}
-      logoText="Mutt & Jeff's"
-      copyrightText="© 2024 Mutt & Jeff's. All rights reserved."
-    />
-  </div>
+        <div id="contact-us" data-section="contact-us">
+          <ContactCTABackground
+            background={{ variant: "plain" }}
+            useInvertedBackground={false}
+            title="Got a Question? Drop Us a Line!"
+            description="Whether it's about our menu, catering, or just to say hello, we'd love to hear from you. Fill out the form or give us a call."
+            buttons={[
+              {
+                text: "Call Us",                href: "tel:+15551234567"},
+              {
+                text: "Email Us",                href: "mailto:info@muttjeffs.com"},
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );