diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5a6acfd..798b433 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -4,9 +4,9 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactText from '@/components/sections/contact/ContactText';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
-import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
+import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import HeroSignup from '@/components/sections/hero/HeroSignup';
 import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import TextAbout from '@/components/sections/about/TextAbout';
@@ -29,84 +29,38 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleCentered
       navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "Menu",          id: "services"},
-        {
-          name: "Why Us",          id: "why-us"},
-        {
-          name: "Gallery",          id: "gallery"},
-        {
-          name: "FAQ",          id: "faq"},
+        { name: "Home", id: "hero" },
+        { name: "Menu", id: "services" },
+        { name: "Why Us", id: "why-us" },
+        { name: "Gallery", id: "gallery" },
+        { name: "FAQ", id: "faq" },
       ]}
       brandName="Paris Croisserie"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroBillboard
-      background={{
-        variant: "sparkles-gradient"}}
-      title="Artisanal Pastries Crafted in Lubbock"
-      description="French-inspired pastries made fresh daily. Known for buttery croissants, quality ingredients, and a welcoming atmosphere, Paris Croisserie is a local favorite for coffee, pastries, and quick bites. ⭐ 4.8 Rating | 🥐 Fresh Baked Daily | 📍 Lubbock, TX"
-      buttons={[
-        {
-          text: "View Daily Menu",          href: "#services"},
-        {
-          text: "Call (806) 777-1229",          href: "tel:8067771229"},
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-photo-croissant-with-ham-cheese-wooden-board_613910-6444.jpg"
-      imageAlt="close up buttery croissant golden flaky"
-      mediaAnimation="slide-up"
-      marqueeItems={[
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/croissant-glass-plate-high-angle-view-wooden-table_176474-8132.jpg",          alt: "close up buttery croissant golden flaky"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/sustainable-recipients-different-ingredients_23-2149015908.jpg",          alt: "bakery display case full of pastries"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/croissant-with-coffee-french-croissant-wooden-board-cup-espresso_114579-58937.jpg",          alt: "coffee and croissant on wooden table"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/wedding-hall-interior-design-photo-shooting_114579-2234.jpg",          alt: "modern french cafe interior design"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/top-view-homemade-croissants-ready-be-served_23-2148543678.jpg",          alt: "pistachio croissant specialty pastry"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/tablet-mobile-female-using-phone_1303-2074.jpg",          alt: "happy customer eating pastry in cafe"},
-      ]}
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/croissant-wooden-kitchen-towel-high-angle-view_176474-8146.jpg",          alt: "Croissant on wooden and kitchen towel, high angle view."},
-        {
-          src: "http://img.b2bpic.net/free-photo/croissant-flat-lay-wooden-kitchen-towel_176474-8123.jpg",          alt: "Croissant flat lay on wooden and kitchen towel"},
-        {
-          src: "http://img.b2bpic.net/free-photo/croissants-decorated-with-raspberries-mint-wooden-boards_613910-5904.jpg",          alt: "Croissants decorated with raspberries and mint on a wooden boards."},
-        {
-          src: "http://img.b2bpic.net/free-photo/plate-croissant-half-covered-strawberry-syrup_140725-1406.jpg",          alt: "Plate of croissant half covered in strawberry syrup"},
-        {
-          src: "http://img.b2bpic.net/free-photo/close-up-woman-holding-croissant_23-2149233686.jpg",          alt: "Close up woman holding croissant"},
-      ]}
-      avatarText="Join our local foodies"
+      <HeroSignup
+      tag="Artisanal Bakery"
+      title="Parisian Excellence in the Heart of Lubbock"
+      description="Experience the delicate crunch of authentic French-inspired pastries. Fresh, daily-baked, and waiting for you."
+      background={{ variant: "sparkles-gradient" }}
+      buttonText="Get Updates"
+      onSubmit={(email) => console.log(email)}
     />
   </div>
 
   <div id="services" data-section="services">
-      <FeatureCardOne
+      <FeatureCardMedia
       animationType="slide-up"
       textboxLayout="split"
