diff --git a/src/App.tsx b/src/App.tsx
index 33d15f9..340652e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,13 +1,14 @@
+import React from 'react';
 import { Routes, Route } from 'react-router-dom';
-import Layout from './components/Layout';
-import HomePage from './pages/HomePage';
+import HomePage from '@/pages/HomePage';
+import Layout from '@/components/Layout';
 
 export default function App() {
   return (
-    <Routes>
-      <Route element={<Layout />}>
+    <Layout>
+      <Routes>
         <Route path="/" element={<HomePage />} />
-      </Route>
-    </Routes>
+      </Routes>
+    </Layout>
   );
-}
+}
\ No newline at end of file
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 04d9cfb..cec5afd 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,19 +1,34 @@
-import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import FeaturesDualMedia from '@/components/sections/features/FeaturesDualMedia';
+import React from 'react';
+import NavbarDropdown from '@/components/ui/NavbarDropdown';
 import HeroBrand from '@/components/sections/hero/HeroBrand';
-import MetricsMinimalCards from '@/components/sections/metrics/MetricsMinimalCards';
+import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
+import FeaturesDualMedia from '@/components/sections/features/FeaturesDualMedia';
 import ProductMediaCards from '@/components/sections/product/ProductMediaCards';
-import SocialProofMarquee from '@/components/sections/social-proof/SocialProofMarquee';
+import MetricsMinimalCards from '@/components/sections/metrics/MetricsMinimalCards';
 import TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
