diff --git a/package-lock.json b/package-lock.json
index ef51b21a64..0ccbd9ba98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "omniroute",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omniroute",
-      "version": "3.4.8",
+      "version": "3.4.9",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index c54796d951..5bc5b88e48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omniroute",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "description": "Smart AI Router with auto fallback — route to FREE & cheap models, zero downtime. Works with Cursor, Cline, Claude Desktop, Codex, and any OpenAI-compatible tool.",
   "type": "module",
   "bin": {
diff --git a/src/app/(dashboard)/dashboard/auto-combo/page.tsx b/src/app/(dashboard)/dashboard/auto-combo/page.tsx
index a3d68325c6..022b9cd96a 100644
--- a/src/app/(dashboard)/dashboard/auto-combo/page.tsx
+++ b/src/app/(dashboard)/dashboard/auto-combo/page.tsx
@@ -7,6 +7,7 @@
 "use client";
 
 import { useEffect, useState, useCallback } from "react";
+import { Card } from "@/shared/components";
 
 interface ProviderScore {
   provider: string;
@@ -152,102 +153,183 @@ export default function AutoComboDashboard() {
   ];
 
   return (
-    <div className="p-6 max-w-7xl mx-auto">
-      <h1 className="text-2xl font-bold mb-6">⚡ Auto-Combo Engine</h1>
-
-      {/* Status Bar */}
-      <div className="flex gap-4 mb-6">
-        <div
-          className={`px-3 py-2 rounded-lg text-sm font-medium ${incidentMode ? "bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300" : "bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300"}`}
-        >
-          {incidentMode ? "🚨 INCIDENT MODE" : "✅ Normal"}
-        </div>
-        <div className="px-3 py-2 bg-blue-100 dark:bg-blue-900/30 rounded-lg text-sm">
-          Mode: <strong>{MODE_PACKS.find((m) => m.id === modePack)?.label || modePack}</strong>
-        </div>
-      </div>
-
-      {/* Mode Pack Selector */}
-      <div className="mb-8">
-        <h2 className="text-lg font-semibold mb-3">🎛️ Mode Pack</h2>
-        <div className="flex gap-2">
-          {MODE_PACKS.map((mp) => (
-            <button
-              key={mp.id}
-              onClick={() => setModePack(mp.id)}
-              className={`px-4 py-2 rounded-lg text-sm transition-colors ${
-                modePack === mp.id
-                  ? "bg-blue-600 text-white"
-                  : "bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700"
-              }`}
-            >
-              {mp.label}
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Provider Scores */}
-      <div className="mb-8">
-        <h2 className="text-lg font-semibold mb-3">📊 Provider Scores</h2>
-        {scores.length === 0 ? (
-          <p className="text-gray-500">
-            No auto-combo configured. Create one via <code>POST /api/combos/auto</code>.
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-semibold">⚡ Auto-Combo Engine</h1>
+          <p className="text-sm text-text-muted mt-1">
+            Smart routing automatically adapting to latency, health, and throughput
           </p>
-        ) : (
-          <div className="space-y-3">
-            {scores.map((s) => (
-              <div key={s.provider} className="p-3 bg-white dark:bg-gray-800 rounded-lg border">
-                <div className="flex justify-between items-center mb-2">
-                  <span className="font-medium">
-                    {s.provider} / {s.model}
-                  </span>
-                  <span className="font-bold text-lg">{(s.score * 100).toFixed(0)}%</span>
-                </div>
-                {/* Score Bar */}
-                <div className="h-2 bg-gray-200 dark:bg-gray-700 rounded overflow-hidden mb-2">
-                  <div
-                    className="h-full bg-blue-500 rounded"
-                    style={{ width: `${s.score * 100}%` }}
-                  />
-                </div>
-                {/* Factor Breakdown */}
-                <div className="grid grid-cols-3 gap-1 text-xs text-gray-500">
-                  {Object.entries(s.factors || {}).map(([key, val]) => (
-                    <span key={key}>
-                      {FACTOR_LABELS[key] || key}: {((val as number) * 100).toFixed(0)}%
-                    </span>
-                  ))}
-                </div>
-              </div>
-            ))}
-          </div>
-        )}
+        </div>
       </div>
 
-      {/* Exclusions */}
-      <div>
-        <h2 className="text-lg font-semibold mb-3">🚫 Excluded Providers</h2>
-        {exclusions.length === 0 ? (
-          <p className="text-gray-500">No providers currently excluded.</p>
-        ) : (
-          <div className="space-y-2">
-            {exclusions.map((e) => (
+      <Card>
+        <div className="flex flex-col md:flex-row gap-6">
+          <div className="flex-1">
+            <h2 className="text-lg font-semibold mb-4">Status Overview</h2>
+            <div className="flex flex-col gap-3">
               <div
-                key={e.provider}
-                className="p-3 bg-red-50 dark:bg-red-900/10 rounded border border-red-200 dark:border-red-800"
+                className={`p-4 rounded-lg border flex items-center justify-between ${
+                  incidentMode
+                    ? "bg-red-500/10 border-red-500/30 text-red-700 dark:text-red-300"
+                    : "bg-green-500/10 border-green-500/30 text-green-700 dark:text-green-300"
+                }`}
               >
-                <div className="flex justify-between">
-                  <span className="font-medium text-red-700 dark:text-red-400">{e.provider}</span>
-                  <span className="text-xs text-gray-500">
-                    Cooldown: {Math.round(e.cooldownMs / 60000)}min
+                <div className="flex items-center gap-3">
+                  <span className="material-symbols-outlined text-[24px]">
+                    {incidentMode ? "warning" : "check_circle"}
                   </span>
+                  <div>
+                    <h3 className="font-semibold">
+                      {incidentMode ? "Incident Mode" : "Normal Operation"}
+                    </h3>
+                    <p className="text-sm opacity-80">
+                      {incidentMode
+                        ? "High circuit breaker trip rate detected"
+                        : "All providers reporting healthy metrics"}
+                    </p>
+                  </div>
                 </div>
-                <p className="text-xs text-gray-500 mt-1">{e.reason}</p>
               </div>
-            ))}
+
+              <div className="p-4 rounded-lg border border-border/50 bg-surface/30 flex items-center justify-between">
+                <div className="flex items-center gap-3">
+                  <span className="material-symbols-outlined text-[24px] text-blue-500">tune</span>
+                  <div>
+                    <h3 className="font-semibold">Active Mode Pack</h3>
+                    <p className="text-sm text-text-muted">
+                      {MODE_PACKS.find((m) => m.id === modePack)?.label || modePack}
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
-        )}
+
+          <div className="flex-1">
+            <h2 className="text-lg font-semibold mb-4">Mode Pack</h2>
+            <div className="grid grid-cols-2 gap-2">
+              {MODE_PACKS.map((mp) => (
+                <button
+                  key={mp.id}
+                  onClick={() => setModePack(mp.id)}
+                  className={`flex flex-col items-start p-3 rounded-lg border transition-all ${
+                    modePack === mp.id
+                      ? "border-blue-500/50 bg-blue-500/5 ring-1 ring-blue-500/20"
+                      : "border-border/50 hover:border-border hover:bg-surface/30"
+                  }`}
+                >
+                  <span className={`font-medium ${modePack === mp.id ? "text-blue-500" : ""}`}>
+                    {mp.label}
+                  </span>
+                </button>
+              ))}
+            </div>
+          </div>
+        </div>
+      </Card>
+
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+        <Card>
+          <div className="flex items-center gap-3 mb-4">
+            <div className="p-2 rounded-lg bg-blue-500/10 text-blue-500">
+              <span className="material-symbols-outlined text-[20px]" aria-hidden="true">
+                leaderboard
+              </span>
+            </div>
+            <h3 className="text-lg font-semibold">Provider Scores</h3>
+          </div>
+
+          {scores.length === 0 ? (
+            <p className="text-sm text-text-muted py-4">
+              No auto-combo configured or data loading... Create one via{" "}
+              <code>POST /api/combos/auto</code>.
+            </p>
+          ) : (
+            <div className="space-y-3">
+              {scores.map((s) => (
+                <div
+                  key={s.provider}
+                  className="p-3 bg-surface/30 rounded-lg border border-border/50"
+                >
+                  <div className="flex justify-between items-center mb-2">
+                    <span className="font-medium text-sm">
+                      {s.provider} / {s.model}
+                    </span>
+                    <span className="font-bold text-lg text-blue-500">
+                      {(s.score * 100).toFixed(0)}%
+                    </span>
+                  </div>
+                  {/* Score Bar */}
+                  <div className="h-1.5 bg-border/50 rounded-full overflow-hidden mb-3">
+                    <div
+                      className="h-full bg-blue-500 rounded-full transition-all duration-1000"
+                      style={{ width: `${s.score * 100}%` }}
+                    />
+                  </div>
+                  {/* Factor Breakdown */}
+                  <div className="flex flex-wrap gap-2 text-[11px] text-text-muted">
+                    {Object.entries(s.factors || {}).map(([key, val]) => (
+                      <div
+                        key={key}
+                        className="px-2 py-0.5 rounded-full bg-black/5 dark:bg-white/5 border border-border/30"
+                      >
+                        {FACTOR_LABELS[key] || key}:{" "}
+                        <span className="font-medium text-text-main">
+                          {((val as number) * 100).toFixed(0)}%
+                        </span>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </Card>
+
+        <Card>
+          <div className="flex items-center gap-3 mb-4">
+            <div className="p-2 rounded-lg bg-red-500/10 text-red-500">
+              <span className="material-symbols-outlined text-[20px]" aria-hidden="true">
+                block
+              </span>
+            </div>
+            <h3 className="text-lg font-semibold">Excluded Providers</h3>
+          </div>
+
+          {exclusions.length === 0 ? (
+            <div className="flex flex-col items-center justify-center py-8 text-text-muted">
+              <span className="material-symbols-outlined text-[32px] mb-2 text-border">
+                verified
+              </span>
+              <p className="text-sm">No providers currently excluded.</p>
+            </div>
+          ) : (
+            <div className="space-y-2">
+              {exclusions.map((e) => (
+                <div
+                  key={e.provider}
+                  className="p-3 bg-red-500/5 rounded-lg border border-red-500/20"
+                >
+                  <div className="flex justify-between items-center">
+                    <div className="flex items-center gap-2">
+                      <span className="font-medium text-red-600 dark:text-red-400">
+                        {e.provider}
+                      </span>
+                    </div>
+                    <span className="text-xs px-2 py-0.5 rounded bg-red-500/10 text-red-600 dark:text-red-400 font-medium">
+                      Cooldown: {Math.round(e.cooldownMs / 60000)}m
+                    </span>
+                  </div>
+                  <p className="text-xs text-text-muted mt-1.5 flex items-center gap-1">
+                    <span className="material-symbols-outlined text-[12px]">info</span>
+                    {e.reason}
+                  </p>
+                </div>
+              ))}
+            </div>
+          )}
+        </Card>
       </div>
     </div>
   );
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 9fd535b5d6..9bb077bb2f 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -1800,6 +1800,25 @@
     "enablePassword": "Enable Password",
     "darkMode": "Dark Mode",
     "lightMode": "Light Mode",
+    "memoryTitle": "Memory",
+    "memoryDesc": "Persistent cross-session conversational memory",
+    "memoryEnabled": "Enable Memory",
+    "memoryEnabledDesc": "When enabled, OmniRoute will inject relevant past context.",
+    "maxTokens": "Max Tokens",
+    "retentionDays": "Retention",
+    "recent": "Recent",
+    "recentDesc": "Chronological window",
+    "semantic": "Semantic",
+    "semanticDesc": "Vector search",
+    "hybrid": "Hybrid",
+    "hybridDesc": "Recent + Semantic",
+    "skillsTitle": "Skills",
+    "skillsDesc": "Tools for models",
+    "skillsEnabled": "Enable Skills",
+    "skillsEnabledDesc": "Allows agents to trigger functions.",
+    "skillsComingSoon": "Skills marketplace coming soon.",
+    "memorySkillsTitle": "Memory & Skills",
+    "memorySkillsDesc": "Persistent context & capabilities",
     "systemTheme": "System Theme",
     "debugToggle": "Enable Debug Mode",
     "sidebarVisibilityToggle": "Show Sidebar Items",
diff --git a/src/shared/constants/routingStrategies.ts b/src/shared/constants/routingStrategies.ts
index 18d6529db7..988beb9820 100644
--- a/src/shared/constants/routingStrategies.ts
+++ b/src/shared/constants/routingStrategies.ts
@@ -84,6 +84,8 @@ export const ROUTING_STRATEGIES: RoutingStrategyOption[] = [
 ];
 
 export const SETTINGS_FALLBACK_STRATEGY_VALUES: RoutingStrategyValue[] = [
+  "priority",
+  "weighted",
   "fill-first",
   "round-robin",
   "p2c",