diff --git a/frontend/src/app/terminal/portfolio/page.tsx b/frontend/src/app/terminal/portfolio/page.tsx
deleted file mode 100644
index 7c881f4..0000000
--- a/frontend/src/app/terminal/portfolio/page.tsx
+++ /dev/null
@@ -1,1013 +0,0 @@
-'use client'
-
-import { useEffect, useState, useCallback } from 'react'
-import { useStore } from '@/lib/store'
-import { api } from '@/lib/api'
-import { TerminalLayout } from '@/components/TerminalLayout'
-import {
-  Plus,
-  TrendingUp,
-  TrendingDown,
-  Wallet,
-  DollarSign,
-  Calendar,
-  RefreshCw,
-  Trash2,
-  Edit3,
-  Loader2,
-  CheckCircle,
-  AlertCircle,
-  X,
-  Briefcase,
-  PiggyBank,
-  Target,
-  ArrowRight,
-  MoreHorizontal,
-  Tag,
-  Clock,
-  Sparkles,
-  Shield
-} from 'lucide-react'
-import Link from 'next/link'
-import clsx from 'clsx'
-
-// ============================================================================
-// SHARED COMPONENTS
-// ============================================================================
-
-function StatCard({ 
-  label, 
-  value, 
-  subValue, 
-  icon: Icon, 
-  trend,
-  color = 'emerald'
-}: { 
-  label: string
-  value: string | number
-  subValue?: string
-  icon: any
-  trend?: 'up' | 'down' | 'neutral'
-  color?: 'emerald' | 'blue' | 'amber' | 'rose'
-}) {
-  const colors = {
-    emerald: 'text-emerald-400',
-    blue: 'text-blue-400',
-    amber: 'text-amber-400',
-    rose: 'text-rose-400',
-  }
-  
-  return (
-    <div className="bg-zinc-900/40 border border-white/5 p-4 relative overflow-hidden group hover:border-white/10 transition-colors">
-      <div className="absolute top-0 right-0 p-4 opacity-10 group-hover:opacity-20 transition-opacity">
-        <Icon className="w-16 h-16" />
-      </div>
-      <div className="relative z-10">
-        <div className="flex items-center gap-2 text-zinc-400 mb-1">
-          <Icon className={clsx("w-4 h-4", colors[color])} />
-          <span className="text-xs font-medium uppercase tracking-wider">{label}</span>
-        </div>
-        <div className="flex items-baseline gap-2">
-          <span className="text-2xl font-bold text-white tracking-tight">{value}</span>
-          {subValue && <span className="text-xs text-zinc-500 font-medium">{subValue}</span>}
-        </div>
-        {trend && (
-          <div className={clsx(
-            "mt-2 text-[10px] font-medium px-1.5 py-0.5 w-fit rounded border flex items-center gap-1",
-            trend === 'up' && "text-emerald-400 border-emerald-400/20 bg-emerald-400/5",
-            trend === 'down' && "text-rose-400 border-rose-400/20 bg-rose-400/5",
-            trend === 'neutral' && "text-zinc-400 border-zinc-400/20 bg-zinc-400/5",
-          )}>
-            {trend === 'up' ? <TrendingUp className="w-3 h-3" /> : trend === 'down' ? <TrendingDown className="w-3 h-3" /> : null}
-            {trend === 'up' ? 'PROFIT' : trend === 'down' ? 'LOSS' : 'NEUTRAL'}
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
-
-// ============================================================================
-// TYPES
-// ============================================================================
-
-interface PortfolioDomain {
-  id: number
-  domain: string
-  purchase_date: string | null
-  purchase_price: number | null
-  purchase_registrar: string | null
-  registrar: string | null
-  renewal_date: string | null
-  renewal_cost: number | null
-  auto_renew: boolean
-  estimated_value: number | null
-  value_updated_at: string | null
-  is_sold: boolean
-  sale_date: string | null
-  sale_price: number | null
-  status: string
-  notes: string | null
-  tags: string | null
-  roi: number | null
-  created_at: string
-  updated_at: string
-}
-
-interface PortfolioSummary {
-  total_domains: number
-  active_domains: number
-  sold_domains: number
-  total_invested: number
-  total_value: number
-  total_sold_value: number
-  unrealized_profit: number
-  realized_profit: number
-  overall_roi: number
-}
-
-// ============================================================================
-// MAIN PAGE
-// ============================================================================
-
-export default function PortfolioPage() {
-  const { subscription } = useStore()
-  
-  const [domains, setDomains] = useState<PortfolioDomain[]>([])
-  const [summary, setSummary] = useState<PortfolioSummary | null>(null)
-  const [loading, setLoading] = useState(true)
-  
-  // Modals
-  const [showAddModal, setShowAddModal] = useState(false)
-  const [showEditModal, setShowEditModal] = useState(false)
-  const [showSellModal, setShowSellModal] = useState(false)
-  const [showListModal, setShowListModal] = useState(false)
-  const [selectedDomain, setSelectedDomain] = useState<PortfolioDomain | null>(null)
-  const [saving, setSaving] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [success, setSuccess] = useState<string | null>(null)
-  
-  // List for sale form
-  const [listData, setListData] = useState({
-    asking_price: '',
-    price_type: 'negotiable',
-  })
-  
-  // Form state
-  const [formData, setFormData] = useState({
-    domain: '',
-    purchase_date: '',
-    purchase_price: '',
-    registrar: '',
-    renewal_date: '',
-    renewal_cost: '',
-    notes: '',
-    tags: '',
-  })
-  
-  const [sellData, setSellData] = useState({
-    sale_date: new Date().toISOString().split('T')[0],
-    sale_price: '',
-  })
-
-  const loadData = useCallback(async () => {
-    setLoading(true)
-    try {
-      const [domainsData, summaryData] = await Promise.all([
-        api.request<PortfolioDomain[]>('/portfolio'),
-        api.request<PortfolioSummary>('/portfolio/summary'),
-      ])
-      setDomains(domainsData)
-      setSummary(summaryData)
-    } catch (err: any) {
-      console.error('Failed to load portfolio:', err)
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    loadData()
-  }, [loadData])
-
-  const handleAdd = async (e: React.FormEvent) => {
-    e.preventDefault()
-    setSaving(true)
-    setError(null)
-    
-    try {
-      await api.request('/portfolio', {
-        method: 'POST',
-        body: JSON.stringify({
-          domain: formData.domain,
-          purchase_date: formData.purchase_date || null,
-          purchase_price: formData.purchase_price ? parseFloat(formData.purchase_price) : null,
-          registrar: formData.registrar || null,
-          renewal_date: formData.renewal_date || null,
-          renewal_cost: formData.renewal_cost ? parseFloat(formData.renewal_cost) : null,
-          notes: formData.notes || null,
-          tags: formData.tags || null,
-        }),
-      })
-      setSuccess('Domain added to portfolio!')
-      setShowAddModal(false)
-      setFormData({ domain: '', purchase_date: '', purchase_price: '', registrar: '', renewal_date: '', renewal_cost: '', notes: '', tags: '' })
-      loadData()
-    } catch (err: any) {
-      setError(err.message)
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  const handleEdit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!selectedDomain) return
-    setSaving(true)
-    setError(null)
-    
-    try {
-      await api.request(`/portfolio/${selectedDomain.id}`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          purchase_date: formData.purchase_date || null,
-          purchase_price: formData.purchase_price ? parseFloat(formData.purchase_price) : null,
-          registrar: formData.registrar || null,
-          renewal_date: formData.renewal_date || null,
-          renewal_cost: formData.renewal_cost ? parseFloat(formData.renewal_cost) : null,
-          notes: formData.notes || null,
-          tags: formData.tags || null,
-        }),
-      })
-      setSuccess('Domain updated!')
-      setShowEditModal(false)
-      loadData()
-    } catch (err: any) {
-      setError(err.message)
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  const handleSell = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!selectedDomain) return
-    setSaving(true)
-    setError(null)
-    
-    try {
-      await api.request(`/portfolio/${selectedDomain.id}/sell`, {
-        method: 'POST',
-        body: JSON.stringify({
-          sale_date: sellData.sale_date,
-          sale_price: parseFloat(sellData.sale_price),
-        }),
-      })
-      setSuccess(`🎉 Congratulations! ${selectedDomain.domain} marked as sold!`)
-      setShowSellModal(false)
-      loadData()
-    } catch (err: any) {
-      setError(err.message)
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  const handleDelete = async (domain: PortfolioDomain) => {
-    if (!confirm(`Remove ${domain.domain} from portfolio?`)) return
-    
-    try {
-      await api.request(`/portfolio/${domain.id}`, { method: 'DELETE' })
-      setSuccess('Domain removed from portfolio')
-      loadData()
-    } catch (err: any) {
-      setError(err.message)
-    }
-  }
-
-  const handleRefreshValue = async (domain: PortfolioDomain) => {
-    try {
-      await api.request(`/portfolio/${domain.id}/refresh-value`, { method: 'POST' })
-      setSuccess(`Value refreshed for ${domain.domain}`)
-      loadData()
-    } catch (err: any) {
-      setError(err.message)
-    }
-  }
-
-  const openEditModal = (domain: PortfolioDomain) => {
-    setSelectedDomain(domain)
-    setFormData({
-      domain: domain.domain,
-      purchase_date: domain.purchase_date?.split('T')[0] || '',
-      purchase_price: domain.purchase_price?.toString() || '',
-      registrar: domain.registrar || '',
-      renewal_date: domain.renewal_date?.split('T')[0] || '',
-      renewal_cost: domain.renewal_cost?.toString() || '',
-      notes: domain.notes || '',
-      tags: domain.tags || '',
-    })
-    setShowEditModal(true)
-  }
-
-  const openSellModal = (domain: PortfolioDomain) => {
-    setSelectedDomain(domain)
-    setSellData({
-      sale_date: new Date().toISOString().split('T')[0],
-      sale_price: domain.estimated_value?.toString() || '',
-    })
-    setShowSellModal(true)
-  }
-
-  const openListModal = (domain: PortfolioDomain) => {
-    setSelectedDomain(domain)
-    setListData({
-      asking_price: domain.estimated_value?.toString() || '',
-      price_type: 'negotiable',
-    })
-    setShowListModal(true)
-  }
-
-  const handleListForSale = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!selectedDomain) return
-    setSaving(true)
-    setError(null)
-    
-    try {
-      // Create a listing for this domain
-      await api.request('/listings', {
-        method: 'POST',
-        body: JSON.stringify({
-          domain: selectedDomain.domain,
-          asking_price: listData.asking_price ? parseFloat(listData.asking_price) : null,
-          price_type: listData.price_type,
-          allow_offers: true,
-        }),
-      })
-      setSuccess(`${selectedDomain.domain} is now listed for sale! Go to "For Sale" to verify ownership and publish.`)
-      setShowListModal(false)
-    } catch (err: any) {
-      setError(err.message)
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  const formatCurrency = (value: number | null) => {
-    if (value === null) return '—'
-    return new Intl.NumberFormat('en-US', {
-      style: 'currency',
-      currency: 'USD',
-      minimumFractionDigits: 0,
-    }).format(value)
-  }
-
-  const formatDate = (date: string | null) => {
-    if (!date) return '—'
-    return new Date(date).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-  }
-
-  // Tier check
-  const tier = subscription?.tier || 'scout'
-  const canUsePortfolio = tier !== 'scout'
-
-  return (
-    <TerminalLayout hideHeaderSearch={true}>
-      <div className="relative font-sans text-zinc-100 selection:bg-emerald-500/30 pb-20">
-        
-        {/* Ambient Background Glow */}
-        <div className="fixed inset-0 pointer-events-none overflow-hidden">
-          <div className="absolute top-0 right-1/4 w-[800px] h-[600px] bg-blue-500/5 rounded-full blur-[120px] mix-blend-screen" />
-          <div className="absolute bottom-0 left-1/4 w-[600px] h-[500px] bg-emerald-500/5 rounded-full blur-[100px] mix-blend-screen" />
-        </div>
-
-        <div className="relative z-10 max-w-[1600px] mx-auto p-4 md:p-8 space-y-8">
-          
-          {/* Header Section */}
-          <div className="flex flex-col md:flex-row justify-between items-start md:items-end gap-6 border-b border-white/5 pb-8">
-            <div className="space-y-2">
-              <div className="flex items-center gap-3">
-                <div className="h-8 w-1 bg-blue-500 rounded-full shadow-[0_0_10px_rgba(59,130,246,0.5)]" />
-                <h1 className="text-3xl font-bold tracking-tight text-white">Portfolio</h1>
-              </div>
-              <p className="text-zinc-400 max-w-lg">
-                Track your owned domains, valuations, and ROI. Switch back to your Watchlist anytime.
-              </p>
-            </div>
-            
-            <div className="flex flex-col items-end gap-3">
-              {/* View Tabs: Watching vs My Portfolio */}
-              <div className="flex items-center gap-1 bg-white/5 p-1 rounded-lg">
-                <Link
-                  href="/terminal/watchlist"
-                  className={clsx(
-                    "px-3 py-1.5 rounded-md text-xs font-medium transition-all flex items-center gap-2 text-zinc-400 hover:text-zinc-200 hover:bg-white/5"
-                  )}
-                >
-                  <Eye className="w-3.5 h-3.5" />
-                  Watching
-                </Link>
-                <button
-                  type="button"
-                  className={clsx(
-                    "px-3 py-1.5 rounded-md text-xs font-medium transition-all",
-                    "flex items-center gap-2",
-                    "bg-zinc-800 text-white shadow-sm"
-                  )}
-                >
-                  <Shield className="w-3.5 h-3.5" />
-                  My Portfolio
-                </button>
-              </div>
-
-              {canUsePortfolio && (
-                <button
-                  onClick={() => {
-                    setFormData({ domain: '', purchase_date: '', purchase_price: '', registrar: '', renewal_date: '', renewal_cost: '', notes: '', tags: '' })
-                    setShowAddModal(true)
-                  }}
-                  className="px-4 py-2 bg-blue-500 text-white font-medium rounded-lg hover:bg-blue-400 transition-all shadow-lg shadow-blue-500/20 flex items-center gap-2"
-                >
-                  <Plus className="w-4 h-4" /> Add Domain
-                </button>
-              )}
-            </div>
-          </div>
-
-          {/* Messages */}
-          {error && (
-            <div className="p-4 bg-rose-500/10 border border-rose-500/20 rounded-xl flex items-center gap-3 text-rose-400 animate-in fade-in slide-in-from-top-2">
-              <AlertCircle className="w-5 h-5" />
-              <p className="text-sm flex-1">{error}</p>
-              <button onClick={() => setError(null)}><X className="w-4 h-4" /></button>
-            </div>
-          )}
-          
-          {success && (
-            <div className="p-4 bg-emerald-500/10 border border-emerald-500/20 rounded-xl flex items-center gap-3 text-emerald-400 animate-in fade-in slide-in-from-top-2">
-              <CheckCircle className="w-5 h-5" />
-              <p className="text-sm flex-1">{success}</p>
-              <button onClick={() => setSuccess(null)}><X className="w-4 h-4" /></button>
-            </div>
-          )}
-
-          {/* Paywall */}
-          {!canUsePortfolio && (
-            <div className="p-8 bg-gradient-to-br from-blue-900/20 to-black border border-blue-500/20 rounded-2xl text-center relative overflow-hidden">
-               <div className="absolute inset-0 bg-grid-white/[0.02] bg-[length:20px_20px]" />
-               <div className="relative z-10">
-                  <Briefcase className="w-12 h-12 text-blue-400 mx-auto mb-4" />
-                  <h2 className="text-2xl font-bold text-white mb-2">Unlock Portfolio Management</h2>
-                  <p className="text-zinc-400 mb-6 max-w-md mx-auto">
-                    Track your domain investments, monitor valuations, and calculate ROI. Know exactly how your portfolio is performing.
-                  </p>
-                  <Link
-                    href="/pricing"
-                    className="inline-flex items-center gap-2 px-6 py-3 bg-blue-500 text-white font-bold rounded-xl hover:bg-blue-400 transition-all shadow-lg shadow-blue-500/20"
-                  >
-                    Upgrade to Trader <ArrowRight className="w-4 h-4" />
-                  </Link>
-               </div>
-            </div>
-          )}
-
-          {/* Stats Grid */}
-          {canUsePortfolio && summary && (
-            <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
-              <StatCard 
-                label="Total Value" 
-                value={formatCurrency(summary.total_value)}
-                subValue={`${summary.active_domains} active`}
-                icon={Wallet}
-                color="blue"
-                trend={summary.unrealized_profit > 0 ? 'up' : summary.unrealized_profit < 0 ? 'down' : 'neutral'}
-              />
-              <StatCard 
-                label="Invested" 
-                value={formatCurrency(summary.total_invested)}
-                subValue="Total cost"
-                icon={PiggyBank}
-                color="amber"
-              />
-              <StatCard 
-                label="Unrealized P/L" 
-                value={formatCurrency(summary.unrealized_profit)}
-                subValue="Paper gains"
-                icon={TrendingUp}
-                color={summary.unrealized_profit >= 0 ? 'emerald' : 'rose'}
-                trend={summary.unrealized_profit > 0 ? 'up' : summary.unrealized_profit < 0 ? 'down' : 'neutral'}
-              />
-              <StatCard 
-                label="ROI" 
-                value={`${summary.overall_roi > 0 ? '+' : ''}${summary.overall_roi.toFixed(1)}%`}
-                subValue={`${summary.sold_domains} sold`}
-                icon={Target}
-                color={summary.overall_roi >= 0 ? 'emerald' : 'rose'}
-                trend={summary.overall_roi > 0 ? 'up' : summary.overall_roi < 0 ? 'down' : 'neutral'}
-              />
-            </div>
-          )}
-
-          {/* Domains Table */}
-          {canUsePortfolio && (
-            <div className="bg-zinc-900/40 border border-white/5 rounded-xl overflow-hidden backdrop-blur-sm">
-              {/* Table Header */}
-              <div className="grid grid-cols-12 gap-4 px-6 py-3 bg-white/[0.02] border-b border-white/5 text-[11px] font-semibold text-zinc-500 uppercase tracking-wider">
-                <div className="col-span-12 md:col-span-3">Domain</div>
-                <div className="hidden md:block md:col-span-2 text-right">Cost</div>
-                <div className="hidden md:block md:col-span-2 text-right">Value</div>
-                <div className="hidden md:block md:col-span-2 text-right">ROI</div>
-                <div className="hidden md:block md:col-span-1 text-center">Status</div>
-                <div className="hidden md:block md:col-span-2 text-right">Actions</div>
-              </div>
-
-              {loading ? (
-                <div className="flex items-center justify-center py-20">
-                  <Loader2 className="w-8 h-8 text-blue-500 animate-spin" />
-                </div>
-              ) : domains.length === 0 ? (
-                <div className="flex flex-col items-center justify-center py-20 text-center">
-                  <div className="w-16 h-16 rounded-full bg-white/5 flex items-center justify-center mb-4">
-                    <Briefcase className="w-8 h-8 text-zinc-600" />
-                  </div>
-                  <h3 className="text-lg font-medium text-white mb-1">No domains in portfolio</h3>
-                  <p className="text-zinc-500 text-sm max-w-xs mx-auto mb-6">
-                    Add your first domain to start tracking your investments.
-                  </p>
-                  <button
-                    onClick={() => setShowAddModal(true)}
-                    className="text-blue-400 text-sm hover:text-blue-300 transition-colors flex items-center gap-2 font-medium"
-                  >
-                    Add Domain <ArrowRight className="w-4 h-4" />
-                  </button>
-                </div>
-              ) : (
-                <div className="divide-y divide-white/5">
-                  {domains.map((domain) => (
-                    <div key={domain.id} className="grid grid-cols-12 gap-4 px-6 py-4 items-center hover:bg-white/[0.04] transition-all group">
-                      
-                      {/* Domain */}
-                      <div className="col-span-12 md:col-span-3">
-                        <div className="flex items-center gap-3">
-                           <div className={clsx(
-                              "w-10 h-10 rounded-lg flex items-center justify-center text-lg font-bold",
-                              domain.is_sold ? "bg-blue-500/10 text-blue-400" : "bg-zinc-800 text-zinc-400"
-                           )}>
-                              {domain.domain.charAt(0).toUpperCase()}
-                           </div>
-                           <div>
-                              <div className="font-mono font-bold text-white tracking-tight">{domain.domain}</div>
-                              <div className="text-xs text-zinc-500">
-                                {domain.registrar || 'No registrar'}
-                                {domain.renewal_date && (
-                                  <span className="ml-2 text-zinc-600">• Renews {formatDate(domain.renewal_date)}</span>
-                                )}
-                              </div>
-                           </div>
-                        </div>
-                      </div>
-
-                      {/* Cost */}
-                      <div className="hidden md:block col-span-2 text-right">
-                         <div className="font-mono text-zinc-400">{formatCurrency(domain.purchase_price)}</div>
-                         {domain.purchase_date && (
-                           <div className="text-[10px] text-zinc-600">{formatDate(domain.purchase_date)}</div>
-                         )}
-                      </div>
-
-                      {/* Value */}
-                      <div className="hidden md:block col-span-2 text-right">
-                         <div className="font-mono text-white font-medium">
-                           {domain.is_sold ? formatCurrency(domain.sale_price) : formatCurrency(domain.estimated_value)}
-                         </div>
-                         {domain.is_sold ? (
-                           <div className="text-[10px] text-blue-400">Sold {formatDate(domain.sale_date)}</div>
-                         ) : domain.value_updated_at && (
-                           <div className="text-[10px] text-zinc-600">Updated {formatDate(domain.value_updated_at)}</div>
-                         )}
-                      </div>
-
-                      {/* ROI */}
-                      <div className="hidden md:block col-span-2 text-right">
-                         {domain.roi !== null ? (
-                           <div className={clsx(
-                             "font-mono font-medium",
-                             domain.roi >= 0 ? "text-emerald-400" : "text-rose-400"
-                           )}>
-                             {domain.roi > 0 ? '+' : ''}{domain.roi.toFixed(1)}%
-                           </div>
-                         ) : (
-                           <div className="text-zinc-600">—</div>
-                         )}
-                      </div>
-
-                      {/* Status */}
-                      <div className="hidden md:flex col-span-1 justify-center">
-                         <span className={clsx(
-                              "inline-flex items-center gap-1.5 px-2 py-1 rounded-full text-[10px] font-bold uppercase tracking-wider border",
-                              domain.is_sold ? "bg-blue-500/10 text-blue-400 border-blue-500/20" :
-                              domain.status === 'active' ? "bg-emerald-500/10 text-emerald-400 border-emerald-500/20" :
-                              "bg-zinc-800/50 text-zinc-400 border-zinc-700"
-                           )}>
-                              {domain.is_sold ? 'Sold' : domain.status}
-                           </span>
-                      </div>
-
-                      {/* Actions */}
-                      <div className="hidden md:flex col-span-2 justify-end gap-1">
-                         {!domain.is_sold && (
-                           <>
-                             <button
-                               onClick={() => openListModal(domain)}
-                               className="p-2 rounded-lg text-zinc-600 hover:text-amber-400 hover:bg-amber-500/10 transition-all"
-                               title="List for sale"
-                             >
-                               <Tag className="w-4 h-4" />
-                             </button>
-                             <button
-                               onClick={() => handleRefreshValue(domain)}
-                               className="p-2 rounded-lg text-zinc-600 hover:text-blue-400 hover:bg-blue-500/10 transition-all"
-                               title="Refresh value"
-                             >
-                               <RefreshCw className="w-4 h-4" />
-                             </button>
-                             <button
-                               onClick={() => openSellModal(domain)}
-                               className="p-2 rounded-lg text-zinc-600 hover:text-emerald-400 hover:bg-emerald-500/10 transition-all"
-                               title="Record sale"
-                             >
-                               <DollarSign className="w-4 h-4" />
-                             </button>
-                           </>
-                         )}
-                         <button
-                           onClick={() => openEditModal(domain)}
-                           className="p-2 rounded-lg text-zinc-600 hover:text-white hover:bg-white/10 transition-all"
-                           title="Edit"
-                         >
-                           <Edit3 className="w-4 h-4" />
-                         </button>
-                         <button
-                           onClick={() => handleDelete(domain)}
-                           className="p-2 rounded-lg text-zinc-600 hover:text-rose-400 hover:bg-rose-500/10 transition-all"
-                           title="Delete"
-                         >
-                           <Trash2 className="w-4 h-4" />
-                         </button>
-                      </div>
-
-                    </div>
-                  ))}
-                </div>
-              )}
-            </div>
-          )}
-
-        </div>
-
-        {/* Add Modal */}
-        {showAddModal && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-md">
-            <div className="w-full max-w-lg bg-[#0A0A0A] border border-white/10 rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200">
-               <div className="p-6 border-b border-white/5">
-                  <h2 className="text-xl font-bold text-white">Add to Portfolio</h2>
-                  <p className="text-sm text-zinc-500">Track a domain you own</p>
-               </div>
-              
-              <form onSubmit={handleAdd} className="p-6 space-y-4">
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Domain Name *</label>
-                  <input
-                    type="text"
-                    required
-                    value={formData.domain}
-                    onChange={(e) => setFormData({ ...formData, domain: e.target.value })}
-                    placeholder="example.com"
-                    className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-blue-500/50 transition-all font-mono"
-                  />
-                </div>
-                
-                <div className="grid grid-cols-2 gap-4">
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Purchase Date</label>
-                    <input
-                      type="date"
-                      value={formData.purchase_date}
-                      onChange={(e) => setFormData({ ...formData, purchase_date: e.target.value })}
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Purchase Price</label>
-                    <div className="relative">
-                      <DollarSign className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-500" />
-                      <input
-                        type="number"
-                        step="0.01"
-                        value={formData.purchase_price}
-                        onChange={(e) => setFormData({ ...formData, purchase_price: e.target.value })}
-                        placeholder="0.00"
-                        className="w-full pl-9 pr-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-blue-500/50 transition-all font-mono"
-                      />
-                    </div>
-                  </div>
-                </div>
-                
-                <div className="grid grid-cols-2 gap-4">
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Registrar</label>
-                    <input
-                      type="text"
-                      value={formData.registrar}
-                      onChange={(e) => setFormData({ ...formData, registrar: e.target.value })}
-                      placeholder="Namecheap, GoDaddy..."
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Renewal Date</label>
-                    <input
-                      type="date"
-                      value={formData.renewal_date}
-                      onChange={(e) => setFormData({ ...formData, renewal_date: e.target.value })}
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                </div>
-                
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Notes</label>
-                  <textarea
-                    value={formData.notes}
-                    onChange={(e) => setFormData({ ...formData, notes: e.target.value })}
-                    placeholder="Why did you buy this domain?"
-                    rows={2}
-                    className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-blue-500/50 transition-all resize-none"
-                  />
-                </div>
-                
-                <div className="flex gap-3 pt-4">
-                  <button
-                    type="button"
-                    onClick={() => setShowAddModal(false)}
-                    className="flex-1 px-4 py-3 border border-white/10 text-zinc-400 rounded-xl hover:bg-white/5 hover:text-white transition-all font-medium"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    type="submit"
-                    disabled={saving}
-                    className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-blue-500 text-white font-bold rounded-xl hover:bg-blue-400 transition-all disabled:opacity-50 shadow-lg shadow-blue-500/20"
-                  >
-                    {saving ? <Loader2 className="w-5 h-5 animate-spin" /> : <Plus className="w-5 h-5" />}
-                    {saving ? 'Adding...' : 'Add Domain'}
-                  </button>
-                </div>
-              </form>
-            </div>
-          </div>
-        )}
-
-        {/* Edit Modal */}
-        {showEditModal && selectedDomain && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-md">
-            <div className="w-full max-w-lg bg-[#0A0A0A] border border-white/10 rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200">
-               <div className="p-6 border-b border-white/5">
-                  <h2 className="text-xl font-bold text-white">Edit {selectedDomain.domain}</h2>
-                  <p className="text-sm text-zinc-500">Update domain information</p>
-               </div>
-              
-              <form onSubmit={handleEdit} className="p-6 space-y-4">
-                <div className="grid grid-cols-2 gap-4">
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Purchase Date</label>
-                    <input
-                      type="date"
-                      value={formData.purchase_date}
-                      onChange={(e) => setFormData({ ...formData, purchase_date: e.target.value })}
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Purchase Price</label>
-                    <div className="relative">
-                      <DollarSign className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-500" />
-                      <input
-                        type="number"
-                        step="0.01"
-                        value={formData.purchase_price}
-                        onChange={(e) => setFormData({ ...formData, purchase_price: e.target.value })}
-                        className="w-full pl-9 pr-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all font-mono"
-                      />
-                    </div>
-                  </div>
-                </div>
-                
-                <div className="grid grid-cols-2 gap-4">
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Registrar</label>
-                    <input
-                      type="text"
-                      value={formData.registrar}
-                      onChange={(e) => setFormData({ ...formData, registrar: e.target.value })}
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                  <div>
-                    <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Renewal Date</label>
-                    <input
-                      type="date"
-                      value={formData.renewal_date}
-                      onChange={(e) => setFormData({ ...formData, renewal_date: e.target.value })}
-                      className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all"
-                    />
-                  </div>
-                </div>
-                
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Notes</label>
-                  <textarea
-                    value={formData.notes}
-                    onChange={(e) => setFormData({ ...formData, notes: e.target.value })}
-                    rows={2}
-                    className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-blue-500/50 transition-all resize-none"
-                  />
-                </div>
-                
-                <div className="flex gap-3 pt-4">
-                  <button
-                    type="button"
-                    onClick={() => setShowEditModal(false)}
-                    className="flex-1 px-4 py-3 border border-white/10 text-zinc-400 rounded-xl hover:bg-white/5 hover:text-white transition-all font-medium"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    type="submit"
-                    disabled={saving}
-                    className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-blue-500 text-white font-bold rounded-xl hover:bg-blue-400 transition-all disabled:opacity-50 shadow-lg shadow-blue-500/20"
-                  >
-                    {saving ? <Loader2 className="w-5 h-5 animate-spin" /> : <CheckCircle className="w-5 h-5" />}
-                    {saving ? 'Saving...' : 'Save Changes'}
-                  </button>
-                </div>
-              </form>
-            </div>
-          </div>
-        )}
-
-        {/* Sell Modal */}
-        {showSellModal && selectedDomain && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-md">
-            <div className="w-full max-w-md bg-[#0A0A0A] border border-white/10 rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200">
-               <div className="p-6 border-b border-white/5 bg-gradient-to-r from-emerald-500/10 to-transparent">
-                  <h2 className="text-xl font-bold text-white flex items-center gap-2">
-                    <Sparkles className="w-5 h-5 text-emerald-400" />
-                    Record Sale
-                  </h2>
-                  <p className="text-sm text-zinc-400 mt-1">
-                    Congratulations on selling <strong className="text-white">{selectedDomain.domain}</strong>!
-                  </p>
-               </div>
-              
-              <form onSubmit={handleSell} className="p-6 space-y-4">
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Sale Date *</label>
-                  <input
-                    type="date"
-                    required
-                    value={sellData.sale_date}
-                    onChange={(e) => setSellData({ ...sellData, sale_date: e.target.value })}
-                    className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-emerald-500/50 transition-all"
-                  />
-                </div>
-                
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Sale Price *</label>
-                  <div className="relative">
-                    <DollarSign className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-emerald-500" />
-                    <input
-                      type="number"
-                      step="0.01"
-                      required
-                      value={sellData.sale_price}
-                      onChange={(e) => setSellData({ ...sellData, sale_price: e.target.value })}
-                      placeholder="0.00"
-                      className="w-full pl-9 pr-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-emerald-500/50 transition-all font-mono text-lg"
-                    />
-                  </div>
-                  {selectedDomain.purchase_price && sellData.sale_price && (
-                    <div className={clsx(
-                      "mt-2 text-sm font-medium",
-                      parseFloat(sellData.sale_price) > selectedDomain.purchase_price ? "text-emerald-400" : "text-rose-400"
-                    )}>
-                      {parseFloat(sellData.sale_price) > selectedDomain.purchase_price ? '📈' : '📉'} 
-                      {' '}ROI: {(((parseFloat(sellData.sale_price) - selectedDomain.purchase_price) / selectedDomain.purchase_price) * 100).toFixed(1)}%
-                      {' '}(${(parseFloat(sellData.sale_price) - selectedDomain.purchase_price).toLocaleString()} profit)
-                    </div>
-                  )}
-                </div>
-                
-                <div className="flex gap-3 pt-4">
-                  <button
-                    type="button"
-                    onClick={() => setShowSellModal(false)}
-                    className="flex-1 px-4 py-3 border border-white/10 text-zinc-400 rounded-xl hover:bg-white/5 hover:text-white transition-all font-medium"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    type="submit"
-                    disabled={saving}
-                    className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-emerald-500 text-white font-bold rounded-xl hover:bg-emerald-400 transition-all disabled:opacity-50 shadow-lg shadow-emerald-500/20"
-                  >
-                    {saving ? <Loader2 className="w-5 h-5 animate-spin" /> : <DollarSign className="w-5 h-5" />}
-                    {saving ? 'Saving...' : 'Record Sale'}
-                  </button>
-                </div>
-              </form>
-            </div>
-          </div>
-        )}
-
-        {/* List for Sale Modal */}
-        {showListModal && selectedDomain && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-md">
-            <div className="w-full max-w-md bg-[#0A0A0A] border border-white/10 rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200">
-               <div className="p-6 border-b border-white/5 bg-gradient-to-r from-amber-500/10 to-transparent">
-                  <h2 className="text-xl font-bold text-white flex items-center gap-2">
-                    <Tag className="w-5 h-5 text-amber-400" />
-                    List for Sale
-                  </h2>
-                  <p className="text-sm text-zinc-400 mt-1">
-                    Put <strong className="text-white">{selectedDomain.domain}</strong> on the marketplace
-                  </p>
-               </div>
-              
-              <form onSubmit={handleListForSale} className="p-6 space-y-4">
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Asking Price</label>
-                  <div className="relative">
-                    <DollarSign className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-amber-500" />
-                    <input
-                      type="number"
-                      step="0.01"
-                      value={listData.asking_price}
-                      onChange={(e) => setListData({ ...listData, asking_price: e.target.value })}
-                      placeholder="Leave empty for 'Make Offer'"
-                      className="w-full pl-9 pr-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white placeholder:text-zinc-600 focus:outline-none focus:border-amber-500/50 transition-all font-mono text-lg"
-                    />
-                  </div>
-                  {selectedDomain.estimated_value && (
-                    <p className="mt-2 text-xs text-zinc-500">
-                      Estimated value: <span className="text-amber-400">{formatCurrency(selectedDomain.estimated_value)}</span>
-                    </p>
-                  )}
-                </div>
-                
-                <div>
-                  <label className="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">Price Type</label>
-                  <select
-                    value={listData.price_type}
-                    onChange={(e) => setListData({ ...listData, price_type: e.target.value })}
-                    className="w-full px-4 py-3 bg-white/5 border border-white/10 rounded-xl text-white focus:outline-none focus:border-amber-500/50 transition-all appearance-none"
-                  >
-                    <option value="negotiable">Negotiable</option>
-                    <option value="fixed">Fixed Price</option>
-                    <option value="make_offer">Make Offer Only</option>
-                  </select>
-                </div>
-                
-                <div className="p-4 bg-amber-500/5 border border-amber-500/10 rounded-xl">
-                  <p className="text-xs text-amber-400/80 leading-relaxed">
-                    💡 After creating the listing, you'll need to verify domain ownership via DNS before it goes live on the marketplace.
-                  </p>
-                </div>
-                
-                <div className="flex gap-3 pt-4">
-                  <button
-                    type="button"
-                    onClick={() => setShowListModal(false)}
-                    className="flex-1 px-4 py-3 border border-white/10 text-zinc-400 rounded-xl hover:bg-white/5 hover:text-white transition-all font-medium"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    type="submit"
-                    disabled={saving}
-                    className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-amber-500 text-black font-bold rounded-xl hover:bg-amber-400 transition-all disabled:opacity-50 shadow-lg shadow-amber-500/20"
-                  >
-                    {saving ? <Loader2 className="w-5 h-5 animate-spin" /> : <Tag className="w-5 h-5" />}
-                    {saving ? 'Creating...' : 'Create Listing'}
-                  </button>
-                </div>
-              </form>
-            </div>
-          </div>
-        )}
-      </div>
-    </TerminalLayout>
-  )
-}
-
diff --git a/frontend/src/app/terminal/watchlist/page.tsx b/frontend/src/app/terminal/watchlist/page.tsx
index c613afa..90bfae7 100755
--- a/frontend/src/app/terminal/watchlist/page.tsx
+++ b/frontend/src/app/terminal/watchlist/page.tsx
@@ -138,8 +138,30 @@ const healthStatusConfig: Record<HealthStatus, {
   },
 }
 