-      gridVariant="two-items-per-row"
-      useInvertedBackground={false}
+      title="Daily Selections"
+      description="Handcrafted classics made with premium ingredients to fuel your day."
       features={[
-        {
-          title: "Croissants & Pastries",          description: "Fresh, buttery, flaky options including sweet and savory varieties.",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-chocolate-eclairs-oval-plate-tarts-laeves-cinnamon-dried-oranges-dark-wooden-table-with-copy-space_140725-90858.jpg"},
-        {
-          title: "Coffee & Drinks",          description: "Lattes, premium coffee, and refreshing specialty drinks.",          imageSrc: "http://img.b2bpic.net/free-photo/pouring-milk-mix-latte-coffee-art_1232-2147.jpg"},
-        {
-          title: "Breakfast & Café Items",          description: "Quick, high-quality food for a perfect start to your morning.",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-breads-as-sliced-seeded-brown-cob-baguette-croissants-plate-bowl-nuts-walnuts-cup-hot-toddy-with-cinnamon-saucer-wooden-background_141793-27716.jpg"},
-        {
-          title: "Custom Orders & Catering",          description: "Tailored pastries for your special events and bulk needs.",          imageSrc: "http://img.b2bpic.net/free-photo/woman-selecting-packed-food-food-counter_107420-63658.jpg"},
+        { id: "1", tag: "Fresh", title: "Croissants & Pastries", description: "Buttery, flaky, and golden perfection.", imageSrc: "http://img.b2bpic.net/free-photo/top-view-chocolate-eclairs-oval-plate-tarts-laeves-cinnamon-dried-oranges-dark-wooden-table-with-copy-space_140725-90858.jpg" },
+        { id: "2", tag: "Roasted", title: "Coffee & Drinks", description: "Premium roasts that pair beautifully with every bite.", imageSrc: "http://img.b2bpic.net/free-photo/pouring-milk-mix-latte-coffee-art_1232-2147.jpg" }
       ]}
-      title="What We Offer"
-      description="Our menu is designed to delight, featuring artisanal creations crafted with passion and the finest local ingredients."
+      useInvertedBackground={false}
     />
   </div>
 
@@ -116,8 +70,7 @@ export default function LandingPage() {
       tag="Our Commitment"
       title="Why People Choose Us"
       buttons={[
-        {
-          text: "Our Story",          href: "#"},
+        { text: "Our Story", href: "#" },
       ]}
     />
   </div>
@@ -128,22 +81,10 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       metrics={[
-        {
-          id: "g1",          value: "Fresh",          title: "Fresh out of the oven",          description: "Baked daily.",          imageSrc: "http://img.b2bpic.net/free-photo/red-nature-texture-background_23-2147960326.jpg"},
-        {
-          id: "g2",          value: "Flaky",          title: "Perfectly flaky",          description: "Our signature.",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-tasty-bagels-with-seeds-bread_23-2148365501.jpg"},
-        {
-          id: "g3",          value: "Local",          title: "Local favorite",          description: "Community loved.",          imageSrc: "http://img.b2bpic.net/free-photo/breakfast-with-croissant_23-2148130539.jpg"},
-        {
-          id: "g4",          value: "Chic",          title: "Cafe vibe",          description: "Cozy space.",          imageSrc: "http://img.b2bpic.net/free-photo/delicious-indian-dosa-assortment_23-2149086041.jpg"},
-        {
-          id: "g5",          value: "Special",          title: "Specialty pastry",          description: "Pistachio delight.",          imageSrc: "http://img.b2bpic.net/free-photo/delicious-pastry-cream-cheese_23-2148516592.jpg"},
-        {
-          id: "g6",          value: "Savory",          title: "Savory treats",          description: "Handcrafted.",          imageSrc: "http://img.b2bpic.net/free-photo/macaroons-waffles-croissant-donuts-wooden-table_23-2147972778.jpg"},
-        {
-          id: "g7",          value: "Style",          title: "Lifestyle shot",          description: "Pure joy.",          imageSrc: "http://img.b2bpic.net/free-photo/team-young-colleagues-having-meeting-cafe_273609-16122.jpg"},
-        {
-          id: "g8",          value: "Pro",          title: "Workspace",          description: "The kitchen.",          imageSrc: "http://img.b2bpic.net/free-photo/small-business-owner-cleaning-up-coffee-shop_23-2149458143.jpg"},
+        { id: "g1", value: "Fresh", title: "Fresh out of the oven", description: "Baked daily.", imageSrc: "http://img.b2bpic.net/free-photo/red-nature-texture-background_23-2147960326.jpg" },
+        { id: "g2", value: "Flaky", title: "Perfectly flaky", description: "Our signature.", imageSrc: "http://img.b2bpic.net/free-photo/top-view-tasty-bagels-with-seeds-bread_23-2148365501.jpg" },
+        { id: "g3", value: "Local", title: "Local favorite", description: "Community loved.", imageSrc: "http://img.b2bpic.net/free-photo/breakfast-with-croissant_23-2148130539.jpg" },
+        { id: "g4", value: "Chic", title: "Cafe vibe", description: "Cozy space.", imageSrc: "http://img.b2bpic.net/free-photo/delicious-indian-dosa-assortment_23-2149086041.jpg" }
       ]}
       title="Gallery"
       description="A glimpse into our bakery world."
@@ -155,24 +96,15 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={true}
       faqs={[
-        {
-          id: "1",          title: "Where are you located?",          content: "7610 Milwaukee Ave Suite 300, Lubbock, TX"},
-        {
-          id: "5",          title: "What are your operating hours?",          content: "We are open daily from 7:00 AM to 6:00 PM to serve your pastry cravings!"},
-        {
-          id: "2",          title: "Do you offer catering?",          content: "Yes, contact us for custom orders and bulk requests."},
-        {
-          id: "3",          title: "What are your most popular items?",          content: "Our classic butter croissants and pistachio pastries."},
-        {
-          id: "4",          title: "Do you offer dine-in or takeout?",          content: "Both are available for your convenience."},
+        { id: "1", title: "Where are you located?", content: "7610 Milwaukee Ave Suite 300, Lubbock, TX" },
+        { id: "5", title: "What are your operating hours?", content: "We are open daily from 7:00 AM to 6:00 PM." },
+        { id: "2", title: "Do you offer catering?", content: "Yes, contact us for custom orders." }
       ]}
       title="Frequently Asked Questions"
       description="Everything you need to know about Paris Croisserie."
       buttons={[
-        {
-          text: "Order Now",          href: "#contact"},
-        {
-          text: "Call (806) 777-1229",          href: "tel:8067771229"},
+        { text: "Order Now", href: "#contact" },
+        { text: "Call (806) 777-1229", href: "tel:8067771229" },
       ]}
       faqsAnimation="blur-reveal"
     />
@@ -181,14 +113,11 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactText
       useInvertedBackground={false}
-      background={{
-        variant: "gradient-bars"}}
+      background={{ variant: "gradient-bars" }}
       text="Come Try Lubbock’s Favorite Croissants. Fresh pastries, great coffee, and a café you’ll want to come back to."
       buttons={[
-        {
-          text: "Get Directions",          href: "#"},
-        {
-          text: "Call Now",          href: "tel:8067771229"},
+        { text: "Get Directions", href: "#" },
+        { text: "Call Now", href: "tel:8067771229" },
       ]}
     />
   </div>
@@ -198,26 +127,9 @@ export default function LandingPage() {
       imageSrc="http://img.b2bpic.net/free-photo/freshly-baked-bread-oven_140725-4139.jpg"
       logoText="Paris Croisserie"
       columns={[
-        {
-          title: "Visit",          items: [
-            {
-              label: "7610 Milwaukee Ave, Lubbock",              href: "#"},
-          ],
-        },
-        {
-          title: "Company",          items: [
-            {
-              label: "About Us",              href: "#"},
-            {
-              label: "Catering",              href: "#"},
-          ],
-        },
-        {
-          title: "Legal",          items: [
-            {
-              label: "Privacy Policy",              href: "#"},
-          ],
-        },
+        { title: "Visit", items: [{ label: "7610 Milwaukee Ave, Lubbock", href: "#" }] },
+        { title: "Company", items: [{ label: "About Us", href: "#" }, { label: "Catering", href: "#" }] },
+        { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }] }
       ]}
       imageAlt="cozy french cafe atmosphere blur"
     />