diff --git a/src/app/admin/analytics/page.tsx b/src/app/admin/analytics/page.tsx
deleted file mode 100644
index 28ae351..0000000
--- a/src/app/admin/analytics/page.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import {
-  getAnalyticsByYear,
-  getMonthlyCollected,
-  getAvailableYears,
-  getTimeByClient,
-  getTotalTrackedHours,
-} from "@/lib/analytics-queries";
-import { YearSelector, MonthlyChart } from "@/components/admin/YearSelector";
-
-export const revalidate = 0;
-
-function fmtEur(n: number) {
-  return n.toLocaleString("it-IT", { style: "currency", currency: "EUR", minimumFractionDigits: 2 });
-}
-
-function fmtSeconds(s: number): string {
-  const h = Math.floor(s / 3600);
-  const m = Math.floor((s % 3600) / 60);
-  if (h > 0) return `${h}h ${m}m`;
-  return `${m}m`;
-}
-
-function MetricCard({
-  label, value, sub, accent,
-}: {
-  label: string; value: string; sub?: string; accent?: boolean;
-}) {
-  return (
-    <div className={`rounded-xl border p-5 ${accent ? "bg-[#1A463C] border-[#1A463C] text-white" : "bg-white border-[#e5e7eb]"}`}>
-      <p className={`text-xs font-bold uppercase tracking-wider mb-2 ${accent ? "text-white/60" : "text-[#71717a]"}`}>
-        {label}
-      </p>
-      <p className={`text-2xl font-bold tracking-tight ${accent ? "text-white" : "text-[#1a1a1a]"}`}>
-        {value}
-      </p>
-      {sub && (
-        <p className={`text-xs mt-1 ${accent ? "text-white/60" : "text-[#71717a]"}`}>{sub}</p>
-      )}
-    </div>
-  );
-}
-
-export default async function AnalyticsPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ year?: string }>;
-}) {
-  const { year: yearParam } = await searchParams;
-  const year = parseInt(yearParam ?? "") || new Date().getFullYear();
-
-  const [data, monthly, availableYears, timeByClient, totalHours] = await Promise.all([
-    getAnalyticsByYear(year),
-    getMonthlyCollected(year),
-    getAvailableYears(),
-    getTimeByClient(year),
-    getTotalTrackedHours(year),
-  ]);
-
-  const collectedPct =
-    data.contracted > 0 ? Math.round((data.collected / data.contracted) * 100) : 0;
-
-  const maxClientSeconds = timeByClient[0]?.totalSeconds ?? 1;
-
-  return (
-    <div className="space-y-10">
-      {/* Header */}
-      <div className="flex items-center justify-between">
-        <div>
-          <h1 className="text-2xl font-bold text-[#1a1a1a]">Statistiche</h1>
-          <p className="text-sm text-[#71717a] mt-0.5">Panoramica per anno</p>
-        </div>
-        <YearSelector currentYear={year} availableYears={availableYears} />
-      </div>
-
-      {/* ── SEZIONE ECONOMICA ── */}
-      <div className="space-y-4">
-        <h2 className="text-sm font-bold text-[#71717a] uppercase tracking-wider">Fatturato</h2>
-
-        <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
-          <MetricCard
-            label="Contrattualizzato"
-            value={fmtEur(data.contracted)}
-            sub={`${data.clientsAcquired} client${data.clientsAcquired === 1 ? "e" : "i"}`}
-            accent
-          />
-          <MetricCard
-            label="Incassato"
-            value={fmtEur(data.collected)}
-            sub={`${collectedPct}% del contrattualizzato`}
-          />
-          <MetricCard
-            label="Da incassare"
-            value={fmtEur(data.pending)}
-            sub="Tutti gli anni"
-          />
-          <MetricCard
-            label="Clienti acquisiti"
-            value={String(data.clientsAcquired)}
-            sub={`Anno ${year}`}
-          />
-        </div>
-
-        <MonthlyChart data={monthly} year={year} />
-
-        {data.contracted === 0 && (
-          <p className="text-sm text-[#71717a] italic text-center py-2">
-            Nessun cliente registrato nel {year}.
-          </p>
-        )}
-      </div>
-
-      {/* ── SEZIONE TIME TRACKING ── */}
-      <div className="space-y-4">
-        <h2 className="text-sm font-bold text-[#71717a] uppercase tracking-wider">
-          Tempo tracciato
-        </h2>
-
-        <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
-          <MetricCard
-            label="Ore totali"
-            value={`${totalHours}h`}
-            sub={`Anno ${year}`}
-            accent
-          />
-        </div>
-
-        {timeByClient.length === 0 ? (
-          <div className="bg-white rounded-xl border border-[#e5e7eb] p-8 text-center">
-            <p className="text-sm text-[#71717a] italic">
-              Nessuna sessione registrata nel {year}.
-              Usa il timer ▶ nella lista clienti per iniziare.
-            </p>
-          </div>
-        ) : (
-          <div className="bg-white rounded-xl border border-[#e5e7eb] p-6 space-y-4">
-            <h3 className="text-sm font-bold text-[#1a1a1a]">Ore per cliente — {year}</h3>
-            <div className="space-y-3">
-              {timeByClient.map((row) => {
-                const pct = Math.round((row.totalSeconds / maxClientSeconds) * 100);
-                return (
-                  <div key={row.clientId}>
-                    <div className="flex items-center justify-between mb-1">
-                      <span className="text-sm font-medium text-[#1a1a1a]">{row.clientName}</span>
-                      <span className="text-sm tabular-nums text-[#71717a]">
-                        {fmtSeconds(row.totalSeconds)}
-                      </span>
-                    </div>
-                    <div className="h-2 rounded-full bg-[#f4f4f5] overflow-hidden">
-                      <div
-                        className="h-full rounded-full bg-[#1A463C] transition-all"
-                        style={{ width: `${pct}%` }}
-                      />
-                    </div>
-                  </div>
-                );
-              })}
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
index 93db251..dfe4b41 100644
--- a/src/app/admin/page.tsx
+++ b/src/app/admin/page.tsx
@@ -1,6 +1,14 @@
 import { Suspense } from "react";
 import { getDashboardStats } from "@/lib/dashboard-queries";
 import { FollowUpWidget } from "@/components/admin/dashboard/FollowUpWidget";
+import {
+  getAnalyticsByYear,
+  getMonthlyCollected,
+  getAvailableYears,
+  getTimeByClient,
+  getTotalTrackedHours,
+} from "@/lib/analytics-queries";
+import { YearSelector, MonthlyChart } from "@/components/admin/YearSelector";
 import { Users, FolderOpen, Euro, Clock } from "lucide-react";
 
 export const revalidate = 0;
@@ -32,6 +40,44 @@ function KpiCard({
   );
 }
 
+function MetricCard({
+  label,
+  value,
+  sub,
+  accent,
+}: {
+  label: string;
+  value: string;
+  sub?: string;
+  accent?: boolean;
+}) {
+  return (
+    <div
+      className={`rounded-xl border p-5 ${
+        accent ? "bg-[#1A463C] border-[#1A463C] text-white" : "bg-white border-[#e5e7eb]"
+      }`}
+    >
+      <p
+        className={`text-xs font-bold uppercase tracking-wider mb-2 ${
+          accent ? "text-white/60" : "text-[#71717a]"
+        }`}
+      >
+        {label}
+      </p>
+      <p
+        className={`text-2xl font-bold tracking-tight ${
+          accent ? "text-white" : "text-[#1a1a1a]"
+        }`}
+      >
+        {value}
+      </p>
+      {sub && (
+        <p className={`text-xs mt-1 ${accent ? "text-white/60" : "text-[#71717a]"}`}>{sub}</p>
+      )}
+    </div>
+  );
+}
+
 const ACTIVITY_ICONS: Record<string, string> = {
   nuovo_cliente: "👤",
   nuovo_progetto: "📁",
@@ -48,15 +94,44 @@ function fmt(ts: Date) {
   }).format(new Date(ts));
 }
 
-function fmtEur(val: string) {
-  return new Intl.NumberFormat("it-IT", { style: "currency", currency: "EUR" }).format(
-    parseFloat(val) || 0
-  );
+function fmtEur(n: number) {
+  return n.toLocaleString("it-IT", {
+    style: "currency",
+    currency: "EUR",
+    minimumFractionDigits: 2,
+  });
 }
 
-export default async function AdminDashboard() {
+function fmtSeconds(s: number): string {
+  const h = Math.floor(s / 3600);
+  const m = Math.floor((s % 3600) / 60);
+  if (h > 0) return `${h}h ${m}m`;
+  return `${m}m`;
+}
+
+export default async function AdminDashboard({
+  searchParams,
+}: {
+  searchParams: Promise<{ year?: string }>;
+}) {
+  const { year: yearParam } = await searchParams;
+  const year = parseInt(yearParam ?? "") || new Date().getFullYear();
+
   const { kpi, activity } = await getDashboardStats();
 
+  const [data, monthly, availableYears, timeByClient, totalHours] = await Promise.all([
+    getAnalyticsByYear(year),
+    getMonthlyCollected(year),
+    getAvailableYears(),
+    getTimeByClient(year),
+    getTotalTrackedHours(year),
+  ]);
+
+  const collectedPct =
+    data.contracted > 0 ? Math.round((data.collected / data.contracted) * 100) : 0;
+
+  const maxClientSeconds = timeByClient[0]?.totalSeconds ?? 1;
+
   return (
     <div className="max-w-5xl">
       <h1 className="text-2xl font-bold text-gray-900 mb-6">Dashboard</h1>
@@ -78,7 +153,7 @@ export default async function AdminDashboard() {
         />
         <KpiCard
           label="Revenue totale"
-          value={fmtEur(kpi.revenueTotale)}
+          value={fmtEur(parseFloat(kpi.revenueTotale))}
           sub="progetti non archiviati"
           icon={Euro}
           color="bg-emerald-600"
@@ -91,7 +166,7 @@ export default async function AdminDashboard() {
         />
         <KpiCard
           label="Pagamenti in sospeso"
-          value={fmtEur(kpi.pagamentiInSospeso)}
+          value={fmtEur(parseFloat(kpi.pagamentiInSospeso))}
           sub="da_saldare + inviata"
           icon={Clock}
           color="bg-amber-500"
@@ -122,6 +197,97 @@ export default async function AdminDashboard() {
           </ul>
         )}
       </div>
+
+      {/* ── SEZIONE STATISTICHE ANNUALI ── */}
+      <div className="mt-10 space-y-10">
+        <div className="flex items-center justify-between">
+          <div>
+            <h2 className="text-xl font-bold text-gray-900">Statistiche</h2>
+            <p className="text-sm text-gray-400 mt-0.5">Panoramica per anno</p>
+          </div>
+          <YearSelector currentYear={year} availableYears={availableYears} />
+        </div>
+
+        {/* Sezione economica */}
+        <div className="space-y-4">
+          <h3 className="text-sm font-bold text-[#71717a] uppercase tracking-wider">Fatturato</h3>
+          <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
+            <MetricCard
+              label="Contrattualizzato"
+              value={fmtEur(data.contracted)}
+              sub={`${data.clientsAcquired} client${data.clientsAcquired === 1 ? "e" : "i"}`}
+              accent
+            />
+            <MetricCard
+              label="Incassato"
+              value={fmtEur(data.collected)}
+              sub={`${collectedPct}% del contrattualizzato`}
+            />
+            <MetricCard
+              label="Da incassare"
+              value={fmtEur(data.pending)}
+              sub="Tutti gli anni"
+            />
+            <MetricCard
+              label="Clienti acquisiti"
+              value={String(data.clientsAcquired)}
+              sub={`Anno ${year}`}
+            />
+          </div>
+          <MonthlyChart data={monthly} year={year} />
+          {data.contracted === 0 && (
+            <p className="text-sm text-[#71717a] italic text-center py-2">
+              Nessun cliente registrato nel {year}.
+            </p>
+          )}
+        </div>
+
+        {/* Sezione time tracking */}
+        <div className="space-y-4">
+          <h3 className="text-sm font-bold text-[#71717a] uppercase tracking-wider">
+            Tempo tracciato
+          </h3>
+          <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
+            <MetricCard label="Ore totali" value={`${totalHours}h`} sub={`Anno ${year}`} accent />
+          </div>
+
+          {timeByClient.length === 0 ? (
+            <div className="bg-white rounded-xl border border-[#e5e7eb] p-8 text-center">
+              <p className="text-sm text-[#71717a] italic">
+                Nessuna sessione registrata nel {year}. Usa il timer &#9654; nella lista clienti per
+                iniziare.
+              </p>
+            </div>
+          ) : (
+            <div className="bg-white rounded-xl border border-[#e5e7eb] p-6 space-y-4">
+              <h3 className="text-sm font-bold text-[#1a1a1a]">Ore per cliente — {year}</h3>
+              <div className="space-y-3">
+                {timeByClient.map((row) => {
+                  const pct = Math.round((row.totalSeconds / maxClientSeconds) * 100);
+                  return (
+                    <div key={row.clientId}>
+                      <div className="flex items-center justify-between mb-1">
+                        <span className="text-sm font-medium text-[#1a1a1a]">
+                          {row.clientName}
+                        </span>
+                        <span className="text-sm tabular-nums text-[#71717a]">
+                          {fmtSeconds(row.totalSeconds)}
+                        </span>
+                      </div>
+                      <div className="h-2 rounded-full bg-[#f4f4f5] overflow-hidden">
+                        <div
+                          className="h-full rounded-full bg-[#1A463C] transition-all"
+                          style={{ width: `${pct}%` }}
+                        />
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/src/components/admin/YearSelector.tsx b/src/components/admin/YearSelector.tsx
index fad3c66..82bd276 100644
--- a/src/components/admin/YearSelector.tsx
+++ b/src/components/admin/YearSelector.tsx
@@ -15,7 +15,7 @@ export function YearSelector({
   const thisYear = new Date().getFullYear();
 
   function go(y: number) {
-    router.push(`/admin/analytics?year=${y}`);
+    router.push(`/admin?year=${y}`);
   }
 
   return (