diff --git a/package-lock.json b/package-lock.json
index 2c81d8f0..24b67cf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,13 +24,13 @@
         "idb-keyval": "^6.2.4",
         "jspdf": "^4.2.1",
         "jspdf-autotable": "^5.0.7",
-        "lucide-react": "^0.475.0",
         "next": "^14.2.35",
         "next-auth": "^4.24.14",
         "next-pwa": "^5.6.0",
         "react": "^18",
         "react-dom": "^18",
         "react-markdown": "^10.1.0",
+         "lucide-react": "^1.17.0",
         "recharts": "^2.12.7",
         "rehype-sanitize": "^6.0.0",
         "server-only": "^0.0.1",
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 52816e5a..da8cecc9 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -138,8 +138,48 @@ export default async function DashboardPage() {
           <div className="w-full sm:w-auto">
             <ExportButton />
           </div>
-        </div>
 
+          <div className="mt-6">
+            <CodingActivityInsightsCard />
+          </div>
+
+          <div className="mt-6">
+            <PRReviewTrendChart />
+          </div>
+
+          <div
+            id="issues"
+            className="mt-6 grid grid-cols-1 lg:grid-cols-3 gap-6"
+          >
+            <div className="lg:col-span-2">
+              <IssueMetrics />
+            </div>
+            <CIAnalytics />
+          </div>
+
+          {/* Row 3b: Discussion activity */}
+          <div className="mt-6">
+            <DiscussionsWidget />
+          </div>
+          <div className="mt-6">
+            <PinnedRepos />
+          </div>
+
+          <div className="mt-6">
+            <InactiveRepositoriesCard />
+          </div>
+          <div
+            id="top-repos"
+            className="mt-6 grid grid-cols-1 lg:grid-cols-3 gap-6"
+          >
+            <TopRepos />
+            <LanguageBreakdown />
+            <GoalTracker />
+          </div>
+          <div id="recent-activity" className="mt-6">
+            <RecentActivity />
+          </div>
+        </div>
         <div className="space-y-4">
           <StreakAtRiskBanner />
         </div>
diff --git a/src/components/DashboardSidebar.tsx b/src/components/DashboardSidebar.tsx
new file mode 100644
index 00000000..7edab85c
--- /dev/null
+++ b/src/components/DashboardSidebar.tsx
@@ -0,0 +1,122 @@
+"use client";
+import { useEffect, useState } from "react";
+import {
+  Menu,
+  X,
+  Flame,
+  GitPullRequest,
+  Target,
+  AlertCircle,
+  BarChart2,
+  GitCommit,
+  CalendarDays,
+  Bot,
+  Trophy,
+} from "lucide-react";
+
+const sections = [
+  { id: "weekly-summary", label: "Weekly Summary", icon: CalendarDays },
+  { id: "personal-records", label: "Personal Records", icon: Trophy },
+  { id: "contribution", label: "Contributions", icon: GitCommit },
+  { id: "pr-analytics", label: "PR Analytics", icon: GitPullRequest },
+  { id: "top-repos", label: "Top Repos & Goals", icon: Target },
+  { id: "recent-activity", label: "Recent Activity", icon: BarChart2 },
+];
+
+export default function DashboardSidebar() {
+  const [activeId, setActiveId] = useState<string>("");
+  const [mobileOpen, setMobileOpen] = useState(false);
+
+  useEffect(() => {
+    const observers: IntersectionObserver[] = [];
+
+    sections.forEach(({ id }) => {
+      const el = document.getElementById(id);
+      if (!el) return;
+
+      const observer = new IntersectionObserver(
+        ([entry]) => {
+          if (entry.isIntersecting) setActiveId(id);
+        },
+        { threshold: 0.3 }
+      );
+
+      observer.observe(el);
+      observers.push(observer);
+    });
+
+    return () => observers.forEach((o) => o.disconnect());
+  }, []);
+
+  const handleNavClick = () => {
+    setMobileOpen(false);
+  };
+
+  return (
+    <>
+      <aside className="hidden lg:flex flex-col sticky top-8 ml-5 rounded-xl h-full gap-1 bg-[var(--control)] border-r border-[var(--border)] p-3 min-w-[48px] xl:min-w-[200px]">
+        <div
+          className="text-lg flex items-center font-bold text-[var(--foreground)] mb-4 px-3">
+          Devtrack
+        </div>
+        {sections.map(({ id, label, icon: Icon }) => (
+          <a
+            key={id}
+            href={`#${id}`}
+            title={label}
+            className={`flex items-center gap-2 px-3 py-2 rounded-lg text-sm transition-all hover:bg-[var(--background)] ${
+              activeId === id
+                ? "bg-[var(--background)] text-[var(--foreground)] font-semibold"
+                : "text-[var(--foreground)] opacity-60"
+            }`}
+          >
+            <Icon size={18} />
+            <span className="hidden xl:inline">{label}</span>
+          </a>
+        ))}
+      </aside>
+      <button
+        onClick={() => setMobileOpen(true)}
+        className="lg:hidden fixed top-4 left-4 z-50 p-2 rounded-lg bg-[var(--control)]/80 backdrop-blur-sm border border-[var(--border)] shadow-md"
+      >
+        <Menu size={20} />
+      </button>
+      {mobileOpen && (
+        <div
+          className="lg:hidden fixed inset-0 z-40 bg-black/40 backdrop-blur-sm"
+          onClick={() => setMobileOpen(false)}
+        />
+      )}
+      <div
+        className={`lg:hidden fixed top-0 left-0 h-full z-50 w-64 bg-[var(--control)]/90 backdrop-blur-md border-r border-[var(--border)] p-4 shadow-xl transition-transform duration-300 ${
+          mobileOpen ? "translate-x-0" : "-translate-x-full"
+        }`}
+      >
+        <div className="flex justify-between items-center mb-4">
+          <span className="text-sm font-semibold text-[var(--foreground)]">
+            Navigate
+          </span>
+          <button onClick={() => setMobileOpen(false)}>
+            <X size={20} />
+          </button>
+        </div>
+
+        {sections.map(({ id, label, icon: Icon }) => (
+          <a
+            key={id}
+            href={`#${id}`}
+            onClick={handleNavClick}
+            className={`flex items-center gap-3 px-3 py-2 rounded-lg text-sm transition-all hover:bg-[var(--background)] mb-1 ${
+              activeId === id
+                ? "bg-[var(--background)] text-[var(--foreground)] font-semibold"
+                : "text-[var(--foreground)] opacity-60"
+            }`}
+          >
+            <Icon size={18} />
+            <span>{label}</span>
+          </a>
+        ))}
+      </div>
+    </>
+  );
+}
\ No newline at end of file