diff --git a/src/app/faq/page.tsx b/src/app/faq/page.tsx
new file mode 100644
index 0000000..4ca840e
--- /dev/null
+++ b/src/app/faq/page.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import FaqBase from '@/components/sections/faq/FaqBase';
+import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
+import FooterCard from '@/components/sections/footer/FooterCard';
+
+export default function FaqPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="shift-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="mediumSmall"
+        sizing="mediumLargeSizeLargeTitles"
+        background="grid"
+        cardStyle="layered-gradient"
+        primaryButtonStyle="diagonal-gradient"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <NavbarStyleCentered
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "About", id: "/about" },
+            { name: "Menu", id: "/products" },
+            { name: "FAQ", id: "/faq" },
+            { name: "Contact", id: "/contact" },
+          ]}
+          brandName="Artemis Kafe"
+        />
+        <FaqBase
+          textboxLayout="default"
+          useInvertedBackground={true}
+          title="Common Questions"
+          description="Find answers to our most popular inquiries."
+          faqsAnimation="slide-up"
+          faqs={[
+            { id: "q1", title: "Do you offer vegan options?", content: "Yes, we offer plant-based milk alternatives and vegan-friendly pastries every day." },
+            { id: "q2", title: "Is there free Wi-Fi?", content: "Absolutely, we have fast, complimentary Wi-Fi for all our guests." },
+            { id: "q3", title: "Can I reserve a table?", content: "We work on a first-come, first-served basis, but larger groups can call us in advance." },
+          ]}
+        />
+        <FooterCard
+            logoText="Artemis Kafe"
+            copyrightText="© 2025 | Artemis Kafe"
+        />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index e807af9..9b8e206 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -31,21 +31,15 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "/"},
         {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
         {
-          name: "Menu",
-          id: "products",
-        },
+          name: "Menu",          id: "products"},
         {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "FAQ",          id: "/faq"},
+        {
+          name: "Contact",          id: "contact"},
       ]}
       brandName="Artemis Kafe"
     />
@@ -54,84 +48,27 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroCentered
       background={{
-        variant: "radial-gradient",
-      }}
+        variant: "radial-gradient"}}
       title="Artemis Kafe: Crafting Moments in Every Sip"
       description="Experience the perfect balance of artisanal coffee and warm, inviting atmosphere at the heart of the city."
       avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/teenager-studying-gesturing-thumb-up_23-2147860826.jpg",
-          alt: "Happy coffee customer",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/indoor-shot-beautiful-redhead-girl-has-coffee-break-holds-white-mug-with-aromatic-beverage-smiles-looks-enjoys-nice-conversation-while-drinking-tea-morning-discusses-news_273609-27897.jpg",
-          alt: "Young woman drinking coffee",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/male-barista-coffee-shop-holding-cup-by-counter_1303-29321.jpg",
-          alt: "Senior couple enjoying cafe",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/mindful-dark-skinned-male-student-wearing-casual-clothing-preparing-exams-sitting-cafe-table-reading-information-textbook-talking-phone_273609-7441.jpg",
-          alt: "Student studying at cafe",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/beautiful-woman-having-cup-coffee-cafe_107420-63679.jpg",
-          alt: "Woman having coffee",
-        },
+        { src: "http://img.b2bpic.net/free-photo/teenager-studying-gesturing-thumb-up_23-2147860826.jpg", alt: "Happy coffee customer" },
+        { src: "http://img.b2bpic.net/free-photo/indoor-shot-beautiful-redhead-girl-has-coffee-break-holds-white-mug-with-aromatic-beverage-smiles-looks-enjoys-nice-conversation-while-drinking-tea-morning-discusses-news_273609-27897.jpg", alt: "Young woman drinking coffee" },
+        { src: "http://img.b2bpic.net/free-photo/male-barista-coffee-shop-holding-cup-by-counter_1303-29321.jpg", alt: "Senior couple enjoying cafe" },
+        { src: "http://img.b2bpic.net/free-photo/mindful-dark-skinned-male-student-wearing-casual-clothing-preparing-exams-sitting-cafe-table-reading-information-textbook-talking-phone_273609-7441.jpg", alt: "Student studying at cafe" },
+        { src: "http://img.b2bpic.net/free-photo/beautiful-woman-having-cup-coffee-cafe_107420-63679.jpg", alt: "Woman having coffee" },
       ]}
       avatarText="Loved by 10k+ local regulars"
-      buttons={[
-        {
-          text: "View Menu",
-          href: "#products",
-        },
-      ]}
-      marqueeItems={[
-        {
-          type: "text",
-          text: "Organic Coffee",
-        },
-        {
-          type: "text",
-          text: "Locally Sourced",
-        },
-        {
-          type: "text",
-          text: "Fair Trade",
-        },
-        {
-          type: "text",
-          text: "Freshly Baked",
-        },
-        {
-          type: "text",
-          text: "Artisan Craft",
-        },
-      ]}
+      buttons={[{ text: "View Menu", href: "#products" }]}
+      marqueeItems={[{ type: "text", text: "Organic Coffee" }, { type: "text", text: "Locally Sourced" }, { type: "text", text: "Fair Trade" }, { type: "text", text: "Freshly Baked" }, { type: "text", text: "Artisan Craft" }]}
     />
   </div>
 
   <div id="about" data-section="about">
       <InlineImageSplitTextAbout
       useInvertedBackground={true}
