diff --git a/frontend/src/components/FilterComponents.tsx b/frontend/src/components/FilterComponents.tsx
new file mode 100644
index 0000000..c38c07b
--- /dev/null
+++ b/frontend/src/components/FilterComponents.tsx
@@ -0,0 +1,91 @@
+import { useScannerStore } from '../store/scannerStore';
+import type { StockUniverse } from '../services/stockApi';
+
+function UniverseSelect() {
+  const { selectedUniverse, availableUniverses, setSelectedUniverse } = useScannerStore();
+  
+  return (
+    <div>
+      <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
+        Universe
+      </label>
+      <select
+        value={selectedUniverse}
+        onChange={(e) => setSelectedUniverse(e.target.value)}
+        className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
+        style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
+      >
+        {availableUniverses.map((universe: StockUniverse) => (
+          <option key={universe.id} value={universe.name}>
+            {universe.name} ({universe.symbols.length})
+          </option>
+        ))}
+      </select>
+    </div>
+  );
+}
+
+function FilterInput({ label, value, onChange, min = 0, step = 0.5, max }: {
+  label: string;
+  value: number;
+  onChange: (value: number) => void;
+  min?: number;
+  max?: number;
+  step?: number;
+}) {
+  return (
+    <div>
+      <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
+        {label}
+      </label>
+      <input
+        type="number"
+        value={value}
+        onChange={(e) => onChange(Number(e.target.value))}
+        className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
+        style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
+        min={min}
+        max={max}
+        step={step}
+      />
+    </div>
+  );
+}
+
+function FilterInputs() {
+  const { filters, updateFilters } = useScannerStore();
+  
+  return (
+    <>
+      <FilterInput
+        label="Min Price ($)"
+        value={filters.minPrice}
+        onChange={(v) => updateFilters({ minPrice: v })}
+        step={0.5}
+      />
+      <FilterInput
+        label="Min Volume ($M)"
+        value={filters.minVolumeDollars / 1000000}
+        onChange={(v) => updateFilters({ minVolumeDollars: v * 1000000 })}
+        min={0}
+        step={1}
+      />
+      <FilterInput
+        label="Min ADR (%)"
+        value={filters.minADR}
+        onChange={(v) => updateFilters({ minADR: v })}
+        step={0.5}
+      />
+      <FilterInput
+        label="Min Score (0-20)"
+        value={filters.minScore}
+        onChange={(v) => updateFilters({ minScore: v })}
+        min={0}
+        max={20}
+        step={1}
+      />
+    </>
+  );
+}
+
+export { UniverseSelect, FilterInputs, FilterInput };
\ No newline at end of file
diff --git a/frontend/src/components/ResultsTable.tsx b/frontend/src/components/ResultsTable.tsx
index 04b661f..407ee9a 100644
--- a/frontend/src/components/ResultsTable.tsx
+++ b/frontend/src/components/ResultsTable.tsx
@@ -31,6 +31,11 @@ export default function ResultsTable() {
             />
           </div>
         </div>
+        <div className="mt-4 grid grid-cols-3 gap-2 animate-pulse">
+          <div className="h-8 rounded" style={{ backgroundColor: 'var(--bg-tertiary)' }} />
+          <div className="h-8 rounded" style={{ backgroundColor: 'var(--bg-tertiary)' }} />
+          <div className="h-8 rounded" style={{ backgroundColor: 'var(--bg-tertiary)' }} />
+        </div>
       </div>
     );
   }
