diff --git a/src/app/page.tsx b/src/app/page.tsx
index f0fd86c..0f00567 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -8,29 +8,30 @@ import FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
 import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
 import PricingCardThree from "@/components/sections/pricing/PricingCardThree";
 import TestimonialCardThirteen from "@/components/sections/testimonial/TestimonialCardThirteen";
+import FaqBase from "@/components/sections/faq/FaqBase";
 import ContactSplit from "@/components/sections/contact/ContactSplit";
 import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
-import { Sparkles } from "lucide-react";
+import { Sparkles, Mail } from "lucide-react";
 
 export default function HomePage() {
   const navItems = [
     { name: "Home", id: "/" },
-    { name: "Features", id: "/features" },
-    { name: "Pricing", id: "/pricing" },
-    { name: "Contact", id: "/contact" },
+    { name: "Features", id: "#features" },
+    { name: "Pricing", id: "#pricing" },
+    { name: "Contact", id: "#contact" },
   ];
 
   const footerColumns = [
     {
       items: [
         { label: "Home", href: "/" },
-        { label: "Features", href: "/features" },
-        { label: "Pricing", href: "/pricing" },
+        { label: "Features", href: "#features" },
+        { label: "Pricing", href: "#pricing" },
       ],
     },
     {
       items: [
-        { label: "Dashboard", href: "/" },
+        { label: "Dashboard", href: "/dashboard" },
         { label: "Matches", href: "/matches" },
         { label: "Analytics", href: "/analytics" },
       ],
@@ -46,7 +47,7 @@ export default function HomePage() {
       items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
-        { label: "Contact", href: "/contact" },
+        { label: "Contact", href: "#contact" },
       ],
     },
   ];
@@ -69,9 +70,7 @@ export default function HomePage() {
           brandName="RugbyStats"
           navItems={navItems}
           button={{
-            text: "Start Tracking",
-            href: "/new-match",
-          }}
+            text: "Start Tracking",            href: "/new-match"}}
         />
       </div>
 