-      heading={[
-        {
-          type: "text",
-          content: "Our Passion for Perfection",
-        },
-        {
-          type: "image",
-          src: "http://img.b2bpic.net/free-photo/close-up-hand-holding-coffee-with-milk-cream_23-2148865608.jpg",
-          alt: "Our process",
-        },
-      ]}
-      buttons={[
-        {
-          text: "Our Story",
-          href: "#about",
-        },
-      ]}
+      heading={[{ type: "text", content: "Our Passion for Perfection" }, { type: "image", src: "http://img.b2bpic.net/free-photo/close-up-hand-holding-coffee-with-milk-cream_23-2148865608.jpg", alt: "Our process" }]}
+      buttons={[{ text: "Our Story", href: "#about" }]}
     />
   </div>
 
@@ -142,24 +79,9 @@ export default function LandingPage() {
       gridVariant="uniform-all-items-equal"
       useInvertedBackground={false}
       features={[
-        {
-          title: "Ethical Sourcing",
-          description: "We source our beans directly from sustainable farmers.",
-          imageSrc: "http://img.b2bpic.net/free-photo/wooden-plate-with-ripe-vegetables-assortment_23-2147694162.jpg",
-          imageAlt: "Beans",
-        },
-        {
-          title: "Fresh Daily",
-          description: "Our pastries are baked fresh every single morning.",
-          imageSrc: "http://img.b2bpic.net/free-photo/food-vegetable-colorful-background-tasty-fresh-vegetables-wooden-table-top-view-with-copy-space_1220-3868.jpg",
-          imageAlt: "Pastries",
-        },
-        {
-          title: "Artisan Craft",
-          description: "Expertly trained baristas for the perfect cup.",
-          imageSrc: "http://img.b2bpic.net/free-photo/different-vegetables-wooden-background_23-2147694233.jpg",
-          imageAlt: "Craft",
-        },
+        { title: "Ethical Sourcing", description: "We source our beans directly from sustainable farmers.", imageSrc: "http://img.b2bpic.net/free-photo/wooden-plate-with-ripe-vegetables-assortment_23-2147694162.jpg", imageAlt: "Beans" },
+        { title: "Fresh Daily", description: "Our pastries are baked fresh every single morning.", imageSrc: "http://img.b2bpic.net/free-photo/food-vegetable-colorful-background-tasty-fresh-vegetables-wooden-table-top-view-with-copy-space_1220-3868.jpg", imageAlt: "Pastries" },
+        { title: "Artisan Craft", description: "Expertly trained baristas for the perfect cup.", imageSrc: "http://img.b2bpic.net/free-photo/different-vegetables-wooden-background_23-2147694233.jpg", imageAlt: "Craft" },
       ]}
       title="Why Choose Us"
       description="Everything we do is focused on quality and community."
@@ -173,54 +95,12 @@ export default function LandingPage() {
       gridVariant="one-large-right-three-stacked-left"
       useInvertedBackground={true}
       products={[
-        {
-          id: "1",
-          name: "Latte",
-          price: "$4.50",
-          variant: "Small",
-          imageSrc: "http://img.b2bpic.net/free-photo/espresso-coffee-glass-white-napkin-with-cocoa-shaker-wooden-spoon_23-2147906714.jpg",
-          imageAlt: "Latte",
-        },
-        {
-          id: "2",
-          name: "Espresso",
-          price: "$3.00",
-          variant: "Regular",
-          imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-hot-strong-blue-coffee-cocoa-drink-hot_140725-32032.jpg",
-          imageAlt: "Espresso",
-        },
-        {
-          id: "3",
-          name: "Muffin",
-          price: "$3.50",
-          variant: "Blueberry",
-          imageSrc: "http://img.b2bpic.net/free-photo/fresh-homemade-delicious-blueberry-muffins_114579-43325.jpg",
-          imageAlt: "Muffin",
-        },
-        {
-          id: "4",
-          name: "Avocado Toast",
-          price: "$8.00",
-          variant: "Standard",
-          imageSrc: "http://img.b2bpic.net/free-photo/toast-with-avocado-seeds_23-2148574491.jpg",
-          imageAlt: "Toast",
-        },
-        {
-          id: "5",
-          name: "Cold Brew",
-          price: "$5.00",
-          variant: "Large",
-          imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646422.jpg",
-          imageAlt: "Cold Brew",
-        },
-        {
-          id: "6",
-          name: "Croissant",
-          price: "$3.75",
-          variant: "Butter",
-          imageSrc: "http://img.b2bpic.net/free-photo/blue-plate-two-plain-fresh-croissants-stone-table_114579-36683.jpg",
-          imageAlt: "Croissant",
-        },
+        { id: "1", name: "Latte", price: "$4.50", variant: "Small", imageSrc: "http://img.b2bpic.net/free-photo/espresso-coffee-glass-white-napkin-with-cocoa-shaker-wooden-spoon_23-2147906714.jpg", imageAlt: "Latte" },
+        { id: "2", name: "Espresso", price: "$3.00", variant: "Regular", imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-hot-strong-blue-coffee-cocoa-drink-hot_140725-32032.jpg", imageAlt: "Espresso" },
+        { id: "3", name: "Muffin", price: "$3.50", variant: "Blueberry", imageSrc: "http://img.b2bpic.net/free-photo/fresh-homemade-delicious-blueberry-muffins_114579-43325.jpg", imageAlt: "Muffin" },
+        { id: "4", name: "Avocado Toast", price: "$8.00", variant: "Standard", imageSrc: "http://img.b2bpic.net/free-photo/toast-with-avocado-seeds_23-2148574491.jpg", imageAlt: "Toast" },
+        { id: "5", name: "Cold Brew", price: "$5.00", variant: "Large", imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646422.jpg", imageAlt: "Cold Brew" },
+        { id: "6", name: "Croissant", price: "$3.75", variant: "Butter", imageSrc: "http://img.b2bpic.net/free-photo/blue-plate-two-plain-fresh-croissants-stone-table_114579-36683.jpg", imageAlt: "Croissant" },
       ]}
       title="Signature Menu"
       description="Explore our selection of artisanal coffee and fresh snacks."
@@ -234,97 +114,23 @@ export default function LandingPage() {
       gridVariant="three-columns-all-equal-width"
       useInvertedBackground={false}
       testimonials={[
-        {
-          id: "1",
-          name: "Sarah J.",
-          role: "Designer",
-          company: "Local Agency",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-enjoying-coffee-cup_23-2148756305.jpg",
-        },
-        {
-          id: "2",
-          name: "Michael T.",
-          role: "Architect",
-          company: "Self-Employed",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-sitting-cafe-drinking-coffee_1303-30736.jpg",
-        },
-        {
-          id: "3",
-          name: "Emily R.",
-          role: "Marketing",
-          company: "GrowthCo",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-couple-hugging-each-other_23-2148214562.jpg",
-        },
-        {
-          id: "4",
-          name: "David K.",
-          role: "Manager",
-          company: "StartupXYZ",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/man-having-iced-coffee-break-while-using-smartphone_23-2149567215.jpg",
-        },
-        {
-          id: "5",
-          name: "Anna S.",
-          role: "Writer",
-          company: "Freelance",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/blue-eyed-curly-girl-with-red-lipstick-dressed-eco-white-fur-coat-smiling-holding-glass-coffee-pink-space_197531-15264.jpg",
-        },
+        { id: "1", name: "Sarah J.", role: "Designer", company: "Local Agency", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-woman-enjoying-coffee-cup_23-2148756305.jpg" },
+        { id: "2", name: "Michael T.", role: "Architect", company: "Self-Employed", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-sitting-cafe-drinking-coffee_1303-30736.jpg" },
+        { id: "3", name: "Emily R.", role: "Marketing", company: "GrowthCo", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-couple-hugging-each-other_23-2148214562.jpg" },
       ]}
       title="Local Love"
       description="Don't just take our word for it—listen to our regulars."
     />
   </div>
 
-  <div id="faq" data-section="faq">
-      <FaqBase
-      textboxLayout="default"
-      useInvertedBackground={true}
-      faqs={[
-        {
-          id: "q1",
-          title: "Do you offer vegan options?",
-          content: "Yes, we offer plant-based milk alternatives and vegan-friendly pastries every day.",
-        },
-        {
-          id: "q2",
-          title: "Is there free Wi-Fi?",
-          content: "Absolutely, we have fast, complimentary Wi-Fi for all our guests.",
-        },
-        {
-          id: "q3",
-          title: "Can I reserve a table?",
-          content: "We work on a first-come, first-served basis, but larger groups can call us in advance.",
-        },
-      ]}
-      title="Common Questions"
-      description="Find answers to our most popular inquiries."
-      faqsAnimation="slide-up"
-    />
-  </div>
-
   <div id="contact" data-section="contact">
       <ContactSplitForm
       useInvertedBackground={false}
       title="Find Us"
       description="Stop by for a visit, we are located in the heart of the city."
       inputs={[
-        {
-          name: "name",
-          type: "text",
-          placeholder: "Your Name",
-          required: true,
-        },
-        {
-          name: "email",
-          type: "email",
-          placeholder: "Your Email",
-          required: true,
-        },
+        { name: "name", type: "text", placeholder: "Your Name", required: true },
+        { name: "email", type: "email", placeholder: "Your Email", required: true },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/old-building-corner-paved-street_23-2147764408.jpg"
     />