diff --git a/UX_TERMINAL_UX_REPORT.md b/UX_TERMINAL_UX_REPORT.md
index 34914ad..54b176c 100644
--- a/UX_TERMINAL_UX_REPORT.md
+++ b/UX_TERMINAL_UX_REPORT.md
@@ -324,3 +324,5 @@ Empfehlungen:
 
 
 
+
+
diff --git a/backend/app/api/drops.py b/backend/app/api/drops.py
index 05f1e02..2d48bdd 100644
--- a/backend/app/api/drops.py
+++ b/backend/app/api/drops.py
@@ -274,22 +274,49 @@ async def api_track_drop(
             Domain.name == full_domain
         )
     )
-    if existing.scalar_one_or_none():
-        return {"status": "already_tracking", "domain": full_domain}
+    existing_domain = existing.scalar_one_or_none()
+    if existing_domain:
+        return {
+            "status": "already_tracking", 
+            "domain": full_domain,
+            "message": f"{full_domain} is already in your Watchlist",
+            "domain_id": existing_domain.id
+        }
     
-    # Add to watchlist with notification enabled
-    domain = Domain(
-        user_id=current_user.id,
-        name=full_domain,
-        status=DomainStatus.AVAILABLE if drop.availability_status == 'available' else DomainStatus.UNKNOWN,
-        is_available=drop.availability_status == 'available',
-        notify_on_available=True,  # Enable notification!
-    )
-    db.add(domain)
-    await db.commit()
-    
-    return {
-        "status": "tracking",
-        "domain": full_domain,
-        "message": f"Added {full_domain} to your Watchlist. You'll be notified when available!"
-    }
+    try:
+        # Add to watchlist with notification enabled
+        domain = Domain(
+            user_id=current_user.id,
+            name=full_domain,
+            status=DomainStatus.AVAILABLE if drop.availability_status == 'available' else DomainStatus.UNKNOWN,
+            is_available=drop.availability_status == 'available',
+            notify_on_available=True,  # Enable notification!
+        )
+        db.add(domain)
+        await db.commit()
+        await db.refresh(domain)
+        
+        return {
+            "status": "tracking",
+            "domain": full_domain,
+            "message": f"Added {full_domain} to your Watchlist. You'll be notified when available!",
+            "domain_id": domain.id
+        }
+    except Exception as e:
+        await db.rollback()
+        # If duplicate key error, try to find existing
+        existing = await db.execute(
+            select(Domain).where(
+                Domain.user_id == current_user.id,
+                Domain.name == full_domain
+            )
+        )
+        existing_domain = existing.scalar_one_or_none()
+        if existing_domain:
+            return {
+                "status": "already_tracking", 
+                "domain": full_domain,
+                "message": f"{full_domain} is already in your Watchlist",
+                "domain_id": existing_domain.id
+            }
+        raise HTTPException(status_code=500, detail=str(e))
diff --git a/frontend/src/components/analyze/AnalyzePanel.tsx b/frontend/src/components/analyze/AnalyzePanel.tsx
index 54d8b53..962eab5 100644
--- a/frontend/src/components/analyze/AnalyzePanel.tsx
+++ b/frontend/src/components/analyze/AnalyzePanel.tsx
@@ -178,7 +178,8 @@ export function AnalyzePanel() {
     fastMode, 
     setFastMode, 
     sectionVisibility, 
-    setSectionVisibility 
+    setSectionVisibility,
+    dropStatus,
   } = useAnalyzePanelStore()
 
   const [loading, setLoading] = useState(false)
@@ -374,6 +375,61 @@ export function AnalyzePanel() {
             </div>
           )}
 