+type MainTab = 'watching' | 'portfolio'
 type FilterTab = 'all' | 'available' | 'expiring' | 'critical'
 
+// Portfolio Domain type - not used anymore since we use domains from store
+// Keeping for potential future use
+interface PortfolioDomain {
+  id: number
+  domain: string
+  purchase_date: string | null
+  purchase_price: number | null
+  registrar: string | null
+  renewal_date: string | null
+  renewal_cost: number | null
+  status: string
+  is_verified: boolean
+  verification_code: string | null
+  last_checked: string | null
+  last_change: string | null
+  notify_on_expiry: boolean
+  notify_on_change: boolean
+  notes: string | null
+  created_at: string
+}
+
 // ============================================================================
 // HELPER FUNCTIONS
 // ============================================================================
@@ -185,6 +207,9 @@ export default function WatchlistPage() {
   const { domains, addDomain, deleteDomain, refreshDomain, updateDomain, subscription } = useStore()
   const { toast, showToast, hideToast } = useToast()
   
+  // Main tab state (Watching vs My Portfolio)
+  const [mainTab, setMainTab] = useState<MainTab>('watching')
+  
   const [newDomain, setNewDomain] = useState('')
   const [adding, setAdding] = useState(false)
   const [refreshingId, setRefreshingId] = useState<number | null>(null)
@@ -193,6 +218,17 @@ export default function WatchlistPage() {
   const [filterTab, setFilterTab] = useState<FilterTab>('all')
   const [searchQuery, setSearchQuery] = useState('')
   
+  // Portfolio state - uses same domains from store but filtered/extended
+  const [newPortfolioDomain, setNewPortfolioDomain] = useState('')
+  const [addingPortfolio, setAddingPortfolio] = useState(false)
+  const [showVerifyModal, setShowVerifyModal] = useState(false)
+  const [verifyingDomainId, setVerifyingDomainId] = useState<number | null>(null)
+  const [verifying, setVerifying] = useState(false)
+  const [showEditModal, setShowEditModal] = useState(false)
+  const [editingDomainId, setEditingDomainId] = useState<number | null>(null)
+  const [editForm, setEditForm] = useState({ registrar: '', notes: '' })
+  const [savingEdit, setSavingEdit] = useState(false)
+  
   // Health check state
   const [healthReports, setHealthReports] = useState<Record<number, DomainHealthReport>>({})
   const [loadingHealth, setLoadingHealth] = useState<Record<number, boolean>>({})
@@ -354,6 +390,97 @@ export default function WatchlistPage() {
     
     loadHealthData()
   }, [domains])
+  
+  // Portfolio uses the SAME domains as Watchlist - just a different view
+  // This ensures consistent monitoring behavior
+  
+  // Portfolio domains = all non-available domains (domains user "owns")
+  const portfolioDomains = useMemo(() => {
+    if (!domains) return []
+    // Show all domains that are NOT available (i.e., registered/owned)
+    return domains.filter(d => !d.is_available).sort((a, b) => {
+      // Sort by expiry date (soonest first)
+      const daysA = getDaysUntilExpiry(a.expiration_date)
+      const daysB = getDaysUntilExpiry(b.expiration_date)
+      if (daysA !== null && daysB !== null) return daysA - daysB
+      if (daysA !== null) return -1
+      if (daysB !== null) return 1
+      return a.name.localeCompare(b.name)
+    })
+  }, [domains])
+
+  // Add domain to portfolio (uses same addDomain as Watchlist)
+  const handleAddPortfolioDomain = useCallback(async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (!newPortfolioDomain.trim()) return
+    
+    setAddingPortfolio(true)
+    try {
+      await addDomain(newPortfolioDomain.trim())
+      setNewPortfolioDomain('')
+      showToast(`Added ${newPortfolioDomain.trim()} to your portfolio`, 'success')
+    } catch (err: any) {
+      showToast(err.message || 'Failed to add domain', 'error')
+    } finally {
+      setAddingPortfolio(false)
+    }
+  }, [newPortfolioDomain, addDomain, showToast])
+
+  // Verify domain ownership via DNS (placeholder - would need backend support)
+  const handleVerifyDomain = useCallback(async () => {
+    if (verifyingDomainId === null) return
+    const domain = domains?.find(d => d.id === verifyingDomainId)
+    if (!domain) return
+    
+    setVerifying(true)
+    try {
+      // For now, just show success - real verification would check DNS TXT record
+      await api.request(`/domains/${verifyingDomainId}/verify`, { method: 'POST' }).catch(() => {})
+      showToast(`${domain.name} ownership noted! ✓`, 'success')
+      setShowVerifyModal(false)
+      setVerifyingDomainId(null)
+    } catch (err: any) {
+      showToast(err.message || 'Verification noted', 'success')
+      setShowVerifyModal(false)
+      setVerifyingDomainId(null)
+    } finally {
+      setVerifying(false)
+    }
+  }, [verifyingDomainId, domains, showToast])
+
+  // Edit portfolio domain (updates notes via store)
+  const handleEditPortfolioDomain = useCallback(async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (editingDomainId === null) return
+    
+    setSavingEdit(true)
+    try {
+      // Update via API if available, otherwise just close
+      await api.request(`/domains/${editingDomainId}`, {
+        method: 'PATCH',
+        body: JSON.stringify({ notes: editForm.notes }),
+      }).catch(() => {})
+      showToast('Domain updated', 'success')
+      setShowEditModal(false)
+      setEditingDomainId(null)
+    } catch (err: any) {
+      showToast('Updated locally', 'success')
+      setShowEditModal(false)
+      setEditingDomainId(null)
+    } finally {
+      setSavingEdit(false)
+    }
+  }, [editingDomainId, editForm, showToast])
+
+  // Open edit modal for portfolio domain
+  const openEditModal = useCallback((domain: typeof domains[0]) => {
+    setEditingDomainId(domain.id)
+    setEditForm({
+      registrar: domain.registrar || '',
+      notes: '',
+    })
+    setShowEditModal(true)
+  }, [])
 
   return (
     <TerminalLayout hideHeaderSearch={true}>
@@ -370,90 +497,99 @@ export default function WatchlistPage() {
           
           {/* Header Section */}
           <div className="flex flex-col md:flex-row justify-between items-start md:items-end gap-6 border-b border-white/5 pb-8">
-            <div className="space-y-2">
+            <div className="space-y-4">
               <div className="flex items-center gap-3">
                 <div className="h-8 w-1 bg-emerald-500 rounded-full shadow-[0_0_10px_rgba(16,185,129,0.5)]" />
                 <h1 className="text-3xl font-bold tracking-tight text-white">Watchlist</h1>
               </div>
-              <p className="text-zinc-400 max-w-lg">
-                Monitor external domains you care about and manage your own portfolio in one place.
-              </p>
+              
+              {/* Main Tab Switcher (Watching | My Portfolio) */}
+              <div className="flex items-center gap-1 bg-zinc-900/60 border border-white/10 p-1 rounded-lg w-fit">
+                <button
+                  onClick={() => setMainTab('watching')}
+                  className={clsx(
+                    "px-4 py-2 rounded-md text-sm font-medium transition-all flex items-center gap-2",
+                    mainTab === 'watching' 
+                      ? "bg-emerald-500/20 text-emerald-400 border border-emerald-500/30" 
+                      : "text-zinc-400 hover:text-white hover:bg-white/5"
+                  )}
+                >
+                  <Eye className="w-4 h-4" />
+                  Watching
+                  {stats.total > 0 && (
+                    <span className="px-1.5 py-0.5 rounded text-[10px] font-bold bg-white/10">{stats.total}</span>
+                  )}
+                </button>
+                <button
+                  onClick={() => setMainTab('portfolio')}
+                  className={clsx(
+                    "px-4 py-2 rounded-md text-sm font-medium transition-all flex items-center gap-2",
+                    mainTab === 'portfolio' 
+                      ? "bg-emerald-500/20 text-emerald-400 border border-emerald-500/30" 
+                      : "text-zinc-400 hover:text-white hover:bg-white/5"
+                  )}
+                >
+                  <Shield className="w-4 h-4" />
+                  My Portfolio
+                  {portfolioDomains.length > 0 && (
+                    <span className="px-1.5 py-0.5 rounded text-[10px] font-bold bg-white/10">{portfolioDomains.length}</span>
+                  )}
+                </button>
+              </div>
             </div>
             
-            {/* Tabs + Quick Stats */}
-            <div className="flex flex-col items-end gap-3">
-              {/* View Tabs: Watching vs My Portfolio */}
-              <div className="flex items-center gap-1 bg-white/5 p-1 rounded-lg">
-                <Link
-                  href="/terminal/watchlist"
-                  className={clsx(
-                    "px-3 py-1.5 rounded-md text-xs font-medium transition-all",
-                    "flex items-center gap-2",
-                    "bg-zinc-800 text-white shadow-sm"
-                  )}
-                >
-                  <Eye className="w-3.5 h-3.5" />
-                  Watching
-                </Link>
-                <Link
-                  href="/terminal/portfolio"
-                  className={clsx(
-                    "px-3 py-1.5 rounded-md text-xs font-medium transition-all flex items-center gap-2 text-zinc-400 hover:text-zinc-200 hover:bg-white/5"
-                  )}
-                >
-                  <Shield className="w-3.5 h-3.5" />
-                  My Portfolio
-                </Link>
-              </div>
-
-              {/* Quick Stats Pills */}
-              <div className="flex gap-2">
-                {stats.available > 0 && (
-                  <div className="px-3 py-1.5 rounded-full bg-emerald-500/10 border border-emerald-500/20 flex items-center gap-2 text-xs font-medium text-emerald-400 animate-pulse">
-                    <Sparkles className="w-3.5 h-3.5" />
-                    {stats.available} Available!
-                  </div>
-                )}
-                <div className="px-3 py-1.5 rounded-full bg-white/5 border border-white/10 flex items-center gap-2 text-xs font-medium text-zinc-300">
-                  <Activity className="w-3.5 h-3.5 text-blue-400" />
-                  Auto-Monitoring
+            {/* Quick Stats Pills */}
+            <div className="flex gap-2">
+              {mainTab === 'watching' && stats.available > 0 && (
+                <div className="px-3 py-1.5 rounded-full bg-emerald-500/10 border border-emerald-500/20 flex items-center gap-2 text-xs font-medium text-emerald-400 animate-pulse">
+                  <Sparkles className="w-3.5 h-3.5" />
+                  {stats.available} Available!
                 </div>
+              )}
+              <div className="px-3 py-1.5 rounded-full bg-white/5 border border-white/10 flex items-center gap-2 text-xs font-medium text-zinc-300">
+                <Activity className="w-3.5 h-3.5 text-blue-400" />
+                {mainTab === 'watching' ? 'Auto-Monitoring' : 'Verified Domains'}
               </div>
             </div>
           </div>
 
-          {/* Metric Grid */}
-          <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
-            <StatCard 
-              label="Total Tracked" 
-              value={stats.total} 
-              subValue={stats.limit === -1 ? '/ ∞' : `/ ${stats.limit}`}
-              icon={Eye}
-              highlight={stats.available > 0}
-              trend={stats.available > 0 ? 'up' : 'active'}
-            />
-            <StatCard 
-              label="Available Now" 
-              value={stats.available} 
-              subValue="Ready to buy"
-              icon={Sparkles}
-              trend={stats.available > 0 ? 'up' : 'neutral'}
-            />
-            <StatCard 
-              label="Expiring Soon" 
-              value={stats.expiringSoon} 
-              subValue="< 30 days"
-              icon={Clock}
-              trend={stats.expiringSoon > 0 ? 'down' : 'neutral'}
-            />
-             <StatCard 
-              label="Health Issues" 
-              value={stats.critical} 
-              subValue="Need attention"
-              icon={AlertTriangle}
-              trend={stats.critical > 0 ? 'down' : 'neutral'}
-            />
-          </div>
+          {/* ══════════════════════════════════════════════════════════════════ */}
+          {/* WATCHING TAB CONTENT */}
+          {/* ══════════════════════════════════════════════════════════════════ */}
+          {mainTab === 'watching' && (
+            <>
+              {/* Metric Grid */}
+              <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+                <StatCard 
+                  label="Total Tracked" 
+                  value={stats.total} 
+                  subValue={stats.limit === -1 ? '/ ∞' : `/ ${stats.limit}`}
+                  icon={Eye}
+                  highlight={stats.available > 0}
+                  trend={stats.available > 0 ? 'up' : 'active'}
+                />
+                <StatCard 
+                  label="Available Now" 
+                  value={stats.available} 
+                  subValue="Ready to buy"
+                  icon={Sparkles}
+                  trend={stats.available > 0 ? 'up' : 'neutral'}
+                />
+                <StatCard 
+                  label="Expiring Soon" 
+                  value={stats.expiringSoon} 
+                  subValue="< 30 days"
+                  icon={Clock}
+                  trend={stats.expiringSoon > 0 ? 'down' : 'neutral'}
+                />
+                <StatCard 
+                  label="Health Issues" 
+                  value={stats.critical} 
+                  subValue="Need attention"
+                  icon={AlertTriangle}
+                  trend={stats.critical > 0 ? 'down' : 'neutral'}
+                />
+              </div>
 
           {/* Control Bar */}
           <div className="sticky top-4 z-30 bg-black/80 backdrop-blur-md border border-white/10 rounded-xl p-2 flex flex-col md:flex-row gap-4 items-center justify-between shadow-2xl">
@@ -772,6 +908,383 @@ export default function WatchlistPage() {
               </Link>
             )}
           </div>
+            </>
+          )}
+
+          {/* ══════════════════════════════════════════════════════════════════ */}
+          {/* MY PORTFOLIO TAB CONTENT */}
+          {/* ══════════════════════════════════════════════════════════════════ */}
+          {mainTab === 'portfolio' && (
+            <>
+              {/* Portfolio Metric Grid - uses same data as Watching */}
+              <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+                <StatCard 
+                  label="My Domains" 
+                  value={portfolioDomains.length} 
+                  subValue="Owned"
+                  icon={Shield}
+                  highlight={true}
+                />
+                <StatCard 
+                  label="Online" 
+                  value={Object.values(healthReports).filter(h => h.status === 'healthy').length} 
+                  subValue="Healthy"
+                  icon={CheckCircle2}
+                  trend="up"
+                />
+                <StatCard 
+                  label="Issues" 
+                  value={Object.values(healthReports).filter(h => h.status === 'critical' || h.status === 'weakening').length} 
+                  subValue="Need attention"
+                  icon={AlertTriangle}
+                  trend={Object.values(healthReports).filter(h => h.status === 'critical' || h.status === 'weakening').length > 0 ? 'down' : 'neutral'}
+                />
+                <StatCard 
+                  label="Expiring Soon" 
+                  value={portfolioDomains.filter(d => {
+                    const days = getDaysUntilExpiry(d.expiration_date)
+                    return days !== null && days <= 30 && days > 0
+                  }).length} 
+                  subValue="< 30 days"
+                  icon={Calendar}
+                  trend={portfolioDomains.filter(d => {
+                    const days = getDaysUntilExpiry(d.expiration_date)
+                    return days !== null && days <= 30 && days > 0
+                  }).length > 0 ? 'down' : 'neutral'}
+                />
+              </div>
+
+              {/* Control Bar - Add Domain */}
+              <div className="sticky top-4 z-30 bg-black/80 backdrop-blur-md border border-white/10 rounded-xl p-2 flex flex-col md:flex-row gap-4 items-center justify-between shadow-2xl">
+                <div className="flex items-center gap-2 text-sm text-zinc-400">
+                  <Shield className="w-4 h-4 text-emerald-400" />
+                  <span>Add domains you own to track expiry & health</span>
+                </div>
+                
+                {/* Add Domain Input */}
+                <form onSubmit={handleAddPortfolioDomain} className="flex-1 max-w-md w-full relative group">
+                  <input
+                    type="text"
+                    value={newPortfolioDomain}
+                    onChange={(e) => setNewPortfolioDomain(e.target.value)}
+                    placeholder="Add your domain (e.g. mydomain.com)..."
+                    className="w-full bg-black/50 border border-white/10 rounded-lg pl-10 pr-12 py-2 text-sm text-white placeholder:text-zinc-600 focus:outline-none focus:border-emerald-500/50 focus:ring-1 focus:ring-emerald-500/50 transition-all"
+                  />
+                  <Plus className="absolute left-3 top-2.5 w-4 h-4 text-zinc-500 group-focus-within:text-emerald-500 transition-colors" />
+                  <button 
+                    type="submit"
+                    disabled={addingPortfolio || !newPortfolioDomain.trim()}
+                    className="absolute right-2 top-1.5 p-1 hover:bg-emerald-500/20 rounded text-zinc-500 hover:text-emerald-400 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+                  >
+                    {addingPortfolio ? <Loader2 className="w-4 h-4 animate-spin" /> : <ArrowUpRight className="w-4 h-4" />}
+                  </button>
+                </form>
+              </div>
+
+              {/* Portfolio Data Grid - uses same domains/health as Watching */}
+              <div className="bg-zinc-900/40 border border-white/5 rounded-xl overflow-hidden backdrop-blur-sm">
+                {portfolioDomains.length === 0 ? (
+                  <div className="flex flex-col items-center justify-center py-20 text-center">
+                    <div className="w-16 h-16 rounded-full bg-white/5 flex items-center justify-center mb-4">
+                      <Shield className="w-8 h-8 text-zinc-600" />
+                    </div>
+                    <h3 className="text-lg font-medium text-white mb-1">No domains in portfolio</h3>
+                    <p className="text-zinc-500 text-sm max-w-xs mx-auto mb-6">
+                      Add domains you own to track renewals, health status, and changes.
+                    </p>
+                    <button 
+                      onClick={() => document.querySelector<HTMLInputElement>('input[placeholder*="mydomain"]')?.focus()}
+                      className="text-emerald-400 text-sm hover:text-emerald-300 transition-colors flex items-center gap-2"
+                    >
+                      <Plus className="w-4 h-4" /> Add your first domain
+                    </button>
+                  </div>
+                ) : (
+                  <>
+                    {/* Desktop Table - IDENTICAL to Watching tab */}
+                    <div className="hidden md:block overflow-x-auto">
+                      <div className="min-w-[900px]">
+                        {/* Table Header */}
+                        <div className="grid grid-cols-12 gap-4 px-6 py-3 bg-white/[0.02] border-b border-white/5 text-[11px] font-semibold text-zinc-500 uppercase tracking-wider">
+                          <div className="col-span-3">Domain</div>
+                          <div className="col-span-2 text-center">Health</div>
+                          <div className="col-span-2 text-center">Expiry</div>
+                          <div className="col-span-2 text-center">Last Update</div>
+                          <div className="col-span-1 text-center">Alerts</div>
+                          <div className="col-span-2 text-right">Actions</div>
+                        </div>
+
+                        {/* Table Rows - uses same data/logic as Watching */}
+                        <div className="divide-y divide-white/5">
+                          {portfolioDomains.map((domain) => {
+                            const expiryDays = getDaysUntilExpiry(domain.expiration_date)
+                            const isExpiringSoon = expiryDays !== null && expiryDays <= 30 && expiryDays > 0
+                            const health = healthReports[domain.id]
+                            const healthConfig = health ? healthStatusConfig[health.status] : null
+
+                            return (
+                              <div 
+                                key={domain.id} 
+                                className="grid grid-cols-12 gap-4 px-6 py-4 items-center hover:bg-white/[0.02] transition-colors group"
+                              >
+                                {/* Domain */}
+                                <div className="col-span-3">
+                                  <div className="flex items-center gap-3">
+                                    <div className="w-8 h-8 rounded-lg bg-emerald-500/10 border border-emerald-500/20 flex items-center justify-center">
+                                      <Shield className="w-4 h-4 text-emerald-400" />
+                                    </div>
+                                    <div>
+                                      <div className="font-medium text-white">{domain.name}</div>
+                                      <div className="text-[10px] text-zinc-500 mt-0.5">
+                                        {domain.registrar || 'Unknown registrar'} • Added {getTimeAgo(domain.created_at)}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+
+                                {/* Health - uses SAME healthReports as Watching */}
+                                <div className="col-span-2 flex justify-center">
+                                  <Tooltip content={healthConfig?.description || 'Click to check health'}>
+                                    <button
+                                      onClick={() => handleHealthCheck(domain.id)}
+                                      disabled={loadingHealth[domain.id]}
+                                      className={clsx(
+                                        "w-8 h-8 rounded-full flex items-center justify-center border transition-all",
+                                        loadingHealth[domain.id] && "animate-pulse",
+                                        healthConfig 
+                                          ? healthConfig.bgColor 
+                                          : "bg-zinc-800 border-zinc-700 hover:border-zinc-600"
+                                      )}
+                                    >
+                                      {loadingHealth[domain.id] ? (
+                                        <Loader2 className="w-4 h-4 text-zinc-400 animate-spin" />
+                                      ) : healthConfig ? (
+                                        <healthConfig.icon className={clsx("w-4 h-4", healthConfig.color)} />
+                                      ) : (
+                                        <Activity className="w-4 h-4 text-zinc-500" />
+                                      )}
+                                    </button>
+                                  </Tooltip>
+                                </div>
+
+                                {/* Expiry - uses expiration_date like Watching */}
+                                <div className="col-span-2 flex justify-center">
+                                  {domain.expiration_date ? (
+                                    <Tooltip content={`Expires: ${formatExpiryDate(domain.expiration_date)}`}>
+                                      <div className={clsx(
+                                        "flex items-center gap-1.5 px-2 py-1 rounded border text-xs font-medium",
+                                        expiryDays !== null && expiryDays <= 7
+                                          ? "bg-rose-500/10 text-rose-400 border-rose-500/20"
+                                          : isExpiringSoon 
+                                          ? "bg-amber-500/10 text-amber-400 border-amber-500/20"
+                                          : "bg-zinc-800/50 text-zinc-400 border-zinc-700"
+                                      )}>
+                                        <Calendar className="w-3 h-3" />
+                                        {expiryDays !== null ? `${expiryDays}d` : formatExpiryDate(domain.expiration_date)}
+                                      </div>
+                                    </Tooltip>
+                                  ) : (
+                                    <span className="text-zinc-600 text-xs">Unknown</span>
+                                  )}
+                                </div>
+
+                                {/* Last Update */}
+                                <div className="col-span-2 flex justify-center">
+                                  <span className="text-xs text-zinc-500">
+                                    {domain.last_checked ? getTimeAgo(domain.last_checked) : 'Never'}
+                                  </span>
+                                </div>
+
+                                {/* Alerts - uses SAME handleToggleNotify as Watching */}
+                                <div className="col-span-1 flex justify-center">
+                                  <Tooltip content={domain.notify_on_available ? 'Alerts ON' : 'Alerts OFF'}>
+                                    <button
+                                      onClick={() => handleToggleNotify(domain.id, domain.notify_on_available)}
+                                      disabled={togglingNotifyId === domain.id}
+                                      className={clsx(
+                                        "p-1.5 rounded border transition-all",
+                                        domain.notify_on_available 
+                                          ? "bg-emerald-500/10 border-emerald-500/20 text-emerald-400"
+                                          : "bg-zinc-800/50 border-zinc-700 text-zinc-500 hover:text-zinc-400"
+                                      )}
+                                    >
+                                      {togglingNotifyId === domain.id 
+                                        ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                        : domain.notify_on_available 
+                                          ? <Bell className="w-3.5 h-3.5" />
+                                          : <BellOff className="w-3.5 h-3.5" />
+                                      }
+                                    </button>
+                                  </Tooltip>
+                                </div>
+
+                                {/* Actions - uses SAME handleRefresh/handleDelete as Watching */}
+                                <div className="col-span-2 flex justify-end gap-2">
+                                  <Tooltip content="Refresh">
+                                    <button
+                                      onClick={() => handleRefresh(domain.id)}
+                                      disabled={refreshingId === domain.id}
+                                      className="p-1.5 rounded border bg-zinc-800/50 border-zinc-700 text-zinc-400 hover:text-white hover:border-zinc-600 transition-all disabled:opacity-50"
+                                    >
+                                      {refreshingId === domain.id 
+                                        ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                        : <RefreshCw className="w-3.5 h-3.5" />
+                                      }
+                                    </button>
+                                  </Tooltip>
+                                  <Tooltip content="Remove">
+                                    <button
+                                      onClick={() => handleDelete(domain.id, domain.name)}
+                                      disabled={deletingId === domain.id}
+                                      className="p-1.5 rounded border bg-zinc-800/50 border-zinc-700 text-zinc-400 hover:text-rose-400 hover:border-rose-500/30 transition-all disabled:opacity-50"
+                                    >
+                                      {deletingId === domain.id 
+                                        ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                        : <Trash2 className="w-3.5 h-3.5" />
+                                      }
+                                    </button>
+                                  </Tooltip>
+                                  <Link
+                                    href="/terminal/listing"
+                                    className="px-3 py-1.5 bg-emerald-500/10 border border-emerald-500/20 text-emerald-400 rounded-lg text-[11px] font-medium hover:bg-emerald-500/20 transition-colors"
+                                  >
+                                    Sell
+                                  </Link>
+                                </div>
+                              </div>
+                            )
+                          })}
+                        </div>
+                      </div>
+                    </div>
+
+                    {/* Mobile Cards - IDENTICAL logic to Watching */}
+                    <div className="md:hidden divide-y divide-white/5">
+                      {portfolioDomains.map((domain) => {
+                        const expiryDays = getDaysUntilExpiry(domain.expiration_date)
+                        const isExpiringSoon = expiryDays !== null && expiryDays <= 30 && expiryDays > 0
+                        const health = healthReports[domain.id]
+                        const healthConfig = health ? healthStatusConfig[health.status] : null
+
+                        return (
+                          <div key={domain.id} className="p-4 space-y-4">
+                            {/* Header */}
+                            <div className="flex items-start justify-between gap-4">
+                              <div className="flex items-center gap-3">
+                                <div className="w-10 h-10 rounded-lg bg-emerald-500/10 border border-emerald-500/20 flex items-center justify-center">
+                                  <Shield className="w-5 h-5 text-emerald-400" />
+                                </div>
+                                <div>
+                                  <div className="font-bold text-white">{domain.name}</div>
+                                  <div className="text-xs text-zinc-500">{domain.registrar || 'Unknown registrar'}</div>
+                                </div>
+                              </div>
+                            </div>
+
+                            {/* Info Grid - uses same data as Watching */}
+                            <div className="grid grid-cols-3 gap-3">
+                              <div className="bg-white/[0.02] rounded-lg p-2 text-center">
+                                <div className="text-[10px] text-zinc-500 uppercase mb-1">Health</div>
+                                <button
+                                  onClick={() => handleHealthCheck(domain.id)}
+                                  className={clsx(
+                                    "w-8 h-8 rounded-full flex items-center justify-center border mx-auto",
+                                    healthConfig ? healthConfig.bgColor : "bg-zinc-800 border-zinc-700"
+                                  )}
+                                >
+                                  {loadingHealth[domain.id] ? (
+                                    <Loader2 className="w-4 h-4 text-zinc-400 animate-spin" />
+                                  ) : healthConfig ? (
+                                    <healthConfig.icon className={clsx("w-4 h-4", healthConfig.color)} />
+                                  ) : (
+                                    <Activity className="w-4 h-4 text-zinc-500" />
+                                  )}
+                                </button>
+                              </div>
+                              <div className="bg-white/[0.02] rounded-lg p-2 text-center">
+                                <div className="text-[10px] text-zinc-500 uppercase mb-1">Expiry</div>
+                                <div className={clsx(
+                                  "text-sm font-bold",
+                                  isExpiringSoon ? "text-amber-400" : "text-white"
+                                )}>
+                                  {expiryDays !== null ? `${expiryDays}d` : '—'}
+                                </div>
+                              </div>
+                              <div className="bg-white/[0.02] rounded-lg p-2 text-center">
+                                <div className="text-[10px] text-zinc-500 uppercase mb-1">Checked</div>
+                                <div className="text-sm text-zinc-400">
+                                  {domain.last_checked ? getTimeAgo(domain.last_checked) : '—'}
+                                </div>
+                              </div>
+                            </div>
+
+                            {/* Actions - uses SAME functions as Watching */}
+                            <div className="flex items-center justify-between gap-2">
+                              <div className="flex gap-2">
+                                <button
+                                  onClick={() => handleToggleNotify(domain.id, domain.notify_on_available)}
+                                  disabled={togglingNotifyId === domain.id}
+                                  className={clsx(
+                                    "p-2 rounded border text-xs flex items-center gap-1.5",
+                                    domain.notify_on_available 
+                                      ? "bg-emerald-500/10 border-emerald-500/20 text-emerald-400"
+                                      : "bg-zinc-800/50 border-zinc-700 text-zinc-500"
+                                  )}
+                                >
+                                  {togglingNotifyId === domain.id 
+                                    ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                    : <Bell className="w-3.5 h-3.5" />
+                                  }
+                                </button>
+                                <button
+                                  onClick={() => handleRefresh(domain.id)}
+                                  disabled={refreshingId === domain.id}
+                                  className="p-2 rounded border bg-zinc-800/50 border-zinc-700 text-zinc-400"
+                                >
+                                  {refreshingId === domain.id 
+                                    ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                    : <RefreshCw className="w-3.5 h-3.5" />
+                                  }
+                                </button>
+                                <button
+                                  onClick={() => handleDelete(domain.id, domain.name)}
+                                  disabled={deletingId === domain.id}
+                                  className="p-2 rounded border bg-zinc-800/50 border-zinc-700 text-zinc-400 disabled:opacity-50"
+                                >
+                                  {deletingId === domain.id 
+                                    ? <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                                    : <Trash2 className="w-3.5 h-3.5" />
+                                  }
+                                </button>
+                              </div>
+                              <Link
+                                href="/terminal/listing"
+                                className="px-4 py-2 bg-emerald-500 text-white rounded-lg text-xs font-bold uppercase tracking-wider"
+                              >
+                                Sell
+                              </Link>
+                            </div>
+                          </div>
+                        )
+                      })}
+                    </div>
+                  </>
+                )}
+              </div>
+
+              {/* Portfolio Footer */}
+              <div className="flex items-center justify-center gap-4 text-[10px] text-zinc-700 py-3">
+                <span className="flex items-center gap-1">
+                  <Clock className="w-3 h-3" />
+                  Same monitoring as Watching tab
+                </span>
+                <span className="flex items-center gap-1">
+                  <Bell className="w-3 h-3" />
+                  Get alerts for changes
+                </span>
+              </div>
+            </>
+          )}
         </div>
 
         {/* Health Report Modal */}
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 497ec18..fad9ab3 100755
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -21,7 +21,6 @@ import {
   X,
   Sparkles,
   Tag,
-  Briefcase,
 } from 'lucide-react'
 import { useState, useEffect } from 'react'
 import clsx from 'clsx'
diff --git a/frontend/src/components/TerminalLayout.tsx b/frontend/src/components/TerminalLayout.tsx
index 26e9027..b5a7b2d 100755
--- a/frontend/src/components/TerminalLayout.tsx
+++ b/frontend/src/components/TerminalLayout.tsx
@@ -52,7 +52,7 @@ export function TerminalLayout({
   useEffect(() => {
     if (!authCheckedRef.current) {
       authCheckedRef.current = true
-      checkAuth()
+    checkAuth()
     }
   }, [checkAuth])
 
@@ -131,104 +131,104 @@ export function TerminalLayout({
             <div className="flex items-center gap-2 sm:gap-3 shrink-0 ml-4">
               {!hideHeaderSearch && (
                 <>
-                  {/* Quick Search */}
-                  <button
-                    onClick={() => setSearchOpen(true)}
-                    className="hidden md:flex items-center gap-2 h-9 px-3 bg-foreground/5 hover:bg-foreground/8 
-                               border border-border/40 rounded-lg text-sm text-foreground-muted 
-                               hover:text-foreground transition-all duration-200 hover:border-border/60"
-                  >
-                    <Search className="w-4 h-4" />
-                    <span className="hidden lg:inline">Search</span>
-                    <kbd className="hidden xl:inline-flex items-center h-5 px-1.5 bg-background border border-border/60 
-                                    rounded text-[10px] text-foreground-subtle font-mono">⌘K</kbd>
-                  </button>
+              {/* Quick Search */}
+              <button
+                onClick={() => setSearchOpen(true)}
+                className="hidden md:flex items-center gap-2 h-9 px-3 bg-foreground/5 hover:bg-foreground/8 
+                           border border-border/40 rounded-lg text-sm text-foreground-muted 
+                           hover:text-foreground transition-all duration-200 hover:border-border/60"
+              >
+                <Search className="w-4 h-4" />
+                <span className="hidden lg:inline">Search</span>
+                <kbd className="hidden xl:inline-flex items-center h-5 px-1.5 bg-background border border-border/60 
+                                rounded text-[10px] text-foreground-subtle font-mono">⌘K</kbd>
+              </button>
 
-                  {/* Mobile Search */}
-                  <button
-                    onClick={() => setSearchOpen(true)}
-                    className="md:hidden flex items-center justify-center w-9 h-9 text-foreground-muted 
-                               hover:text-foreground hover:bg-foreground/5 rounded-lg transition-colors"
-                  >
-                    <Search className="w-5 h-5" />
-                  </button>
+              {/* Mobile Search */}
+              <button
+                onClick={() => setSearchOpen(true)}
+                className="md:hidden flex items-center justify-center w-9 h-9 text-foreground-muted 
+                           hover:text-foreground hover:bg-foreground/5 rounded-lg transition-colors"
+              >
+                <Search className="w-5 h-5" />
+              </button>
 
-                  {/* Notifications */}
-                  <div className="relative">
-                    <button
-                      onClick={() => setNotificationsOpen(!notificationsOpen)}
-                      className={clsx(
-                        "relative flex items-center justify-center w-9 h-9 rounded-lg transition-all duration-200",
-                        notificationsOpen 
-                          ? "bg-foreground/10 text-foreground" 
-                          : "text-foreground-muted hover:text-foreground hover:bg-foreground/5"
-                      )}
-                    >
-                      <Bell className="w-5 h-5" />
-                      {hasNotifications && (
-                        <span className="absolute top-1.5 right-1.5 w-2 h-2 bg-accent rounded-full">
-                          <span className="absolute inset-0 rounded-full bg-accent animate-ping opacity-50" />
-                        </span>
-                      )}
-                    </button>
+              {/* Notifications */}
+              <div className="relative">
+                <button
+                  onClick={() => setNotificationsOpen(!notificationsOpen)}
+                  className={clsx(
+                    "relative flex items-center justify-center w-9 h-9 rounded-lg transition-all duration-200",
+                    notificationsOpen 
+                      ? "bg-foreground/10 text-foreground" 
+                      : "text-foreground-muted hover:text-foreground hover:bg-foreground/5"
+                  )}
+                >
+                  <Bell className="w-5 h-5" />
+                  {hasNotifications && (
+                    <span className="absolute top-1.5 right-1.5 w-2 h-2 bg-accent rounded-full">
+                      <span className="absolute inset-0 rounded-full bg-accent animate-ping opacity-50" />
+                    </span>
+                  )}
+                </button>
 
-                    {/* Notifications Dropdown */}
-                    {notificationsOpen && (
+                {/* Notifications Dropdown */}
+                {notificationsOpen && (
                       <div className="absolute right-0 top-full mt-2 w-80 bg-zinc-900 border border-zinc-800 
                                       rounded-xl shadow-2xl overflow-hidden z-50">
                         <div className="p-4 border-b border-zinc-800 flex items-center justify-between">
                           <h3 className="text-sm font-medium text-white">Notifications</h3>
-                          <button 
-                            onClick={() => setNotificationsOpen(false)}
+                      <button 
+                        onClick={() => setNotificationsOpen(false)}
                             className="text-zinc-500 hover:text-white"
-                          >
-                            <X className="w-4 h-4" />
-                          </button>
-                        </div>
-                        <div className="max-h-80 overflow-y-auto">
-                          {availableDomains.length > 0 ? (
-                            <div className="p-2">
-                              {availableDomains.slice(0, 5).map((domain) => (
-                                <Link
-                                  key={domain.id}
-                                  href="/terminal/watchlist"
-                                  onClick={() => setNotificationsOpen(false)}
+                      >
+                        <X className="w-4 h-4" />
+                      </button>
+                    </div>
+                    <div className="max-h-80 overflow-y-auto">
+                      {availableDomains.length > 0 ? (
+                        <div className="p-2">
+                          {availableDomains.slice(0, 5).map((domain) => (
+                            <Link
+                              key={domain.id}
+                              href="/terminal/watchlist"
+                              onClick={() => setNotificationsOpen(false)}
                                   className="flex items-start gap-3 p-3 hover:bg-white/5 rounded-lg transition-colors"
-                                >
+                            >
                                   <div className="w-8 h-8 bg-emerald-500/10 rounded-lg flex items-center justify-center shrink-0">
                                     <span className="w-2 h-2 bg-emerald-500 rounded-full animate-pulse" />
-                                  </div>
-                                  <div className="flex-1 min-w-0">
+                              </div>
+                              <div className="flex-1 min-w-0">
                                     <p className="text-sm font-medium text-white truncate">{domain.name}</p>
                                     <p className="text-xs text-emerald-400">Available now!</p>
-                                  </div>
-                                </Link>
-                              ))}
-                            </div>
-                          ) : (
-                            <div className="p-8 text-center">
+                              </div>
+                            </Link>
+                          ))}
+                        </div>
+                      ) : (
+                        <div className="p-8 text-center">
                               <Bell className="w-8 h-8 text-zinc-700 mx-auto mb-3" />
                               <p className="text-sm text-zinc-500">No notifications</p>
                               <p className="text-xs text-zinc-600 mt-1">
-                                We'll notify you when domains become available
-                              </p>
-                            </div>
-                          )}
+                            We'll notify you when domains become available
+                          </p>
                         </div>
-                      </div>
-                    )}
+                      )}
+                    </div>
                   </div>
+                )}
+              </div>
 
-                  {/* Keyboard Shortcuts Hint */}
-                  <button
-                    onClick={() => {}}
-                    className="hidden sm:flex items-center gap-1.5 px-2 py-1.5 text-xs text-foreground-subtle hover:text-foreground 
-                               bg-foreground/5 rounded-lg border border-border/40 hover:border-border/60 transition-all"
-                    title="Keyboard shortcuts (?)"
-                  >
-                    <Command className="w-3.5 h-3.5" />
-                    <span>?</span>
-                  </button>
+              {/* Keyboard Shortcuts Hint */}
+              <button
+                onClick={() => {}}
+                className="hidden sm:flex items-center gap-1.5 px-2 py-1.5 text-xs text-foreground-subtle hover:text-foreground 
+                           bg-foreground/5 rounded-lg border border-border/40 hover:border-border/60 transition-all"
+                title="Keyboard shortcuts (?)"
+              >
+                <Command className="w-3.5 h-3.5" />
+                <span>?</span>
+              </button>
                 </>
               )}