diff --git a/src/app/faq/page.tsx b/src/app/faq/page.tsx
new file mode 100644
index 0000000..3dae183
--- /dev/null
+++ b/src/app/faq/page.tsx
@@ -0,0 +1,125 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import ContactCenter from '@/components/sections/contact/ContactCenter';
+import FaqBase from '@/components/sections/faq/FaqBase';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
+
+export default function FAQPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="shift-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="largeSmallSizeMediumTitles"
+        background="noise"
+        cardStyle="inset"
+        primaryButtonStyle="diagonal-gradient"
+        secondaryButtonStyle="radial-glow"
+        headingFontWeight="extrabold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleCentered
+            navItems={[
+              {
+                name: "Home",                href: "/"},
+              {
+                name: "About Us",                href: "/#about"},
+              {
+                name: "Services",                href: "/#services"},
+              {
+                name: "Testimonials",                href: "/#testimonials"},
+              {
+                name: "FAQ",                href: "/faq"},
+              {
+                name: "Contact",                href: "/#contact"},
+            ]}
+            button={{
+              text: "Get a Free Quote",              href: "/#contact"}}
+            brandName="M.D. COMPUTER REPAIRS"
+          />
+        </div>
+
+        <div id="faq-main" data-section="faq-main">
+          <FaqBase
+            textboxLayout="default"
+            useInvertedBackground={false}
+            faqs={[
+              {
+                id: "faq-1",                title: "What types of computers do you repair?",                content: "We repair a wide range of computers, including desktops, laptops (Windows, Mac, Chromebooks), and all-in-one PCs. We handle both hardware and software issues."},
+              {
+                id: "faq-2",                title: "How long does a typical repair take?",                content: "Repair times vary depending on the complexity of the issue and parts availability. Most standard repairs are completed within 1-3 business days. We will provide an estimated timeframe after our initial diagnostic."},
+              {
+                id: "faq-3",                title: "Do you offer data recovery services?",                content: "Yes, we offer data recovery services for various storage devices. While we cannot guarantee 100% recovery in all cases, we utilize advanced techniques to retrieve your valuable data. We also recommend regular backups to prevent data loss."},
+              {
+                id: "faq-4",                title: "What are your pricing options?",                content: "We offer transparent and fair pricing. Diagnostic fees are typically applied towards the repair cost. We'll provide a detailed quote before any work begins, so there are no surprises. Contact us for a free estimate!"},
+              {
+                id: "faq-5",                title: "Do you offer on-site repairs or pick-up services?",                content: "Currently, we operate from our workshop in Addison, IL. We do not offer on-site repairs, but you can drop off and pick up your device at our location during business hours."},
+              {
+                id: "faq-6",                title: "Is there a diagnostic fee?",                content: "Yes, there is a diagnostic fee, but it is waived if you proceed with the repair. This fee covers the time and expertise required to accurately identify the problem with your device."},
+              {
+                id: "faq-7",                title: "What payment methods do you accept?",                content: "We accept major credit cards, debit cards, and cash. Payment is due upon completion of the repair and when you pick up your device."},
+            ]}
+            title="Frequently Asked Questions"
+            description="Find quick answers to common questions about our services, pricing, and repair process. If you can't find what you're looking for, feel free to contact us directly."
+            faqsAnimation="slide-up"
+          />
+        </div>
+
+        <div id="contact" data-section="contact">
+          <ContactCenter
+            useInvertedBackground={false}
+            background={{
+              variant: "radial-gradient"}}
+            tag="Get in Touch"
+            title="Ready for Reliable Computer Repair?"
+            description="Contact us today for a free diagnostic or to schedule your repair. We're here to help you with all your computer needs. Visit us at 974 N Rohlwing Rd, Addison, IL 60101 or call (630) 995-0755."
+            inputPlaceholder="Enter your email"
+            buttonText="Send Message"
+            termsText="By clicking Send Message you're confirming that you agree with our Terms and Conditions."
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterLogoEmphasis
+            columns={[
+              {
+                items: [
+                  {
+                    label: "Home",                    href: "/"},
+                  {
+                    label: "About Us",                    href: "/#about"},
+                  {
+                    label: "Services",                    href: "/#services"},
+                ],
+              },
+              {
+                items: [
+                  {
+                    label: "Testimonials",                    href: "/#testimonials"},
+                  {
+                    label: "FAQ",                    href: "/faq"},
+                  {
+                    label: "Contact",                    href: "/#contact"},
+                ],
+              },
+              {
+                items: [
+                  {
+                    label: "Privacy Policy",                    href: "#"},
+                  {
+                    label: "Terms of Service",                    href: "#"},
+                ],
+              },
+            ]}
+            logoText="M.D. COMPUTER REPAIRS"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 05222f6..1d848bb 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,34 +30,20 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
         {
-          name: "About Us",
-          id: "about",
-        },
+          name: "About Us",          id: "about"},
         {
-          name: "Services",
-          id: "services",
-        },
+          name: "Services",          id: "services"},
         {
-          name: "Testimonials",
-          id: "testimonials",
-        },
+          name: "Testimonials",          id: "testimonials"},
         {
-          name: "FAQ",
-          id: "faq",
-        },
+          name: "FAQ",          href: "/faq"},
         {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "Contact",          id: "contact"},
       ]}
       button={{
-        text: "Get a Free Quote",
-        href: "#contact",
-      }}
+        text: "Get a Free Quote",        href: "#contact"}}
       brandName="M.D. COMPUTER REPAIRS"
     />
   </div>
