diff --git a/src/app/page.tsx b/src/app/page.tsx
index 33cd8fd..5d7010f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,13 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FaqDouble from '@/components/sections/faq/FaqDouble';
-import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import FeatureCardTwentyOne from '@/components/sections/feature/FeatureCardTwentyOne';
-import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import HeroLogo from '@/components/sections/hero/HeroLogo';
-import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import HeroLogo from '@/components/sections/hero/HeroLogo';
+import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import { Shield, Upload, Zap } from "lucide-react";
 
 export default function LandingPage() {
@@ -17,192 +14,59 @@ export default function LandingPage() {
         defaultButtonVariant="expand-hover"
         defaultTextAnimation="reveal-blur"
         borderRadius="pill"
+        contentWidth="medium"
+        sizing="medium"
+        background="circleGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="gradient"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
-      navItems={[
-        {
-          name: "Dashboard / לוח בקרה",
-          id: "dashboard",
-        },
-        {
-          name: "Compare / השוואה",
-          id: "compare",
-        },
-      ]}
-      brandName="GradesDashboard"
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Dashboard / לוח בקרה", id: "dashboard" },
+              { name: "Compare / השוואה", id: "compare" },
+            ]}
+            brandName="GradesDashboard"
+          />
+        </div>
 
-  <div id="hero" data-section="hero">
-      <HeroLogo
-      logoText="Academic Tracker / מעקב אקדמי"
-      description="The ultimate tool for tracking your grades. Drag, drop, and analyze. / הכלי המושלם למעקב אחר ציונים. גררו, שחררו ונתחו."
-      buttons={[
-        {
-          text: "Upload / העלאה",
-          href: "#upload",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg?_wi=1"
-      imageAlt="Dashboard preview"
-    />
-  </div>
+        <div id="hero" data-section="hero">
+          <HeroLogo
+            logoText="Academic Tracker / מעקב אקדמי"
+            description="The ultimate tool for tracking your grades. Drag, drop, and analyze. / הכלי המושלם למעקב אחר ציונים. גררו, שחררו ונתחו."
+            buttons={[{ text: "Upload / העלאה", href: "#upload" }]}
+            imageSrc="http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg"
+            imageAlt="Dashboard preview"
+          />
+        </div>
 
-  <div id="upload" data-section="upload">
-      <FeatureBorderGlow
-      animationType="slide-up"
-      textboxLayout="split"
-      useInvertedBackground={false}
-      features={[
-        {
-          icon: Upload,
-          title: "Drag & Drop",
-          description: "Drop your files into the zone for instant parsing.",
-        },
-        {
-          icon: Shield,
-          title: "Secure Local Storage",
-          description: "Files never leave your browser, encrypted and stored locally.",
-        },
-        {
-          icon: Zap,
-          title: "Live Analysis",
-          description: "Calculations update instantly as you change parameters.",
-        },
-      ]}
-      title="Data Ingestion / קליטת נתונים"
-      description="Upload your XLSX files directly. Our engine parses them instantly. / העלו את קבצי ה-XLSX שלכם. המנוע שלנו ינתח אותם באופן מיידי."
-    />
-  </div>
+        <div id="upload" data-section="upload">
+          <FeatureBorderGlow
+            animationType="slide-up"
+            textboxLayout="split"
+            useInvertedBackground={false}
+            features={[
+              { icon: Upload, title: "Drag & Drop", description: "Drop your files into the zone for instant parsing." },
+              { icon: Shield, title: "Secure Local Storage", description: "Files never leave your browser, encrypted and stored locally." },
+              { icon: Zap, title: "Live Analysis", description: "Calculations update instantly as you change parameters." },
+            ]}
+            title="Data Ingestion / קליטת נתונים"
+            description="Upload your XLSX files directly. Our engine parses them instantly. / העלו את קבצי ה-XLSX שלכם. המנוע שלנו ינתח אותם באופן מיידי."
+          />
+        </div>
 
-  <div id="faq" data-section="faq">
-      <FaqDouble
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Frequently Asked Questions"
-      description="Get answers to common questions about using our dashboard tools."
-      faqsAnimation="slide-up"
-      faqs={[
-        {
-          id: "1",
-          title: "Is my data safe?",
-          content: "Yes, all processing is performed locally in your browser. Your data is never uploaded to any server.",
-        },
-        {
-          id: "2",
-          title: "Which file formats are supported?",
-          content: "We currently support XLSX and CSV file formats for quick grade analysis.",
-        },
-        {
-          id: "3",
-          title: "Do I need an account?",
-          content: "No, this is a privacy-first tool designed to run completely without account registration.",
-        },
-        {
-          id: "4",
-          title: "Can I compare multiple semesters?",
-          content: "Yes, use the comparison tool to import multiple files and analyze trends across semesters.",
-        },
-        {
-          id: "5",
-          title: "Is this service free?",
-          content: "Yes, the dashboard is open-source and free to use for all students.",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="metric" data-section="metric">
-      <MetricCardEleven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Performance Analytics"
-      description="Track your progress with real-time academic insights."
-      metrics={[
-        {
-          id: "1",
-          value: "98%",
-          title: "Average Grade",
-          description: "Your current weighted average across all subjects.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg?_wi=2",
-        },
-        {
-          id: "2",
-          value: "42",
-          title: "Credits Completed",
-          description: "Total academic credits earned toward your degree.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg?_wi=3",
-        },
-        {
-          id: "3",
-          value: "12",
-          title: "Active Courses",
-          description: "Number of classes currently being tracked.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg?_wi=4",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="feature" data-section="feature">
-      <FeatureCardTwentyOne
-      useInvertedBackground={false}
-      title="Advanced Analytical Engine"
-      description="Unlock powerful features designed to help you excel academically."
-      imageSrc="http://img.b2bpic.net/free-photo/woman-typing-laptop-sitting-home-with-automation-lighting-system_482257-8729.jpg?_wi=5"
-      mediaAnimation="fade-in"
-      accordionItems={[
-        {
-          id: "1",
-          title: "GPA Projection",
-          content: "Simulate future grade outcomes to see how they impact your cumulative GPA.",
-        },
-        {
-          id: "2",
-          title: "Trend Visualization",
-          content: "View dynamic charts representing your grade trajectory over time.",
-        },
-        {
-          id: "3",
-          title: "Export Reports",
-          content: "Generate clean, printable PDF reports of your performance data.",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterBaseCard
-      logoText="Grades Dashboard"
-      columns={[
-        {
-          title: "Tools / כלים",
-          items: [
-            {
-              label: "Compare / השוואה",
-              href: "#compare",
-            },
-            {
-              label: "Settings / הגדרות",
-              href: "#",
-            },
-          ],
-        },
-        {
-          title: "Legal / משפטי",
-          items: [
-            {
-              label: "Privacy / פרטיות",
-              href: "#",
-            },
-          ],
-        },
-      ]}
-    />
-  </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseCard
+            logoText="Grades Dashboard"
+            columns={[
+              { title: "Tools / כלים", items: [{ label: "Compare / השוואה", href: "#compare" }, { label: "Settings / הגדרות", href: "#" }] },
+              { title: "Legal / משפטי", items: [{ label: "Privacy / פרטיות", href: "#" }] },
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );