diff --git a/src/app/faq/page.tsx b/src/app/faq/page.tsx
index fc69ca4..35c1bd5 100644
--- a/src/app/faq/page.tsx
+++ b/src/app/faq/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import FaqDouble from "@/components/sections/faq/FaqDouble";
@@ -8,54 +9,87 @@ import { HelpCircle } from "lucide-react";
 
 export default function FaqPage() {
   const navItems = [
-    { name: "Home", id: "/" },
+    { name: "Home", id: "home" },
     { name: "Shop", id: "shop" },
     { name: "Brands", id: "brands" },
     { name: "New Arrivals", id: "new-arrivals" },
     { name: "Best Sellers", id: "best-sellers" },
     { name: "About", id: "about" },
     { name: "Contact", id: "contact" },
-    { name: "FAQ", id: "/faq" },
-    { name: "Shipping & Returns", id: "/shipping-and-returns" },
-    { name: "Privacy Policy", id: "/privacy-policy" },
-    { name: "Terms & Conditions", id: "/terms-and-conditions" },
   ];
 
   const footerColumns = [
     {
-      title: "Shop",      items: [
+      title: "Shop",
+      items: [
         { label: "All Products", href: "/shop" },
-        { label: "New Arrivals", href: "/shop" },
-        { label: "Best Sellers", href: "/shop" },
-        { label: "Brands", href: "/shop" },
+        { label: "New Arrivals", href: "/new-arrivals" },
+        { label: "Best Sellers", href: "/best-sellers" },
+        { label: "Brands", href: "/brands" },
       ],
     },
     {
-      title: "Company",      items: [
-        { label: "About Us", href: "/" },
-        { label: "Contact", href: "/" },
-        { label: "Blog", href: "/" },
+      title: "Company",
+      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Contact", href: "/contact" },
+        { label: "Blog", href: "/blog" },
         { label: "Careers", href: "#" },
       ],
     },
     {
-      title: "Support",      items: [
-        { label: "Shipping & Returns", href: "/shipping-and-returns" },
+      title: "Support",
+      items: [
+        { label: "Shipping & Returns", href: "/faq" },
         { label: "FAQ", href: "/faq" },
         { label: "Size Guide", href: "#" },
         { label: "Track Order", href: "#" },
       ],
     },
     {
-      title: "Legal",      items: [
-        { label: "Privacy Policy", href: "/privacy-policy" },
-        { label: "Terms & Conditions", href: "/terms-and-conditions" },
+      title: "Legal",
+      items: [
+        { label: "Privacy Policy", href: "/privacy" },
+        { label: "Terms & Conditions", href: "/terms" },
         { label: "Cookie Policy", href: "#" },
         { label: "Accessibility", href: "#" },
       ],
     },
   ];
 
+  const faqs = [
+    {
+      id: "faq-001",
+      title: "Are all products authentic?",
+      content: "Yes, we guarantee 100% authenticity for all items sold on garraagarmzz. We source directly from authorized retailers and brand partnerships. Each item undergoes quality verification before being listed.",
+    },
+    {
+      id: "faq-002",
+      title: "What is your return policy?",
+      content: "We offer a 30-day return policy on all items. Products must be unworn, unwashed, and in original packaging with all tags attached. Returns are free within the US.",
+    },
+    {
+      id: "faq-003",
+      title: "How long does shipping take?",
+      content: "Standard shipping takes 5-7 business days. Express shipping (2-3 business days) and overnight shipping options are available at checkout. Orders are processed within 24 hours.",
+    },
+    {
+      id: "faq-004",
+      title: "Do you ship internationally?",
+      content: "Yes, we ship to most countries worldwide. International shipping rates and delivery times vary by location. Customs duties may apply depending on your country.",
+    },
+    {
+      id: "faq-005",
+      title: "What payment methods do you accept?",
+      content: "We accept all major credit cards, PayPal, Apple Pay, Google Pay, and Klarna. All payments are secured with SSL encryption.",
+    },
+    {
+      id: "faq-006",
+      title: "Can I track my order?",
+      content: "Yes, tracking information is sent to your email immediately after your order ships. You can also track your order in your account dashboard.",
+    },
+  ];
+
   return (
     <ThemeProvider
       defaultButtonVariant="icon-arrow"
@@ -74,7 +108,9 @@ export default function FaqPage() {
           navItems={navItems}
           brandName="garraagarmzz"
           button={{
-            text: "Shop Now",            href: "/shop"}}
+            text: "Shop Now",
+            href: "/shop",
+          }}
           animateOnLoad={true}
           className="bg-opacity-95"
           navItemClassName="text-sm font-medium"
@@ -83,41 +119,78 @@ export default function FaqPage() {
         />
       </div>
 
-      <div id="faq-section" data-section="faq-section">
+      <div id="faq-hero" data-section="faq-hero" className="py-16 md:py-24 px-4 md:px-6">
+        <div className="mx-auto px-4 md:px-6 max-w-3xl text-center">
+          <div className="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-neutral-900/50 border border-neutral-800 mb-6">
+            <HelpCircle className="w-4 h-4 text-blue-400" />
+            <span className="text-sm font-medium text-neutral-400">Help Center</span>
+          </div>
+          <h1 className="text-4xl md:text-5xl font-bold mb-4">Frequently Asked Questions</h1>
+          <p className="text-xl text-neutral-400">
+            Find answers to common questions about our products, shipping, returns, and more.
+          </p>
+        </div>
+      </div>
+
+      <div id="faq-section" data-section="faq-section" className="py-12">
         <FaqDouble
-          title="Frequently Asked Questions"
-          description="Find answers to common questions about our products, shipping, and returns."
+          faqs={faqs}
+          title="Shipping & Returns"
+          description="Learn about our shipping policies, return process, and delivery options."
           tag="Support"
           tagIcon={HelpCircle}
           tagAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
           faqsAnimation="slide-up"
-          faqs={[
+          buttons={[
             {
-              id: "faq-001",              title: "Are all products authentic?",              content: "Yes, we guarantee 100% authenticity for all items sold on garraagarmzz. We source directly from authorized retailers and brand partnerships. Each item undergoes quality verification before being listed."},
-            {
-              id: "faq-002",              title: "What is your return policy?",              content: "We offer a 30-day return policy on all items. Products must be unworn, unwashed, and in original packaging with all tags attached. Returns are free within the US."},
-            {
-              id: "faq-003",              title: "How long does shipping take?",              content: "Standard shipping takes 5-7 business days. Express shipping (2-3 business days) and overnight shipping options are available at checkout. Orders are processed within 24 hours."},
-            {
-              id: "faq-004",              title: "Do you ship internationally?",              content: "Yes, we ship to most countries worldwide. International shipping rates and delivery times vary by location. Customs duties may apply depending on your country."},
-            {
-              id: "faq-005",              title: "What payment methods do you accept?",              content: "We accept all major credit cards, PayPal, Apple Pay, Google Pay, and Klarna. All payments are secured with SSL encryption."},
-            {
-              id: "faq-006",              title: "Can I track my order?",              content: "Yes, tracking information is sent to your email immediately after your order ships. You can also track your order in your account dashboard."},
+              text: "Contact Support",
+              href: "/contact",
+            },
           ]}
-          buttons={[{ text: "View Full Policy", href: "/" }]}
           buttonAnimation="slide-up"
-          ariaLabel="FAQ page"
+          ariaLabel="FAQ section"
         />
       </div>
 
+      <div id="faq-additional" data-section="faq-additional" className="py-16 px-4 md:px-6 bg-neutral-900/30">
+        <div className="mx-auto px-4 md:px-6 max-w-3xl">
+          <h2 className="text-3xl font-bold mb-8 text-center">Still have questions?</h2>
+          <div className="grid md:grid-cols-2 gap-6">
+            <div className="border border-neutral-700 rounded-lg p-6 hover:border-neutral-600 transition-colors">
+              <h3 className="text-lg font-semibold mb-3">Authenticity Guarantee</h3>
+              <p className="text-neutral-400">
+                Every product on garraagarmzz is authenticated by our expert team and sourced directly from authorized retailers. We stand behind every purchase.
+              </p>
+            </div>
+            <div className="border border-neutral-700 rounded-lg p-6 hover:border-neutral-600 transition-colors">
+              <h3 className="text-lg font-semibold mb-3">Secure Shopping</h3>
+              <p className="text-neutral-400">
+                Your transactions are protected with industry-standard SSL encryption. We never store your full credit card details on our servers.
+              </p>
+            </div>
+            <div className="border border-neutral-700 rounded-lg p-6 hover:border-neutral-600 transition-colors">
+              <h3 className="text-lg font-semibold mb-3">Fast Processing</h3>
+              <p className="text-neutral-400">
+                Orders are processed within 24 hours and shipped with tracking. Standard shipping to the US takes 5-7 business days.
+              </p>
+            </div>
+            <div className="border border-neutral-700 rounded-lg p-6 hover:border-neutral-600 transition-colors">
+              <h3 className="text-lg font-semibold mb-3">Customer Support</h3>
+              <p className="text-neutral-400">
+                Our support team is available via email. We respond to all inquiries within 24 business hours. Your satisfaction is our priority.
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+
       <div id="footer" data-section="footer">
         <FooterBaseCard
           logoText="garraagarmzz"
-          copyrightText="© 2025 garraagarmzz. All rights reserved. Curated Fashion From The Best Brands."
           columns={footerColumns}
+          copyrightText="© 2025 garraagarmzz. All rights reserved. Curated Fashion From The Best Brands."
           ariaLabel="Site footer with navigation and company information"
         />
       </div>