@@ -65,19 +51,14 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroLogoBillboardSplit
       background={{
-        variant: "animated-grid",
-      }}
+        variant: "animated-grid"}}
       logoText="M.D. COMPUTER REPAIRS"
       description="Expert computer repair service in Addison, IL. Fast, honest, and reliable solutions for all your tech needs. Your trusted local partner for laptop and PC repairs."
       buttons={[
         {
-          text: "Our Services",
-          href: "#services",
-        },
+          text: "Our Services",          href: "#services"},
         {
-          text: "Contact Us",
-          href: "#contact",
-        },
+          text: "Contact Us",          href: "#contact"},
       ]}
       layoutOrder="default"
       imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/a-modern-clean-computer-repair-workshop--1774491388329-e2fb8854.png"
@@ -91,9 +72,7 @@ export default function LandingPage() {
       useInvertedBackground={false}
       title="Your Trusted Local Computer Repair Experts"
       description={[
-        "At M.D. Computer Repairs, we pride ourselves on delivering exceptional service, honest pricing, and personalized solutions. With years of experience, Michael, our lead technician, ensures every repair is handled with expertise and care.",
-        "We believe in clear communication, making sure you understand the issue and the solution. Our goal is to get your devices running efficiently, extending their lifespan and saving you money. We're an LGBTQ+ friendly business, committed to serving everyone in the community with respect and professionalism.",
-      ]}
+        "At M.D. Computer Repairs, we pride ourselves on delivering exceptional service, honest pricing, and personalized solutions. With years of experience, Michael, our lead technician, ensures every repair is handled with expertise and care.",        "We believe in clear communication, making sure you understand the issue and the solution. Our goal is to get your devices running efficiently, extending their lifespan and saving you money. We're an LGBTQ+ friendly business, committed to serving everyone in the community with respect and professionalism."]}
     />
   </div>
 
@@ -104,19 +83,11 @@ export default function LandingPage() {
       useInvertedBackground={false}
       negativeCard={{
         items: [
-          "Slow Performance",
-          "Virus & Malware Removal",
-          "Motherboard Issues",
-          "Faulty Batteries & Charging",
-        ],
+          "Slow Performance",          "Virus & Malware Removal",          "Motherboard Issues",          "Faulty Batteries & Charging"],
       }}
       positiveCard={{
         items: [
-          "Laptop & PC Hardware Repair",
-          "Software Troubleshooting",
-          "Hardware Upgrades & Installation",
-          "Data Recovery & Backup Solutions",
-        ],
+          "Laptop & PC Hardware Repair",          "Software Troubleshooting",          "Hardware Upgrades & Installation",          "Data Recovery & Backup Solutions"],
       }}
       title="Comprehensive Repair Services"
       description="From hardware malfunctions to software glitches, we've got you covered. Our expert technicians diagnose and resolve issues efficiently, getting you back online faster."