@@ -40,8 +45,11 @@ export default function ResultsTable() {
       <div className="rounded-lg border p-6" style={{ backgroundColor: 'var(--bg-secondary)', borderColor: 'var(--border-color)' }}>
         <div className="text-center py-8">
           <div className="font-mono text-4xl mb-4 opacity-20">[]</div>
-          <p className="font-mono text-sm" style={{ color: 'var(--text-muted)' }}>
-            Select a universe and run scan to find momentum stocks
+          <p className="font-mono text-sm mb-2" style={{ color: 'var(--text-muted)' }}>
+            No signals found
+          </p>
+          <p className="text-xs font-mono" style={{ color: 'var(--text-muted)', opacity: 0.6 }}>
+            Try lowering the min score or expanding your universe
           </p>
         </div>
       </div>
diff --git a/frontend/src/components/ScannerControls.tsx b/frontend/src/components/ScannerControls.tsx
index 7977afb..7793f50 100644
--- a/frontend/src/components/ScannerControls.tsx
+++ b/frontend/src/components/ScannerControls.tsx
@@ -1,15 +1,13 @@
 import { useEffect, useRef, useCallback } from 'react';
 import { useScannerStore } from '../store/scannerStore';
-import { STOCK_UNIVERSES } from '../services/stockApi';
 import { calculateMetrics, filterAndSortResults } from '../utils/calculations';
-import { fetchBatchHistoricalData } from '../services/stockApi';
+import { fetchBatchHistoricalData, STOCK_UNIVERSES, type StockUniverse } from '../services/stockApi';
+import { UniverseSelect, FilterInputs } from './FilterComponents';
 
 export default function ScannerControls() {
   const {
     selectedUniverse,
-    setSelectedUniverse,
     filters,
-    updateFilters,
     setIsLoading,
     setError,
     setProgress,
@@ -18,6 +16,7 @@ export default function ScannerControls() {
     error,
     results,
     resetScan,
+    loadUniverses,
   } = useScannerStore();
   
   const hasAutoScanned = useRef(false);
@@ -27,7 +26,7 @@ export default function ScannerControls() {
     setIsLoading(true);
     
     try {
-      const universe = STOCK_UNIVERSES.find(u => u.name === selectedUniverse);
+      const universe = STOCK_UNIVERSES.find((u: StockUniverse) => u.name === selectedUniverse);
       if (!universe) {
         throw new Error('Please select a valid stock universe');
       }
@@ -60,6 +59,10 @@ export default function ScannerControls() {
     }
   }, [selectedUniverse, filters, resetScan, setIsLoading, setError, setProgress, setResults]);
 
+  useEffect(() => {
+    loadUniverses();
+  }, [loadUniverses]);
+
   useEffect(() => {
     if (!hasAutoScanned.current && results.length === 0 && !isLoading) {
       hasAutoScanned.current = true;
@@ -82,84 +85,8 @@ export default function ScannerControls() {
       </div>
       
       <div className="space-y-4">
-        <div>
-          <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
-            Universe
-          </label>
-          <select
-            value={selectedUniverse}
-            onChange={(e) => setSelectedUniverse(e.target.value)}
-            className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
-            style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
-          >
-            {STOCK_UNIVERSES.map((universe) => (
-              <option key={universe.name} value={universe.name}>
-                {universe.name} ({universe.symbols.length})
-              </option>
-            ))}
-          </select>
-        </div>
-
-        <div>
-          <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
-            Min Price ($)
-          </label>
-          <input
-            type="number"
-            value={filters.minPrice}
-            onChange={(e) => updateFilters({ minPrice: Number(e.target.value) })}
-            className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
-            style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
-            min="0"
-            step="0.5"
-          />
-        </div>
-
-        <div>
-          <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
-            Min Volume ($M)
-          </label>
-          <input
-            type="number"
-            value={filters.minVolumeDollars / 1000000}
-            onChange={(e) => updateFilters({ minVolumeDollars: Number(e.target.value) * 1000000 })}
-            className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
-            style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
-            min="0"
-            step="1"
-          />
-        </div>
-
-        <div>
-          <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
-            Min ADR (%)
-          </label>
-          <input
-            type="number"
-            value={filters.minADR}
-            onChange={(e) => updateFilters({ minADR: Number(e.target.value) })}
-            className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
-            style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
-            min="0"
-            step="0.5"
-          />
-        </div>
-
-        <div>
-          <label className="block text-xs font-mono mb-1" style={{ color: 'var(--text-muted)' }}>
-            Min Score (0-20)
-          </label>
-          <input
-            type="number"
-            value={filters.minScore}
-            onChange={(e) => updateFilters({ minScore: Number(e.target.value) })}
-            className="w-full px-3 py-2 rounded text-sm font-mono border focus:outline-none focus:ring-1"
-            style={{ backgroundColor: 'var(--bg-tertiary)', borderColor: 'var(--border-color)', color: 'var(--text-primary)' }}
-            min="0"
-            max="20"
-            step="1"
-          />
-        </div>
+        <UniverseSelect />
+        <FilterInputs />
 
         <button
           onClick={handleRunScan}
diff --git a/frontend/src/services/database.ts b/frontend/src/services/database.ts
index 4bb4281..b9bd659 100644
--- a/frontend/src/services/database.ts
+++ b/frontend/src/services/database.ts
@@ -17,6 +17,15 @@ export interface CachedStockData {
   expiresAt: number;
 }
 
+export interface CachedUniverse {
+  id: string;
+  name: string;
+  symbols: string[];
+  isDefault: boolean;
+  createdAt: number;
+  updatedAt: number;
+}
+
 export interface CacheStats {
   hits: number;
   misses: number;
@@ -25,13 +34,15 @@ export interface CacheStats {
 
 class StockCacheDB extends Dexie {
   stockData!: Table<CachedStockData, string>;
+  universes!: Table<CachedUniverse, string>;
   private stats: CacheStats = { hits: 0, misses: 0, totalCached: 0 };
 
   constructor() {
     super('QullamaggieScannerCache');
     
-    this.version(1).stores({
-      stockData: 'symbol, timestamp, expiresAt'
+    this.version(2).stores({
+      stockData: 'symbol, timestamp, expiresAt',
+      universes: 'id, name'
     });
   }
 
@@ -124,6 +135,40 @@ class StockCacheDB extends Dexie {
   resetStats(): void {
     this.stats = { hits: 0, misses: 0, totalCached: this.stats.totalCached };
   }
+
+  async getSavedUniverses(): Promise<CachedUniverse[]> {
+    try {
+      return await this.universes.toArray();
+    } catch (error) {
+      console.error('[Cache] Error getting universes:', error);
+      return [];
+    }
+  }
+
+  async saveUniverse(universe: Omit<CachedUniverse, 'createdAt' | 'updatedAt'>): Promise<void> {
+    try {
+      const now = Date.now();
+      const existing = await this.universes.get(universe.id);
+      
+      await this.universes.put({
+        ...universe,
+        createdAt: existing?.createdAt || now,
+        updatedAt: now
+      });
+      console.log(`[Cache] SAVED universe: ${universe.name}`);
+    } catch (error) {
+      console.error('[Cache] Error saving universe:', error);
+    }
+  }
+
+  async deleteUniverse(id: string): Promise<void> {
+    try {
+      await this.universes.delete(id);
+      console.log(`[Cache] DELETED universe: ${id}`);
+    } catch (error) {
+      console.error('[Cache] Error deleting universe:', error);
+    }
+  }
 }
 
 // Singleton instance
diff --git a/frontend/src/services/stockApi.ts b/frontend/src/services/stockApi.ts
index 80cb83b..f7349aa 100644
--- a/frontend/src/services/stockApi.ts
+++ b/frontend/src/services/stockApi.ts
@@ -6,8 +6,10 @@ export let lastDataSource: DataSource = 'mock';
 export const isDemoMode = false;
 
 export interface StockUniverse {
+  id: string;
   name: string;
   symbols: string[];
+  isCustom?: boolean;
 }
 
 async function fetchFromYahoo(symbol: string, range: string = '1y'): Promise<OHLCV[] | null> {
@@ -70,42 +72,15 @@ async function fetchFromYahoo(symbol: string, range: string = '1y'): Promise<OHL
 }
 
 export const STOCK_UNIVERSES: StockUniverse[] = [
-  {
-    name: 'S&P 500',
-    symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'BRK.B', 'UNH', 'XOM', 'JPM', 'V', 'PG', 'MA', 'HD', 'CVX', 'MRK', 'ABBV', 'LLY', 'PEP', 'AVGO', 'ORCL', 'ADBE', 'CRM', 'CSCO', 'ACN', 'MCD', 'WMT', 'NFLX', 'KO', 'COST', 'AMD', 'QCOM', 'TXN', 'HON', 'UBER', 'AMAT', 'LOW', 'INTC', 'SBUX', 'GE', 'CAT', 'GILD', 'ISRG', 'BKNG', 'MDLZ', 'ADP', 'REGN', 'LRCX', 'VRTX', 'ZTS'],
-  },
-  {
-    name: 'NASDAQ 100',
-    symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'GOOG', 'AVGO', 'ADBE', 'CRM', 'CSCO', 'NFLX', 'AMD', 'QCOM', 'TXN', 'PEP', 'COST', 'MCD', 'ACN', 'ABBV', 'CMCSA', 'WMT', 'NKE', 'INTC', 'HON', 'INTU', 'TXN', 'AMAT', 'LRCX', 'BKNG', 'SBUX', 'MDLZ', 'ADP', 'REGN', 'VRTX', 'ISRG', 'GILD', 'KLAC', 'SNPS', 'CDNS', 'ORLY', 'NXPI', 'MRNA', 'PANW', 'CRWD', 'ZS', 'DDOG', 'NET', 'OKTA', 'SNOW'],
-  },
-  {
-    name: 'Tech Giants',
-    symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'AVGO', 'AMD', 'QCOM', 'TXN', 'INTC', 'CSCO', 'ORCL', 'ADBE', 'IBM', 'CRM', 'PYPL', 'SHOP', 'SQ', 'UBER'],
-  },
-  {
-    name: 'High Momentum',
-    symbols: ['NVDA', 'TSLA', 'AMD', 'AVGO', 'META', 'PLTR', 'SMCI', 'ARM', 'COIN', 'RIVN', 'LCID', 'SOFI', 'PATH', 'U', 'BBAI', 'AI', 'DDOG', 'SNOW', 'CRWD', 'NET'],
-  },
-  {
-    name: 'Semiconductors',
-    symbols: ['NVDA', 'AMD', 'INTC', 'AVGO', 'QCOM', 'TXN', 'MU', 'AMAT', 'LRCX', 'KLAC', 'SNPS', 'CDNS', 'MRVL', 'ON', 'ARM', 'NXPI', 'ADI', 'MCHP', 'TER', 'ASML'],
-  },
-  {
-    name: 'Clean Energy',
-    symbols: ['ENPH', 'SEDG', 'FSLR', 'RUN', 'NEE', 'IBDRY', 'BE', 'PLUG', 'FCEL', 'BLNK', 'SBE', 'CHPT', 'FLSW', 'EVGO', 'RSASF', 'BEPC', 'CWEN', 'ORA'],
-  },
-  {
-    name: 'FinTech',
-    symbols: ['COIN', 'SQ', 'PYPL', 'SHOP', 'AFRM', 'SOFI', 'UPST', 'HOOD', 'V', 'MA', 'AX', 'FI', 'GPN', 'WORLD', 'NU', 'RBLX', 'U', 'PATH'],
-  },
-  {
-    name: 'Biotech',
-    symbols: ['MRNA', 'REGN', 'BIIB', 'GILD', 'NVAX', 'BNTX', 'INO', 'OCGN', 'ABBV', 'BMY', 'LLY', 'PFE', 'JNJ', 'UNH', 'ISRG', 'DXCM', 'TMO', 'DHR', 'ABT', 'AMGN'],
-  },
-  {
-    name: 'Full Universe (80 stocks)',
-    symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'AVGO', 'ADBE', 'CRM', 'CSCO', 'NFLX', 'AMD', 'QCOM', 'TXN', 'PEP', 'COST', 'MCD', 'ACN', 'ABBV', 'CMCSA', 'WMT', 'NKE', 'INTC', 'HON', 'INTU', 'AMAT', 'LRCX', 'BKNG', 'SBUX', 'MDLZ', 'ADP', 'REGN', 'VRTX', 'ISRG', 'GILD', 'KLAC', 'SNPS', 'ORLY', 'NXPI', 'MRNA', 'PANW', 'CRWD', 'ZS', 'DDOG', 'NET', 'OKTA', 'SNOW', 'PLTR', 'SMCI', 'COIN', 'RIVN', 'SOFI', 'PATH', 'U', 'BBAI', 'ENPH', 'FSLR', 'RUN', 'SQ', 'PYPL', 'HOOD', 'MRVL', 'ARM', 'DHR', 'TMO', 'ABT'],
-  },
+  { id: 'sp500', name: 'S&P 500', symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'BRK.B', 'UNH', 'XOM', 'JPM', 'V', 'PG', 'MA', 'HD', 'CVX', 'MRK', 'ABBV', 'LLY', 'PEP', 'AVGO', 'ORCL', 'ADBE', 'CRM', 'CSCO', 'ACN', 'MCD', 'WMT', 'NFLX', 'KO', 'COST', 'AMD', 'QCOM', 'TXN', 'HON', 'UBER', 'AMAT', 'LOW', 'INTC', 'SBUX', 'GE', 'CAT', 'GILD', 'ISRG', 'BKNG', 'MDLZ', 'ADP', 'REGN', 'LRCX', 'VRTX', 'ZTS'] },
+  { id: 'nasdaq100', name: 'NASDAQ 100', symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'GOOG', 'AVGO', 'ADBE', 'CRM', 'CSCO', 'NFLX', 'AMD', 'QCOM', 'TXN', 'PEP', 'COST', 'MCD', 'ACN', 'ABBV', 'CMCSA', 'WMT', 'NKE', 'INTC', 'HON', 'INTU', 'TXN', 'AMAT', 'LRCX', 'BKNG', 'SBUX', 'MDLZ', 'ADP', 'REGN', 'VRTX', 'ISRG', 'GILD', 'KLAC', 'SNPS', 'CDNS', 'ORLY', 'NXPI', 'MRNA', 'PANW', 'CRWD', 'ZS', 'DDOG', 'NET', 'OKTA', 'SNOW'] },
+  { id: 'tech-giants', name: 'Tech Giants', symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'AVGO', 'AMD', 'QCOM', 'TXN', 'INTC', 'CSCO', 'ORCL', 'ADBE', 'IBM', 'CRM', 'PYPL', 'SHOP', 'SQ', 'UBER'] },
+  { id: 'high-momentum', name: 'High Momentum', symbols: ['NVDA', 'TSLA', 'AMD', 'AVGO', 'META', 'PLTR', 'SMCI', 'ARM', 'COIN', 'RIVN', 'LCID', 'SOFI', 'PATH', 'U', 'BBAI', 'AI', 'DDOG', 'SNOW', 'CRWD', 'NET'] },
+  { id: 'semiconductors', name: 'Semiconductors', symbols: ['NVDA', 'AMD', 'INTC', 'AVGO', 'QCOM', 'TXN', 'MU', 'AMAT', 'LRCX', 'KLAC', 'SNPS', 'CDNS', 'MRVL', 'ON', 'ARM', 'NXPI', 'ADI', 'MCHP', 'TER', 'ASML'] },
+  { id: 'clean-energy', name: 'Clean Energy', symbols: ['ENPH', 'SEDG', 'FSLR', 'RUN', 'NEE', 'IBDRY', 'BE', 'PLUG', 'FCEL', 'BLNK', 'SBE', 'CHPT', 'FLSW', 'EVGO', 'RSASF', 'BEPC', 'CWEN', 'ORA'] },
+  { id: 'fintech', name: 'FinTech', symbols: ['COIN', 'SQ', 'PYPL', 'SHOP', 'AFRM', 'SOFI', 'UPST', 'HOOD', 'V', 'MA', 'AX', 'FI', 'GPN', 'WORLD', 'NU', 'RBLX', 'U', 'PATH'] },
+  { id: 'biotech', name: 'Biotech', symbols: ['MRNA', 'REGN', 'BIIB', 'GILD', 'NVAX', 'BNTX', 'INO', 'OCGN', 'ABBV', 'BMY', 'LLY', 'PFE', 'JNJ', 'UNH', 'ISRG', 'DXCM', 'TMO', 'DHR', 'ABT', 'AMGN'] },
+  { id: 'full-universe', name: 'Full Universe (80 stocks)', symbols: ['AAPL', 'MSFT', 'GOOGL', 'AMZN', 'NVDA', 'META', 'TSLA', 'AVGO', 'ADBE', 'CRM', 'CSCO', 'NFLX', 'AMD', 'QCOM', 'TXN', 'PEP', 'COST', 'MCD', 'ACN', 'ABBV', 'CMCSA', 'WMT', 'NKE', 'INTC', 'HON', 'INTU', 'AMAT', 'LRCX', 'BKNG', 'SBUX', 'MDLZ', 'ADP', 'REGN', 'VRTX', 'ISRG', 'GILD', 'KLAC', 'SNPS', 'ORLY', 'NXPI', 'MRNA', 'PANW', 'CRWD', 'ZS', 'DDOG', 'NET', 'OKTA', 'SNOW', 'PLTR', 'SMCI', 'COIN', 'RIVN', 'SOFI', 'PATH', 'U', 'BBAI', 'ENPH', 'FSLR', 'RUN', 'SQ', 'PYPL', 'HOOD', 'MRVL', 'ARM', 'DHR', 'TMO', 'ABT'] },
 ];
 
 export async function fetchHistoricalData(
@@ -266,4 +241,15 @@ export function getDataStats(data: OHLCV[]): {
     totalDays: data.length,
     avgVolume,
   };
+}
+
+export async function getAllUniverses(): Promise<StockUniverse[]> {
+  const saved = await stockCache.getSavedUniverses();
+  const customUniverses: StockUniverse[] = saved.map(u => ({
+    id: u.id,
+    name: u.name,
+    symbols: u.symbols,
+    isCustom: true,
+  }));
+  return [...STOCK_UNIVERSES, ...customUniverses];
 }
\ No newline at end of file
diff --git a/frontend/src/store/scannerStore.ts b/frontend/src/store/scannerStore.ts
index 4a62d8d..50c4521 100644
--- a/frontend/src/store/scannerStore.ts
+++ b/frontend/src/store/scannerStore.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 import type { StockMetrics, ScanConfig } from '../utils/calculations';
-import { STOCK_UNIVERSES } from '../services/stockApi';
+import { STOCK_UNIVERSES, getAllUniverses, type StockUniverse } from '../services/stockApi';
 
 interface ScannerState {
   // Data
@@ -14,6 +14,7 @@ interface ScannerState {
   progress: { current: number; total: number; symbol: string } | null;
   filters: ScanConfig;
   selectedUniverse: string;
+  availableUniverses: StockUniverse[];
   
   // Actions
   setUniverse: (universe: string[]) => void;
@@ -24,6 +25,7 @@ interface ScannerState {
   setProgress: (progress: { current: number; total: number; symbol: string } | null) => void;
   updateFilters: (filters: Partial<ScanConfig>) => void;
   setSelectedUniverse: (universeName: string) => void;
+  loadUniverses: () => Promise<void>;
   resetScan: () => void;
 }
 
@@ -37,14 +39,15 @@ const DEFAULT_FILTERS: ScanConfig = {
 
 export const useScannerStore = create<ScannerState>((set) => ({
   // Initial state
-  universe: STOCK_UNIVERSES[2].symbols, // Demo universe
+  universe: STOCK_UNIVERSES[2].symbols,
   results: [],
   selectedSymbol: null,
   isLoading: false,
   error: null,
   progress: null,
   filters: DEFAULT_FILTERS,
-  selectedUniverse: 'Demo Universe',
+  selectedUniverse: 'Tech Giants',
+  availableUniverses: STOCK_UNIVERSES,
   
   // Actions
   setUniverse: (universe) => set({ universe }),
@@ -76,6 +79,11 @@ export const useScannerStore = create<ScannerState>((set) => ({
     }
   },
   
+  loadUniverses: async () => {
+    const universes = await getAllUniverses();
+    set({ availableUniverses: universes });
+  },
+  
   resetScan: () => set({
     results: [],
     selectedSymbol: null,