diff --git a/src/app/page.tsx b/src/app/page.tsx
index 3497d38..6d23c4d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,21 +1,19 @@
 "use client";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
-import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
-import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import HeroSplitKpi from "@/components/sections/hero/HeroSplitKpi";
+import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
+import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
+import FaqSplitMedia from "@/components/sections/faq/FaqSplitMedia";
+import ContactSplit from "@/components/sections/contact/ContactSplit";
+import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
 
 export default function Page() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "About", id: "/about" },
-    { name: "Menu", id: "/menu" },
-    { name: "Visit Us", id: "/visit" },
-    { name: "Order", id: "/order" }
+    { name: "Contact", id: "/contact" }
   ];
 
   return (
@@ -24,74 +22,25 @@ export default function Page() {
         <NavbarLayoutFloatingInline navItems={navItems} brandName="Gusto Gastronomia Italiana" button={{ text: "Order Online", href: "https://gustonewberg.com" }} />
       </div>
       <div id="hero" data-section="hero">
-        <HeroSplitKpi 
-          title="Authentic Italian Flavors in the Heart of Newberg."
-          description="Experience the spirit of Florence with our curated selection of fresh pasta, homemade sauces, and artisan paninis."
-          background={{ variant: "gradient-bars" }}
-          kpis={[{ value: "4.9★", label: "Google Rating" }, { value: "140+", label: "Reviews" }, { value: "Fresh", label: "Handmade" }]}
-          enableKpiAnimation={true}
-          imageSrc="http://img.b2bpic.net/free-photo/cheese-appetizer_23-2148145222.jpg"
-          buttons={[{ text: "View Our Menu", href: "/menu" }, { text: "Order Online", href: "/order" }]}
-          mediaAnimation="slide-up"
-        />
+        <HeroSplitKpi title="Authentic Italian Flavors in the Heart of Newberg." description="Experience the spirit of Florence with our curated selection of fresh pasta, homemade sauces, and artisan paninis." background={{ variant: "gradient-bars" }} kpis={[{ value: "4.9★", label: "Google Rating" }, { value: "140+", label: "Reviews" }, { value: "Fresh", label: "Handmade" }]} enableKpiAnimation={true} imageSrc="http://img.b2bpic.net/free-photo/cheese-appetizer_23-2148145222.jpg" buttons={[{ text: "View Our Menu", href: "#products" }, { text: "Order Online", href: "https://gustonewberg.com" }]} mediaAnimation="slide-up" />
       </div>
       <div id="about" data-section="about">
-        <TextSplitAbout 
-          title="A Slice of Italy in Oregon"
-          description={[
-            "Gusto Gastronomia Italiana is a cozy deli and specialty grocery tucked into the Springbrook Oaks Office Building. We believe in bringing the genuine, artisanal spirit of Italy to Newberg.",            "Our counters are filled with fresh pasta, homemade sauces, crusty focaccia, and delicate arancini. We also curate the finest imported cheeses, charcuterie, and regional Italian wines."
-          ]}
-          useInvertedBackground={false}
-        />
+        <TextSplitAbout title="A Slice of Italy in Oregon" description={["Gusto Gastronomia Italiana is a cozy deli and specialty grocery tucked into the Springbrook Oaks Office Building. We believe in bringing the genuine, artisanal spirit of Italy to Newberg.", "Our counters are filled with fresh pasta, homemade sauces, crusty focaccia, and delicate arancini. We also curate the finest imported cheeses, charcuterie, and regional Italian wines.", "Whether you're stopping in for our signature Prosciutto Panini or picking up everything you need for a home-cooked Tuscan feast, we are here to share our love of Italian food."]} useInvertedBackground={false} />
       </div>
       <div id="products" data-section="products">
-        <ProductCardTwo 
-          title="Signature Deli Menu"
-          description="Explore our curated favorites, from freshly prepared paninis to authentic Italian pantry essentials."
-          gridVariant="four-items-2x2-equal-grid"
-          animationType="slide-up"
-          textboxLayout="split"
-          products={[
-            { id: "p1", brand: "Signature", name: "Prosciutto Panini with Truffle Cheese", price: "$14.00", rating: 5, reviewCount: "58", imageSrc: "http://img.b2bpic.net/free-photo/sandwich-with-ham-cheese-wooden-cutting-board_188544-20998.jpg" },
-            { id: "p2", brand: "Fresh", name: "Housemade Tagliatelle", price: "$12.00", rating: 5, reviewCount: "42", imageSrc: "http://img.b2bpic.net/free-photo/eggs-oil-amidst-pasta-flour_23-2147849711.jpg" },
-            { id: "p3", brand: "Special", name: "Classic Arancini", price: "$6.00", rating: 5, reviewCount: "28", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-food-croquette_23-2149202624.jpg" }
-          ]}
-          useInvertedBackground={true}
-        />
+        <ProductCardTwo title="Deli Highlights" description="From daily signature sandwiches to artisanal grocery essentials, explore what makes Gusto special." gridVariant="four-items-2x2-equal-grid" animationType="slide-up" textboxLayout="split" products={[{ id: "p1", brand: "Signature", name: "Prosciutto Truffle Panini", price: "$14.00", rating: 5, reviewCount: "58", imageSrc: "http://img.b2bpic.net/free-photo/sandwich-with-ham-cheese-wooden-cutting-board_188544-20998.jpg" }, { id: "p2", brand: "Fresh", name: "Housemade Tagliatelle", price: "$12.00", rating: 5, reviewCount: "42", imageSrc: "http://img.b2bpic.net/free-photo/eggs-oil-amidst-pasta-flour_23-2147849711.jpg" }, { id: "p3", brand: "Bakery", name: "Rosemary Focaccia", price: "$8.00", rating: 5, reviewCount: "35", imageSrc: "http://img.b2bpic.net/free-photo/cottagecore-food-inspiration-still-life_23-2150153010.jpg" }, { id: "p4", brand: "Special", name: "Classic Arancini", price: "$6.00", rating: 5, reviewCount: "28", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hands-holding-food-croquette_23-2149202624.jpg" }, { id: "p5", brand: "Curated", name: "Imported Charcuterie Board", price: "$18.00", rating: 5, reviewCount: "30", imageSrc: "http://img.b2bpic.net/free-photo/chesse-okatter-with-glass-red-wine_114579-3052.jpg" }, { id: "p6", brand: "Sweet", name: "Sicilian Cannoli", price: "$5.00", rating: 5, reviewCount: "25", imageSrc: "http://img.b2bpic.net/free-photo/plate-fresh-fuyu-dried-persimmon-fruits-wooden-board_114579-88851.jpg" }]} useInvertedBackground={true} />
       </div>
       <div id="testimonials" data-section="testimonials">
-        <TestimonialCardSix 
-          title="Community Favorites"
-          description="Hear what our neighbors in Newberg have to say about their experience at Gusto."
-          animationType="slide-up"
-          textboxLayout="split"
-          testimonials={[
-            { id: "1", name: "Maria S.", handle: "@mariainoregon", testimonial: "The Prosciutto Panini with Truffle Cheese is life-changing!" },
-            { id: "2", name: "David L.", handle: "@davefoodie", testimonial: "It feels like stepping into a deli in Florence. Absolutely authentic." },
-            { id: "3", name: "Sarah P.", handle: "@sarahcooks", testimonial: "My go-to spot for fresh pasta and high-quality Italian ingredients." }
-          ]}
-          useInvertedBackground={false}
-        />
+        <TestimonialCardSix title="What Our Neighbors Say" description="Join our community of Italian food lovers who make us a part of their weekly routine." animationType="slide-up" textboxLayout="split" testimonials={[{ id: "1", name: "Maria S.", handle: "@mariainoregon", testimonial: "I needed this place!! I recently got back from Florence and have been searching for the perfect Italian sandwich — this place is it.", imageSrc: "http://img.b2bpic.net/free-photo/vendor-displaying-box-lemons_482257-109956.jpg" }, { id: "2", name: "David L.", handle: "@davefoodie", testimonial: "Each time I left the store, I'd immediately start thinking about what else I could make with their ingredients and sauces.", imageSrc: "http://img.b2bpic.net/free-photo/people-relaxing-their-wooden-home_23-2151335831.jpg" }, { id: "3", name: "Sarah P.", handle: "@sarahcooks", testimonial: "Delicious panini, fresh pasta and sauces, wines, cheese and meat!", imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-learning-make-sushi_23-2149865353.jpg" }, { id: "4", name: "Tom B.", handle: "@tomtravels", testimonial: "Authentic quality, friendly staff, and the best Prosciutto around. Truly a Newberg gem.", imageSrc: "http://img.b2bpic.net/free-photo/senior-man-supplies-local-grocery-shop_482257-76548.jpg" }, { id: "5", name: "Jessica W.", handle: "@jessfood", testimonial: "Gusto is simply the best deli in the valley. High-quality ingredients and so much heart.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-waitress-standing-counter_1170-668.jpg" }]} useInvertedBackground={false} />
+      </div>
+      <div id="faq" data-section="faq">
+        <FaqSplitMedia title="Common Questions" description="Everything you need to know about visiting Gusto." faqs={[{ id: "q1", title: "What are your hours?", content: "We are open Wednesday through Monday from 10 AM. We are closed on Tuesdays to reset and prep." }, { id: "q2", title: "Do you offer delivery?", content: "Yes, we partner with local delivery services. You can order online directly through our website." }, { id: "q3", title: "Is parking available?", content: "Yes, we have free parking in the Fred Meyer lot right next door." }, { id: "q4", title: "Are you affiliated with other restaurants?", content: "Yes! We have a sister restaurant in downtown Newberg." }]} faqsAnimation="slide-up" textboxLayout="split" useInvertedBackground={false} />
       </div>
       <div id="contact" data-section="contact">
-        <ContactSplit 
-          title="Visit Gusto Gastronomia"
-          description="901-B Brutscher St, Newberg OR 97132. Come enjoy authentic Italian groceries and prepared meals."
-          tag="Visit Us"
-          background={{ variant: "plain" }}
-          useInvertedBackground={true}
-        />
+        <ContactSplit title="Visit Us in Newberg" description="901-B Brutscher St, Newberg OR 97132. We're open Wednesday through Monday, from 10 AM. Closed Tuesdays." tag="Find Us" imageSrc="http://img.b2bpic.net/free-photo/french-woman-red-beret-street-bench_1321-340.jpg" mediaAnimation="blur-reveal" background={{ variant: "plain" }} useInvertedBackground={true} />
       </div>
       <div id="footer" data-section="footer">
-        <FooterBaseCard 
-          logoText="Gusto Gastronomia Italiana"
-          columns={[
-            { title: "Menu", items: [{ label: "Deli Sandwiches", href: "/menu" }, { label: "Prepared Meals", href: "/menu" }] },
-            { title: "Visit", items: [{ label: "Location", href: "/visit" }, { label: "Hours", href: "/visit" }] },
-            { title: "Order", items: [{ label: "Takeout/Delivery", href: "/order" }] }
-          ]}
-          copyrightText="© 2025 Gusto Gastronomia Italiana | Newberg, OR"
-        />
+        <FooterBaseCard logoText="Gusto Gastronomia Italiana" columns={[{ title: "Shop", items: [{ label: "Menu", href: "#products" }, { label: "Order Online", href: "https://gustonewberg.com" }] }, { title: "Visit", items: [{ label: "Directions", href: "#contact" }, { label: "Hours", href: "#contact" }] }, { title: "Connect", items: [{ label: "Instagram", href: "#" }, { label: "Contact", href: "#contact" }] }]} copyrightText="© 2025 Gusto Gastronomia Italiana | Newberg, OR" />
       </div>
     </ThemeProvider>
   );