+          {/* Drop Status Banner */}
+          {dropStatus?.is_drop && (
+            <div className="px-5 pb-3">
+              <div className={clsx(
+                "p-4 border flex items-center justify-between gap-4",
+                dropStatus.status === 'available' ? "border-accent/30 bg-accent/5" :
+                dropStatus.status === 'dropping_soon' ? "border-amber-400/30 bg-amber-400/5" :
+                dropStatus.status === 'taken' ? "border-rose-400/20 bg-rose-400/5" :
+                "border-white/10 bg-white/[0.02]"
+              )}>
+                <div className="flex items-center gap-3">
+                  {dropStatus.status === 'available' ? (
+                    <CheckCircle2 className="w-5 h-5 text-accent" />
+                  ) : dropStatus.status === 'dropping_soon' ? (
+                    <Clock className="w-5 h-5 text-amber-400" />
+                  ) : dropStatus.status === 'taken' ? (
+                    <XCircle className="w-5 h-5 text-rose-400" />
+                  ) : (
+                    <Globe className="w-5 h-5 text-white/40" />
+                  )}
+                  <div>
+                    <div className={clsx(
+                      "text-sm font-bold uppercase tracking-wider",
+                      dropStatus.status === 'available' ? "text-accent" :
+                      dropStatus.status === 'dropping_soon' ? "text-amber-400" :
+                      dropStatus.status === 'taken' ? "text-rose-400" :
+                      "text-white/50"
+                    )}>
+                      {dropStatus.status === 'available' ? 'Available Now' :
+                       dropStatus.status === 'dropping_soon' ? 'In Transition' :
+                       dropStatus.status === 'taken' ? 'Re-registered' :
+                       'Status Unknown'}
+                    </div>
+                    {dropStatus.status === 'dropping_soon' && dropStatus.deletion_date && (
+                      <div className="text-xs font-mono text-amber-400/70">
+                        Drops: {new Date(dropStatus.deletion_date).toLocaleDateString()}
+                      </div>
+                    )}
+                  </div>
+                </div>
+                {dropStatus.status === 'available' && domain && (
+                  <a
+                    href={`https://www.namecheap.com/domains/registration/results/?domain=${domain}`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="h-9 px-4 bg-accent text-black text-[10px] font-black uppercase tracking-widest flex items-center gap-1.5 hover:bg-white transition-all"
+                  >
+                    <Zap className="w-3 h-3" />
+                    Buy Now
+                  </a>
+                )}
+              </div>
+            </div>
+          )}
+
           {/* Controls */}
           <div className="px-5 pb-3 flex items-center gap-3">
             <button
diff --git a/frontend/src/components/hunt/DropsTab.tsx b/frontend/src/components/hunt/DropsTab.tsx
index c7ce156..cbd101e 100644
--- a/frontend/src/components/hunt/DropsTab.tsx
+++ b/frontend/src/components/hunt/DropsTab.tsx
@@ -73,7 +73,20 @@ interface DropsTabProps {
 }
 
 export function DropsTab({ showToast }: DropsTabProps) {
-  const openAnalyze = useAnalyzePanelStore((s) => s.open)
+  const openAnalyzePanel = useAnalyzePanelStore((s) => s.open)
+  
+  // Wrapper to open analyze panel with drop status
+  const openAnalyze = useCallback((domain: string, item?: DroppedDomain) => {
+    if (item) {
+      openAnalyzePanel(domain, {
+        status: item.availability_status || 'unknown',
+        deletion_date: item.deletion_date,
+        is_drop: true,
+      })
+    } else {
+      openAnalyzePanel(domain)
+    }
+  }, [openAnalyzePanel])
 
   // Data State
   const [items, setItems] = useState<DroppedDomain[]>([])
@@ -104,6 +117,7 @@ export function DropsTab({ showToast }: DropsTabProps) {
   // Status Checking
   const [checkingStatus, setCheckingStatus] = useState<number | null>(null)
   const [trackingDrop, setTrackingDrop] = useState<number | null>(null)
+  const [trackedDrops, setTrackedDrops] = useState<Set<number>>(new Set())
 
   // Load Stats
   const loadStats = useCallback(async () => {
@@ -214,20 +228,31 @@ export function DropsTab({ showToast }: DropsTabProps) {
   // Track a drop (add to watchlist)
   const trackDrop = useCallback(async (dropId: number, domain: string) => {
     if (trackingDrop) return
+    if (trackedDrops.has(dropId)) {
+      showToast(`${domain} is already in your Watchlist`, 'info')
+      return
+    }
+    
     setTrackingDrop(dropId)
     try {
       const result = await api.trackDrop(dropId)
+      // Mark as tracked regardless of status
+      setTrackedDrops(prev => new Set(prev).add(dropId))
+      
       if (result.status === 'already_tracking') {
         showToast(`${domain} is already in your Watchlist`, 'info')
       } else {
-        showToast(result.message, 'success')
+        showToast(result.message || `Added ${domain} to Watchlist!`, 'success')
       }
     } catch (e) {
       showToast(e instanceof Error ? e.message : 'Failed to track', 'error')
     } finally {
       setTrackingDrop(null)
     }
-  }, [trackingDrop, showToast])
+  }, [trackingDrop, trackedDrops, showToast])
+  
+  // Check if a drop is already tracked
+  const isTracked = useCallback((dropId: number) => trackedDrops.has(dropId), [trackedDrops])
 
   // Filtered and Sorted Items
   const sortedItems = useMemo(() => {
@@ -557,6 +582,7 @@ export function DropsTab({ showToast }: DropsTabProps) {
                 const fullDomain = `${item.domain}.${item.tld}`
                 const isChecking = checkingStatus === item.id
                 const isTrackingThis = trackingDrop === item.id
+                const alreadyTracked = isTracked(item.id)
                 const status = item.availability_status || 'unknown'
                 
                 // Status display config with better labels
@@ -605,7 +631,7 @@ export function DropsTab({ showToast }: DropsTabProps) {
                       <div className="flex items-start justify-between gap-4 mb-4">
                         <div className="min-w-0">
                           <button 
-                            onClick={() => openAnalyze(fullDomain)} 
+                            onClick={() => openAnalyze(fullDomain, item)} 
                             className="text-lg font-bold text-white font-mono truncate block text-left hover:text-accent transition-colors"
                           >
                             {item.domain}<span className="text-white/30">.{item.tld}</span>
@@ -635,14 +661,20 @@ export function DropsTab({ showToast }: DropsTabProps) {
                       </div>
 
                       <div className="flex gap-2">
-                        {/* Track Button - always visible */}
+                        {/* Track Button - shows "Tracked" if already in watchlist */}
                         <button
                           onClick={() => trackDrop(item.id, fullDomain)}
-                          disabled={isTrackingThis}
-                          className="h-12 px-4 border border-white/10 text-white/60 text-xs font-bold uppercase tracking-widest flex items-center justify-center gap-2 hover:bg-white/5 active:scale-[0.98] transition-all"
+                          disabled={isTrackingThis || alreadyTracked}
+                          className={clsx(
+                            "h-12 px-4 border text-xs font-bold uppercase tracking-widest flex items-center justify-center gap-2 transition-all",
+                            alreadyTracked 
+                              ? "border-accent/30 text-accent bg-accent/5 cursor-default"
+                              : "border-white/10 text-white/60 hover:bg-white/5 active:scale-[0.98]"
+                          )}
                         >
-                          {isTrackingThis ? <Loader2 className="w-4 h-4 animate-spin" /> : <Eye className="w-4 h-4" />}
-                          Track
+                          {isTrackingThis ? <Loader2 className="w-4 h-4 animate-spin" /> : 
+                           alreadyTracked ? <CheckCircle2 className="w-4 h-4" /> : <Eye className="w-4 h-4" />}
+                          {alreadyTracked ? 'Tracked' : 'Track'}
                         </button>
                         
                         {/* Action Button based on status */}
@@ -682,7 +714,7 @@ export function DropsTab({ showToast }: DropsTabProps) {
                           </button>
                         )}
                         <button 
-                          onClick={() => openAnalyze(fullDomain)} 
+                          onClick={() => openAnalyze(fullDomain, item)} 
                           className="w-14 h-12 border border-white/10 text-white/50 flex items-center justify-center hover:text-accent hover:border-accent/30 hover:bg-accent/5 transition-all"
                         >
                           <Shield className="w-5 h-5" />
@@ -695,7 +727,7 @@ export function DropsTab({ showToast }: DropsTabProps) {
                       {/* Domain */}
                       <div className="min-w-0">
                         <button
-                          onClick={() => openAnalyze(fullDomain)}
+                          onClick={() => openAnalyze(fullDomain, item)}
                           className="text-sm font-bold text-white font-mono truncate group-hover:text-accent transition-colors text-left block"
                         >
                           {item.domain}<span className="text-white/30 group-hover:text-accent/40">.{item.tld}</span>
@@ -739,17 +771,23 @@ export function DropsTab({ showToast }: DropsTabProps) {
 
                       {/* Actions */}
                       <div className="flex items-center justify-end gap-2 opacity-60 group-hover:opacity-100 transition-all">
-                        {/* Track Button - always visible */}
+                        {/* Track Button - shows checkmark if tracked */}
                         <button
                           onClick={() => trackDrop(item.id, fullDomain)}
-                          disabled={isTrackingThis}
-                          className="w-9 h-9 flex items-center justify-center border border-white/10 text-white/50 hover:text-white hover:bg-white/5 transition-all"
-                          title="Add to Watchlist"
+                          disabled={isTrackingThis || alreadyTracked}
+                          className={clsx(
+                            "w-9 h-9 flex items-center justify-center border transition-all",
+                            alreadyTracked 
+                              ? "border-accent/30 text-accent bg-accent/5 cursor-default"
+                              : "border-white/10 text-white/50 hover:text-white hover:bg-white/5"
+                          )}
+                          title={alreadyTracked ? "Already in Watchlist" : "Add to Watchlist"}
                         >
-                          {isTrackingThis ? <Loader2 className="w-3.5 h-3.5 animate-spin" /> : <Eye className="w-3.5 h-3.5" />}
+                          {isTrackingThis ? <Loader2 className="w-3.5 h-3.5 animate-spin" /> : 
+                           alreadyTracked ? <CheckCircle2 className="w-3.5 h-3.5" /> : <Eye className="w-3.5 h-3.5" />}
                         </button>
                         <button
-                          onClick={() => openAnalyze(fullDomain)}
+                          onClick={() => openAnalyze(fullDomain, item)}
                           className="w-9 h-9 flex items-center justify-center border border-white/10 text-white/50 hover:text-accent hover:border-accent/30 hover:bg-accent/5 transition-all"
                           title="Analyze Domain"
                         >
@@ -769,15 +807,22 @@ export function DropsTab({ showToast }: DropsTabProps) {
                             Buy
                           </a>
                         ) : status === 'dropping_soon' ? (
-                          <button
-                            onClick={() => trackDrop(item.id, fullDomain)}
-                            disabled={isTrackingThis}
-                            className="h-9 px-3 text-amber-400 text-[10px] font-bold uppercase tracking-widest flex items-center gap-1.5 border border-amber-400/30 bg-amber-400/5 hover:bg-amber-400/10 transition-all"
-                            title={countdown ? `Drops in ${countdown} - Track to get notified!` : 'Track to get notified when available'}
-                          >
-                            {isTrackingThis ? <Loader2 className="w-3 h-3 animate-spin" /> : <Eye className="w-3 h-3" />}
-                            Track
-                          </button>
+                          alreadyTracked ? (
+                            <span className="h-9 px-3 text-accent text-[10px] font-bold uppercase tracking-widest flex items-center gap-1.5 border border-accent/30 bg-accent/5">
+                              <CheckCircle2 className="w-3 h-3" />
+                              Tracked
+                            </span>
+                          ) : (
+                            <button
+                              onClick={() => trackDrop(item.id, fullDomain)}
+                              disabled={isTrackingThis}
+                              className="h-9 px-3 text-amber-400 text-[10px] font-bold uppercase tracking-widest flex items-center gap-1.5 border border-amber-400/30 bg-amber-400/5 hover:bg-amber-400/10 transition-all"
+                              title={countdown ? `Drops in ${countdown} - Track to get notified!` : 'Track to get notified when available'}
+                            >
+                              {isTrackingThis ? <Loader2 className="w-3 h-3 animate-spin" /> : <Eye className="w-3 h-3" />}
+                              Track
+                            </button>
+                          )
                         ) : status === 'taken' ? (
                           <span className="h-9 px-3 text-rose-400/50 text-[10px] font-bold uppercase tracking-widest flex items-center gap-1.5 border border-rose-400/20 bg-rose-400/5">
                             <Ban className="w-3 h-3" />
diff --git a/frontend/src/lib/analyze-store.ts b/frontend/src/lib/analyze-store.ts
index 3018936..d6323e2 100644
--- a/frontend/src/lib/analyze-store.ts
+++ b/frontend/src/lib/analyze-store.ts
@@ -2,17 +2,25 @@ import { create } from 'zustand'
 
 export type AnalyzeSectionVisibility = Record<string, boolean>
 
+export type DropStatusInfo = {
+  status: 'available' | 'dropping_soon' | 'taken' | 'unknown'
+  deletion_date?: string | null
+  is_drop?: boolean
+}
+
 export type AnalyzePanelState = {
   isOpen: boolean
   domain: string | null
   fastMode: boolean
   filterText: string
   sectionVisibility: AnalyzeSectionVisibility
-  open: (domain: string) => void
+  dropStatus: DropStatusInfo | null
+  open: (domain: string, dropStatus?: DropStatusInfo) => void
   close: () => void
   setFastMode: (fast: boolean) => void
   setFilterText: (value: string) => void
   setSectionVisibility: (next: AnalyzeSectionVisibility) => void
+  setDropStatus: (status: DropStatusInfo | null) => void
 }
 
 const DEFAULT_VISIBILITY: AnalyzeSectionVisibility = {
@@ -28,11 +36,13 @@ export const useAnalyzePanelStore = create<AnalyzePanelState>((set) => ({
   fastMode: false,
   filterText: '',
   sectionVisibility: DEFAULT_VISIBILITY,
-  open: (domain) => set({ isOpen: true, domain, filterText: '' }),
-  close: () => set({ isOpen: false }),
+  dropStatus: null,
+  open: (domain, dropStatus) => set({ isOpen: true, domain, filterText: '', dropStatus: dropStatus || null }),
+  close: () => set({ isOpen: false, dropStatus: null }),
   setFastMode: (fastMode) => set({ fastMode }),
   setFilterText: (filterText) => set({ filterText }),
   setSectionVisibility: (sectionVisibility) => set({ sectionVisibility }),
+  setDropStatus: (dropStatus) => set({ dropStatus }),
 }))
 
 export const ANALYZE_PREFS_KEY = 'pounce_analyze_prefs_v1'