+import SocialProofMarquee from '@/components/sections/social-proof/SocialProofMarquee';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterBasic from '@/components/sections/footer/FooterBasic';
+import { Coffee, Droplets, Leaf } from 'lucide-react';
 
 export default function HomePage() {
   return (
-    <>
+    <div className="flex flex-col min-h-screen">
+      <div id="nav" data-section="nav">
+        <NavbarDropdown 
+          logo="Bean & Bloom"
+          navItems={[
+            { name: "Menu", href: "#features" },
+            { name: "Shop", href: "#products" },
+            { name: "About", href: "#about" },
+            { name: "Contact", href: "#contact" }
+          ]}
+          ctaButton={{ text: "Order Now", href: "#contact" }}
+        />
+      </div>
       <div id="hero" data-section="hero">
-        <HeroBrand
+        <HeroBrand 
           brand="Bean & Bloom Coffee"
           description="Hand-roasted beans, sustainable practices, and the perfect cup every morning. Experience artisanal excellence."
           primaryButton={{ text: "Our Coffee", href: "#features" }}
@@ -22,7 +37,7 @@ export default function HomePage() {
         />
       </div>
       <div id="about" data-section="about">
-        <AboutMediaOverlay
+        <AboutMediaOverlay 
           tag="Our Heritage"
           title="From Seed to Sip"
           description="We source the finest organic beans from independent farms, roasting in small batches to preserve unique flavor profiles."
@@ -31,47 +46,101 @@ export default function HomePage() {
         />
       </div>
       <div id="features" data-section="features">
-        <FeaturesDualMedia
+        <FeaturesDualMedia 
           tag="Menu Highlights"
           title="Carefully Crafted Drinks"
           description="Experience our signature rotations featuring classic brewing methods and modern flavor explorations."
           items={[
             { icon: "Coffee", title: "Artisanal Espresso", description: "Rich, velvet-smooth shots pulled to perfection.", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/black-cafe-food-old-background_1339-66.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/white-filled-with-coffee-cup-white-background-covered-by-ficus-leaf-shadow_23-2148296160.jpg" }] },
-            { icon: "Droplets", title: "Slow-Drip Cold Brew", description: "Steeped for 24 hours for a naturally sweet finish.", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/woman-with-hat-drinking-coffee_23-2148276105.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/talanted-barista-is-prepairing-coffee-clients-posh-restaurant-using-coffee-machine_613910-3256.jpg" }] },
-            { icon: "Leaf", title: "Organic Pour-Overs", description: "Highlighting delicate notes from single-origin beans.", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/barista-heating-up-milk-coffee-machine_1303-31778.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/coffee-white-cup-with-plant-shadow_23-2151986819.jpg" }] }
+            { icon: "Droplets", title: "Slow-Drip Cold Brew", description: "Steeped for 24 hours for a naturally sweet finish.", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/white-filled-with-coffee-cup-white-background-covered-by-ficus-leaf-shadow_23-2148296160.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/black-cafe-food-old-background_1339-66.jpg" }] },
+            { icon: "Leaf", title: "Organic Pour-Overs", description: "Highlighting delicate notes from single-origin beans.", mediaItems: [{ imageSrc: "http://img.b2bpic.net/free-photo/word-coffee-background-coffee-beans-scattered-surface_169016-53741.jpg" }, { imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-making-utensils_23-2148254944.jpg" }] }
           ]}
         />
       </div>
       <div id="products" data-section="products">
-        <ProductMediaCards
+        <ProductMediaCards 
           tag="Shop Essentials"
           title="At-Home Brewing"
           description="Everything you need to replicate our cafe experience at home."
           products={[
             { name: "House Blend Beans", price: "$18", imageSrc: "http://img.b2bpic.net/free-photo/word-coffee-background-coffee-beans-scattered-surface_169016-53741.jpg" },
             { name: "Portafilter Basket", price: "$25", imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-making-utensils_23-2148254944.jpg" },
-            { name: "Hand-Thrown Mug", price: "$32", imageSrc: "http://img.b2bpic.net/free-photo/handmade-cup-books-closeup-wooden-surface_169016-45121.jpg" }
+            { name: "Hand-Thrown Mug", price: "$32", imageSrc: "http://img.b2bpic.net/free-photo/handmade-cup-books-closeup-wooden-surface_169016-45121.jpg" },
+            { name: "Classic French Press", price: "$45", imageSrc: "http://img.b2bpic.net/free-photo/french-press-coffee-breakfast-kitchen_53876-97155.jpg" },
+            { name: "Pour Over Kit", price: "$55", imageSrc: "http://img.b2bpic.net/free-photo/friensds-enjoying-their-winter-camping_23-2149228925.jpg" },
+            { name: "Manual Grinder", price: "$89", imageSrc: "http://img.b2bpic.net/free-photo/tools-used-process-coffee-making_23-2150187566.jpg" }
           ]}
         />
       </div>
       <div id="metrics" data-section="metrics">
-        <MetricsMinimalCards tag="Our Impact" title="By The Numbers" metrics={[{ value: "10k+", description: "Cups Brewed Monthly" }, { value: "50+", description: "Local Farms Supported" }]} />
+        <MetricsMinimalCards 
+          tag="Our Impact"
+          title="By The Numbers"
+          metrics={[
+            { value: "10k+", description: "Cups Brewed Monthly" },
+            { value: "50+", description: "Local Farms Supported" },
+            { value: "100%", description: "Organic Beans Only" },
+            { value: "12", description: "Roast Profiles" },
+            { value: "5", description: "Year Anniversary" }
+          ]}
+        />
       </div>
       <div id="testimonials" data-section="testimonials">
-        <TestimonialOverlayCards tag="Community" title="What Neighbors Say" description="Join our community." testimonials={[{ name: "Sarah Miller", role: "Director", company: "DesignCo", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-with-beer-eating-olives_23-2147680959.jpg" }, { name: "David Chen", role: "Engineer", company: "TechSys", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/talk-coffee-break_1098-16160.jpg" }]} />
+        <TestimonialOverlayCards 
+          tag="Community"
+          title="What Neighbors Say"
+          description="Join our community of coffee enthusiasts who make us a daily ritual."
+          testimonials={[
+            { name: "Sarah Miller", role: "Creative Director", company: "DesignCo", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-with-beer-eating-olives_23-2147680959.jpg" },
+            { name: "David Chen", role: "Software Engineer", company: "TechSys", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/talk-coffee-break_1098-16160.jpg" },
+            { name: "Elena Rodriguez", role: "Architect", company: "CityBuild", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/stylish-woman-wearing-yellow-bandana_273609-13324.jpg" },
+            { name: "Marcus Thorne", role: "Professor", company: "University", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/people-drinking-coffee-spacious-cafeteria_23-2150424007.jpg" },
+            { name: "Jasmine Lee", role: "Writer", company: "Freelance", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-woman-enjoying-coffee-cup_23-2148756309.jpg" }
+          ]}
+        />
       </div>
       <div id="partners" data-section="partners">
-        <SocialProofMarquee tag="Our Partners" title="Collaborators" description="Our coffee partners." names={["Farm One", "Roast Co"]}/>
+        <SocialProofMarquee 
+          tag="Our Partners"
+          title="Sustainable Collaborators"
+          description="Proudly working with ethical farms and suppliers worldwide."
+          names={["Farm One", "Roast Co", "Bean Direct", "Fair Harvest", "Mountain Brew", "Direct Trade", "Green Origin"]}
+        />
       </div>
       <div id="faq" data-section="faq">
-        <FaqSplitMedia tag="Info" title="Common Questions" description="Get answers to your questions." items={[{ question: "Organic?", answer: "Yes." }, { question: "Location?", answer: "City center." }]} imageSrc="http://img.b2bpic.net/free-photo/coffee-pot-cup_23-2147693944.jpg" />
+        <FaqSplitMedia 
+          tag="Info"
+          title="Common Questions"
+          description="Answers to frequently asked questions about our coffee, roasting process, and cafe."
+          items={[
+            { question: "Are your beans organic?", answer: "Yes, we source 100% organic, fair-trade coffee beans." },
+            { question: "Where is the cafe located?", answer: "We are located at 123 Coffee Lane in the city center." },
+            { question: "Do you offer wholesale?", answer: "Yes, we provide bulk beans to local businesses and offices." },
+            { question: "Can I book the cafe?", answer: "We host private events in our space after regular cafe hours." },
+            { question: "Do you have vegan options?", answer: "We offer a variety of plant-based milks and vegan pastries." }
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/coffee-pot-cup_23-2147693944.jpg"
+        />
       </div>
       <div id="contact" data-section="contact">
-        <ContactCenter tag="Join Us" title="Stay Connected" description="Sign up for our newsletter." inputPlaceholder="Email" buttonText="Subscribe" />
+        <ContactCenter 
+          tag="Join Us"
+          title="Stay Connected"
+          description="Sign up for updates on new roast drops and seasonal menu items."
+          inputPlaceholder="Enter your email address"
+          buttonText="Subscribe"
+        />
       </div>
       <div id="footer" data-section="footer">
-        <FooterBasic columns={[{ title: "Links", items: [{ label: "About" }] }]} leftText="© 2024" rightText="Crafted." />
+        <FooterBasic 
+          columns={[
+            { title: "Quick Links", items: [{ label: "Menu", href: "#features" }, { label: "Shop", href: "#products" }, { label: "About", href: "#about" }, { label: "Contact", href: "#contact" }] },
+            { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }, { label: "Accessibility", href: "#" }] }
+          ]}
+          leftText="© 2024 Bean & Bloom Coffee."
+          rightText="Crafted with passion in the city center."
+        />
       </div>
-    </>
+    </div>
   );
-}
+}
\ No newline at end of file