@@ -130,41 +101,13 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "1",
-          name: "Hammy",
-          date: "2 months ago",
-          title: "Great job fixing my laptop!",
-          quote: "Michael did a great job fixing my laptop. He was knowledgeable, honest, and explained everything clearly so I understood what was going on. The work was done efficiently, and my laptop runs much better now. Pricing was fair compared to others.",
-          tag: "Laptop Repair",
-          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-femal-1774491386472-ff2c8aab.png",
-        },
+          id: "1",          name: "Hammy",          date: "2 months ago",          title: "Great job fixing my laptop!",          quote: "Michael did a great job fixing my laptop. He was knowledgeable, honest, and explained everything clearly so I understood what was going on. The work was done efficiently, and my laptop runs much better now. Pricing was fair compared to others.",          tag: "Laptop Repair",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-femal-1774491386472-ff2c8aab.png"},
         {
-          id: "2",
-          name: "Anthony Ryle",
-          date: "2 months ago",
-          title: "Quick motherboard replacement!",
-          quote: "The other week my pc suddenly stopped working, and after doing some digging around I came to the conclusion that the motherboard had shorted out. I ordered a new motherboard and after shopping around I found MD Computer Repairs and saw their great reviews. Mike took my PC and installed the motherboard, did some updates, and got it working in less than a day.",
-          tag: "PC Repair",
-          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-male--1774491386398-3e785fab.png",
-        },
+          id: "2",          name: "Anthony Ryle",          date: "2 months ago",          title: "Quick motherboard replacement!",          quote: "The other week my pc suddenly stopped working, and after doing some digging around I came to the conclusion that the motherboard had shorted out. I ordered a new motherboard and after shopping around I found MD Computer Repairs and saw their great reviews. Mike took my PC and installed the motherboard, did some updates, and got it working in less than a day.",          tag: "PC Repair",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-male--1774491386398-3e785fab.png"},
         {
-          id: "3",
-          name: "Joey DeFilippo",
-          date: "a month ago",
-          title: "MacBook Pro brought back to life!",
-          quote: "Michael was great. I had issues with a macbook pro that I thought was donezo, and he cleaned it up and got it working new again. He is affordable and fast, and will be coming back for future tech needs.",
-          tag: "MacBook Repair",
-          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-femal-1774491386173-16bfb194.png",
-        },
+          id: "3",          name: "Joey DeFilippo",          date: "a month ago",          title: "MacBook Pro brought back to life!",          quote: "Michael was great. I had issues with a macbook pro that I thought was donezo, and he cleaned it up and got it working new again. He is affordable and fast, and will be coming back for future tech needs.",          tag: "MacBook Repair",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-femal-1774491386173-16bfb194.png"},
         {
-          id: "4",
-          name: "Sarah Johnson",
-          date: "3 months ago",
-          title: "Excellent service and communication!",
-          quote: "The quality of work, communication, price, and service were excellent! Highly recommend M.D. Computer Repairs for any computer issues.",
-          tag: "General Repair",
-          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-male--1774491386364-8c33d270.png",
-        },
+          id: "4",          name: "Sarah Johnson",          date: "3 months ago",          title: "Excellent service and communication!",          quote: "The quality of work, communication, price, and service were excellent! Highly recommend M.D. Computer Repairs for any computer issues.",          tag: "General Repair",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BSnSb88SPZiwNYEtv2dGHAFXkd/professional-headshot-of-a-smiling-male--1774491386364-8c33d270.png"},
       ]}
       title="What Our Clients Say"
       description="Don't just take our word for it. Our customers consistently praise our expertise, honesty, and fast service. See why we're Addison's top choice for computer repairs."