@@ -82,7 +81,7 @@ export default function HomePage() {
           layoutOrder="default"
           buttons={[
             { text: "Start Free Trial", href: "/new-match" },
-            { text: "Watch Demo", href: "/features" },
+            { text: "Watch Demo", href: "#features" },
           ]}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/a-dynamic-rugby-stats-dashboard-interfac-1772618864039-a6500379.png"
           imageAlt="RugbyStats Dashboard"
@@ -100,45 +99,21 @@ export default function HomePage() {
           description="From live match tracking to deep player analysis, RugbyStats gives you complete control over performance data."
           features={[
             {
-              id: "1",
-              title: "Live Match Tracking",
-              description:
-                "Track player stats in real-time during matches. Expand categories, increment stats, and update team metrics instantly.",
-              tag: "Live Features",
-              imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/a-mobile-first-rugby-match-tracking-inte-1772618864810-17dc4b21.png?_wi=1",
-              imageAlt: "Live Match Tracking Interface",
-            },
+              id: "1",              title: "Live Match Tracking",              description:
+                "Track player stats in real-time during matches. Expand categories, increment stats, and update team metrics instantly.",              tag: "Live Features",              imageSrc:
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/a-mobile-first-rugby-match-tracking-inte-1772618864810-17dc4b21.png",              imageAlt: "Live Match Tracking Interface"},
             {
-              id: "2",
-              title: "Player Analytics",
-              description:
-                "Detailed individual player profiles with performance trends, hand-specific passing stats, tackle breakdowns, and impact scoring.",
-              tag: "Player Data",
-              imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/detailed-player-profile-page-showing-ind-1772618865144-8e353bed.png?_wi=1",
-              imageAlt: "Player Profile Analytics",
-            },
+              id: "2",              title: "Player Analytics",              description:
+                "Detailed individual player profiles with performance trends, hand-specific passing stats, tackle breakdowns, and impact scoring.",              tag: "Player Data",              imageSrc:
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/detailed-player-profile-page-showing-ind-1772618865144-8e353bed.png",              imageAlt: "Player Profile Analytics"},
             {
-              id: "3",
-              title: "Team Intelligence",
-              description:
-                "Manage squad rosters, assign players to multiple teams, track aggregate statistics, and monitor team performance.",
-              tag: "Team Management",
-              imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/team-roster-management-interface-showing-1772618865404-33f4c56a.png?_wi=1",
-              imageAlt: "Team Management Interface",
-            },
+              id: "3",              title: "Team Intelligence",              description:
+                "Manage squad rosters, assign players to multiple teams, track aggregate statistics, and monitor team performance.",              tag: "Team Management",              imageSrc:
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/team-roster-management-interface-showing-1772618865404-33f4c56a.png",              imageAlt: "Team Management Interface"},
             {
-              id: "4",
-              title: "Advanced Analytics",
-              description:
-                "Comprehensive dashboard with player comparisons, opponent analysis, custom metrics, and performance visualizations.",
-              tag: "Analytics Pro",
-              imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/comprehensive-rugby-analytics-dashboard--1772618865079-44460476.png",
-              imageAlt: "Advanced Analytics Dashboard",
-            },
+              id: "4",              title: "Advanced Analytics",              description:
+                "Comprehensive dashboard with player comparisons, opponent analysis, custom metrics, and performance visualizations.",              tag: "Analytics Pro",              imageSrc:
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/comprehensive-rugby-analytics-dashboard--1772618865079-44460476.png",              imageAlt: "Advanced Analytics Dashboard"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -150,11 +125,8 @@ export default function HomePage() {
         <TextSplitAbout
           title="Built for Rugby Excellence"
           description={[
-            "RugbyStats revolutionizes how teams and coaches manage performance data. Our platform combines real-time match tracking with sophisticated analytics to give you actionable insights that drive results.",
-            "Whether you're tracking 5 matches or 500, managing one team or multiple squads, our free and pro plans scale with your needs. Train smarter, compete harder, and achieve rugby excellence with data-driven decision making.",
-            "From grassroots clubs to elite academies, rugby teams worldwide trust RugbyStats to elevate their game through comprehensive performance management and AI-powered coaching intelligence.",
-          ]}
-          buttons={[{ text: "Explore Features", href: "/features" }]}
+            "RugbyStats revolutionizes how teams and coaches manage performance data. Our platform combines real-time match tracking with sophisticated analytics to give you actionable insights that drive results.",            "Whether you're tracking 5 matches or 500, managing one team or multiple squads, our free and pro plans scale with your needs. Train smarter, compete harder, and achieve rugby excellence with data-driven decision making.",            "From grassroots clubs to elite academies, rugby teams worldwide trust RugbyStats to elevate their game through comprehensive performance management and AI-powered coaching intelligence."]}
+          buttons={[{ text: "Explore Features", href: "#features" }]}
           showBorder={true}
           useInvertedBackground={false}
         />
@@ -169,38 +141,15 @@ export default function HomePage() {
           useInvertedBackground={true}
           plans={[
             {
-              id: "free",
-              price: "Free",
-              name: "Starter Plan",
-              buttons={[{ text: "Get Started", href: "/signup" }]}
-              features={[
-                "Up to 5 completed matches",
-                "Basic player and team management",
-                "Match notes and observations",
-                "Standard match review",
-                "Simple stat tracking",
-                "Email support",
-              ]}
+              id: "free",              price: "Free",              name: "Starter Plan",              buttons: [{ text: "Get Started", href: "/signup" }],
+              features: [
+                "Up to 5 completed matches",                "Basic player and team management",                "Match notes and observations",                "Standard match review",                "Simple stat tracking",                "Email support"],
             },
             {
-              id: "pro",
-              badge: "Most Popular",
-              badgeIcon: Sparkles,
-              price: "£6.99",
-              name: "Pro Plan",
-              buttons={[{ text: "Upgrade Now", href: "/upgrade" }]}
-              features={[
-                "Unlimited matches and tracking",
-                "Advanced player analytics",
-                "AI coaching insights",
-                "Physical metrics tracking",
-                "Kick maps and radar charts",
-                "Performance trend analysis",
-                "Custom dashboards",
-                "Export match data",
-                "Priority support",
-                "Multi-team management",
-              ]}
+              id: "pro",              badge: "Most Popular",              badgeIcon: Sparkles,
+              price: "£6.99",              name: "Pro Plan",              buttons: [{ text: "Upgrade Now", href: "/upgrade" }],
+              features: [
+                "Unlimited matches and tracking",                "Advanced player analytics",                "AI coaching insights",                "Physical metrics tracking",                "Kick maps and radar charts",                "Performance trend analysis",                "Custom dashboards",                "Export match data",                "Priority support",                "Multi-team management"],
             },
           ]}
         />
@@ -216,49 +165,49 @@ export default function HomePage() {
           animationType="slide-up"
           testimonials={[
             {
-              id: "1",
-              name: "James Murphy",
-              handle: "@j_murphy_coach",
-              testimonial:
-                "RugbyStats transformed how we track and analyze player performance. The real-time match tracking is game-changing, and the analytics give us insights we never had before.",
-              rating: 5,
+              id: "1",              name: "James Murphy",              handle: "@j_murphy_coach",              testimonial:
+                "RugbyStats transformed how we track and analyze player performance. The real-time match tracking is game-changing, and the analytics give us insights we never had before.",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-coach-o-1772618864352-df510387.png",
-              imageAlt: "James Murphy, Rugby Coach",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-coach-o-1772618864352-df510387.png",              imageAlt: "James Murphy, Rugby Coach"},
             {
-              id: "2",
-              name: "Sarah O'Brien",
-              handle: "@sarahobrien22",
-              testimonial:
-                "As a player, I love seeing my detailed stats and how I've improved over the season. The physical metrics tracking helps me understand my performance at a deeper level.",
-              rating: 5,
+              id: "2",              name: "Sarah O'Brien",              handle: "@sarahobrien22",              testimonial:
+                "As a player, I love seeing my detailed stats and how I've improved over the season. The physical metrics tracking helps me understand my performance at a deeper level.",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-player--1772618862811-6dd7061f.png",
-              imageAlt: "Sarah O'Brien, Rugby Player",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-player--1772618862811-6dd7061f.png",              imageAlt: "Sarah O'Brien, Rugby Player"},
             {
-              id: "3",
-              name: "David Chen",
-              handle: "@d_analytics_pro",
-              testimonial:
-                "The analytics dashboard is incredibly comprehensive. Custom metrics, opponent analysis, and player comparisons give us the competitive edge we need.",
-              rating: 5,
+              id: "3",              name: "David Chen",              handle: "@d_analytics_pro",              testimonial:
+                "The analytics dashboard is incredibly comprehensive. Custom metrics, opponent analysis, and player comparisons give us the competitive edge we need.",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-business-portrait-of-a-spor-1772618864767-5d7f6743.png",
-              imageAlt: "David Chen, Sports Analyst",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-business-portrait-of-a-spor-1772618864767-5d7f6743.png",              imageAlt: "David Chen, Sports Analyst"},
             {
-              id: "4",
-              name: "Emma Thompson",
-              handle: "@emma_rugby_mgr",
-              testimonial:
-                "Managing multiple teams has never been easier. The platform scales beautifully from youth academy to senior squads. Highly recommended.",
-              rating: 5,
+              id: "4",              name: "Emma Thompson",              handle: "@emma_rugby_mgr",              testimonial:
+                "Managing multiple teams has never been easier. The platform scales beautifully from youth academy to senior squads. Highly recommended.",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-team-ma-1772618863474-375518ce.png",
-              imageAlt: "Emma Thompson, Rugby Team Manager",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/professional-headshot-of-a-rugby-team-ma-1772618863474-375518ce.png",              imageAlt: "Emma Thompson, Rugby Team Manager"},
+          ]}
+        />
+      </div>
+
+      <div id="faq" data-section="faq">
+        <FaqBase
+          title="Frequently Asked Questions"
+          description="Everything you need to know about RugbyStats."
+          textboxLayout="default"
+          useInvertedBackground={true}
+          faqsAnimation="slide-up"
+          faqs={[
+            {
+              id: "1",              title: "How do I track live match statistics?",              content: "Create a new match, select your players, and enter the Live Match page. Select a player from the carousel, expand the stat categories (Attack, Defence, Passing, General, Kicking), and click the +/- buttons to increment stats in real-time. Team stats and opposition scoring can be tracked separately."},
+            {
+              id: "2",              title: "What's the difference between Free and Pro plans?",              content: "Free plan allows up to 5 completed matches with basic tracking and simple stats. Pro plan (£6.99/year) offers unlimited matches, advanced analytics, AI coaching insights, physical metrics tracking, kick maps, radar charts, custom dashboards, data export, and priority support."},
+            {
+              id: "3",              title: "Can I track multiple teams?",              content: "Yes! Pro users can manage unlimited teams. Free users can still create teams but with a 5-match limit across all teams. Assign players to multiple teams, manage separate rosters, and track team-specific statistics."},
+            {
+              id: "4",              title: "How do I view player analytics?",              content: "Visit the Players page, select a player, and view their comprehensive profile including season/format filters, key stats, performance trends, physical metrics, recent matches, career statistics, and pass hand comparisons."},
+            {
+              id: "5",              title: "What is the AI Coach feature?",              content: "Pro feature that analyzes all your match and training data to provide strategic insights, training recommendations, player analysis, and custom coaching advice. Ask questions and get AI-generated tactical advice and training plans."},
+            {
+              id: "6",              title: "Can I export match data?",              content: "Yes, Pro users can export match data and create custom reports. This is perfect for sharing with team managers, creating presentations, or archiving season data."},
           ]}
         />
       </div>
@@ -268,9 +217,9 @@ export default function HomePage() {
           tag="Newsletter"
           title="Stay Ahead of the Game"
           description="Join rugby coaches and players using RugbyStats to elevate their performance. Get exclusive tips, feature updates, and rugby analytics insights delivered to your inbox."
-          tagIcon="Mail"
+          tagIcon={Mail}
           useInvertedBackground={false}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/a-motivational-rugby-team-in-action-on-t-1772618863681-9d195407.png?_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3ATZzAsZ9mBizbxvrS9QkadjUb4/a-motivational-rugby-team-in-action-on-t-1772618863681-9d195407.png"
           mediaPosition="right"
           mediaAnimation="slide-up"
           inputPlaceholder="Enter your email"