@@ -177,25 +120,13 @@ export default function LandingPage() {
       useInvertedBackground={false}
       faqs={[
         {
-          id: "faq-1",
-          title: "What types of computers do you repair?",
-          content: "We repair a wide range of computers, including desktops, laptops (Windows, Mac, Chromebooks), and all-in-one PCs. We handle both hardware and software issues.",
-        },
+          id: "faq-1",          title: "What types of computers do you repair?",          content: "We repair a wide range of computers, including desktops, laptops (Windows, Mac, Chromebooks), and all-in-one PCs. We handle both hardware and software issues."},
         {
-          id: "faq-2",
-          title: "How long does a typical repair take?",
-          content: "Repair times vary depending on the complexity of the issue and parts availability. Most standard repairs are completed within 1-3 business days. We will provide an estimated timeframe after our initial diagnostic.",
-        },
+          id: "faq-2",          title: "How long does a typical repair take?",          content: "Repair times vary depending on the complexity of the issue and parts availability. Most standard repairs are completed within 1-3 business days. We will provide an estimated timeframe after our initial diagnostic."},
         {
-          id: "faq-3",
-          title: "Do you offer data recovery services?",
-          content: "Yes, we offer data recovery services for various storage devices. While we cannot guarantee 100% recovery in all cases, we utilize advanced techniques to retrieve your valuable data. We also recommend regular backups to prevent data loss.",
-        },
+          id: "faq-3",          title: "Do you offer data recovery services?",          content: "Yes, we offer data recovery services for various storage devices. While we cannot guarantee 100% recovery in all cases, we utilize advanced techniques to retrieve your valuable data. We also recommend regular backups to prevent data loss."},
         {
-          id: "faq-4",
-          title: "What are your pricing options?",
-          content: "We offer transparent and fair pricing. Diagnostic fees are typically applied towards the repair cost. We'll provide a detailed quote before any work begins, so there are no surprises. Contact us for a free estimate!",
-        },
+          id: "faq-4",          title: "What are your pricing options?",          content: "We offer transparent and fair pricing. Diagnostic fees are typically applied towards the repair cost. We'll provide a detailed quote before any work begins, so there are no surprises. Contact us for a free estimate!"},
       ]}
       title="Frequently Asked Questions"
       description="Find quick answers to common questions about our services, pricing, and repair process. If you can't find what you're looking for, feel free to contact us directly."
@@ -207,8 +138,7 @@ export default function LandingPage() {
       <ContactCenter
       useInvertedBackground={false}
       background={{
-        variant: "radial-gradient",
-      }}
+        variant: "radial-gradient"}}
       tag="Get in Touch"
       title="Ready for Reliable Computer Repair?"
       description="Contact us today for a free diagnostic or to schedule your repair. We're here to help you with all your computer needs. Visit us at 974 N Rohlwing Rd, Addison, IL 60101 or call (630) 995-0755."
@@ -224,45 +154,29 @@ export default function LandingPage() {
         {
           items: [
             {
-              label: "Home",
-              href: "#hero",
-            },
+              label: "Home",              href: "#hero"},
             {
-              label: "About Us",
-              href: "#about",
-            },
+              label: "About Us",              href: "#about"},
             {
-              label: "Services",
-              href: "#services",
-            },
+              label: "Services",              href: "#services"},
           ],
         },
         {
           items: [
             {
-              label: "Testimonials",
-              href: "#testimonials",
-            },
+              label: "Testimonials",              href: "#testimonials"},
             {
-              label: "FAQ",
-              href: "#faq",
-            },
+              label: "FAQ",              href: "/faq"},
             {
-              label: "Contact",
-              href: "#contact",
-            },
+              label: "Contact",              href: "#contact"},
           ],
         },
         {
           items: [
             {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
             {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
           ],
         },
       ]}