diff --git a/nfoguard-web/static/css/styles.css b/nfoguard-web/static/css/styles.css
index 678e734..ba017d1 100644
--- a/nfoguard-web/static/css/styles.css
+++ b/nfoguard-web/static/css/styles.css
@@ -49,32 +49,10 @@ body {
     text-align: center;
 }
 
-/* Header Logo and Text Layout */
-.header-logo {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 1rem;
-}
-
-.header-logo .logo {
-    height: 60px;
-    width: auto;
-    /* Clean display for new logo */
-    object-fit: contain;
-}
-
-.header-text {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    text-align: left;
-}
-
 .header-content h1 {
     font-size: 2rem;
     font-weight: 300;
-    margin-bottom: 0.25rem;
+    margin-bottom: 0.5rem;
 }
 
 .header-content h1 i {
@@ -84,28 +62,6 @@ body {
 .header-content p {
     opacity: 0.9;
     font-size: 1rem;
-    margin: 0;
-}
-
-/* Responsive logo layout */
-@media (max-width: 768px) {
-    .header-logo {
-        flex-direction: column;
-        gap: 0.5rem;
-    }
-    
-    .header-text {
-        align-items: center;
-        text-align: center;
-    }
-    
-    .header-logo .logo {
-        height: 45px;
-    }
-    
-    .header-content h1 {
-        font-size: 1.5rem;
-    }
 }
 
 /* Authentication Status */
@@ -888,454 +844,59 @@ body {
 .justify-content-between { justify-content: space-between; }
 .align-items-center { align-items: center; }
 
-/* Database Admin Tools Styles */
-.query-results {
+/* Manual Scan Styles */
+.scan-status {
     margin-top: 1rem;
     padding: 1rem;
-    background: #f8f9fa;
+    background-color: var(--light-color);
     border: 1px solid var(--border-color);
     border-radius: 0.375rem;
 }
 
-.query-info {
-    padding: 1rem;
-    border-radius: 0.375rem;
+.scan-progress {
     margin-bottom: 1rem;
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    font-size: 0.875rem;
 }
 
-.query-info.success {
-    background-color: #d4edda;
-    border: 1px solid #c3e6cb;
-    color: #155724;
-}
-
-.query-info.error {
-    background-color: #f8d7da;
-    border: 1px solid #f5c6cb;
-    color: #721c24;
-}
-
-.results-table {
+.progress-bar {
     width: 100%;
-    border-collapse: collapse;
-    font-size: 0.875rem;
-    background: white;
+    height: 1.5rem;
+    background-color: #e9ecef;
     border-radius: 0.375rem;
     overflow: hidden;
-    box-shadow: var(--shadow);
-}
-
-.results-table th {
-    background-color: var(--dark-color);
-    color: white;
-    padding: 0.75rem;
-    text-align: left;
-    font-weight: 600;
-}
-
-.results-table td {
-    padding: 0.75rem;
-    border-bottom: 1px solid var(--border-color);
-    vertical-align: top;
-}
-
-.results-table tr:hover {
-    background-color: #f8f9fa;
-}
-
-.results-table td em {
-    color: var(--text-muted);
-    font-style: italic;
-}
-
-.query-results .table-container,
-.admin-results .table-container {
-    max-height: 400px;
-    overflow-y: auto;
-    border: 1px solid var(--border-color);
-    border-radius: 0.375rem;
-}
-
-/* NFO Repair Table Styling */
-.nfo-repair-table-container {
-    background: white;
-    border-radius: 0.5rem;
-    box-shadow: var(--shadow);
-    overflow-x: auto;
-    overflow-y: auto;
-    max-height: 600px;
-    margin-bottom: 1rem;
-    border: 1px solid var(--border-color);
-}
-
-.nfo-repair-table {
-    width: 100%;
-    min-width: 800px;
-    border-collapse: collapse;
-    font-size: 0.875rem;
-    background: white;
-}
-
-.nfo-repair-table th {
-    background-color: var(--dark-color);
-    color: white;
-    padding: 0.75rem 0.5rem;
-    text-align: left;
-    font-weight: 600;
-    position: sticky;
-    top: 0;
-    z-index: 10;
-}
-
-.nfo-repair-table td {
-    padding: 0.75rem 0.5rem;
-    border-bottom: 1px solid var(--border-color);
-    vertical-align: top;
-}
-
-.nfo-repair-table tr:hover {
-    background-color: #f8f9fa;
-}
-
-.media-type-badge {
-    padding: 0.25rem 0.5rem;
-    border-radius: 0.25rem;
-    font-size: 0.75rem;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-
-.media-type-badge.episode {
-    background-color: #e3f2fd;
-    color: #1976d2;
-}
-
-.media-type-badge.movie {
-    background-color: #f3e5f5;
-    color: #7b1fa2;
-}
-
-.status-ready {
-    color: #2e7d32;
-    font-weight: 600;
-    font-size: 0.75rem;
-}
-
-.status-missing {
-    color: #d32f2f;
-    font-weight: 600;
-    font-size: 0.75rem;
-}
-
-.text-center {
-    text-align: center;
-}
-
-.text-muted {
-    color: #6c757d;
-}
-
-.nfo-fix-actions {
-    margin-top: 1rem;
-    padding: 1rem;
-    background-color: #f8f9fa;
-    border-radius: 0.5rem;
-    text-align: center;
-}
-
-.nfo-fix-actions .btn {
     margin-bottom: 0.5rem;
 }
 
-.admin-tools {
+.progress-fill {
+    height: 100%;
+    background: linear-gradient(90deg, var(--primary-color), var(--success-color));
+    transition: width 0.3s ease;
+    width: 0%;
+}
+
+.scan-info {
     display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 0.875rem;
 }
 
-.admin-tools .btn {
-    text-align: left;
-    justify-content: flex-start;
-}
-
-.admin-results {
-    margin-top: 1rem;
-    padding: 1rem;
-    background: #f8f9fa;
-    border: 1px solid var(--border-color);
-    border-radius: 0.375rem;
-}
-
-.scan-summary,
-.fix-summary {
-    padding: 1rem;
-    border-radius: 0.375rem;
-    margin-bottom: 1rem;
-}
-
-.scan-summary {
-    background-color: #e7f3ff;
-    border: 1px solid #b3d9ff;
-}
-
-.fix-summary.success {
-    background-color: #d4edda;
-    border: 1px solid #c3e6cb;
-    color: #155724;
-}
-
-.fix-errors {
-    background-color: #fff3cd;
-    border: 1px solid #ffeaa7;
-    padding: 1rem;
-    border-radius: 0.375rem;
-    margin-top: 1rem;
-}
-
-.fix-errors ul {
-    margin: 0.5rem 0 0 1rem;
-}
-
-.missing-episodes {
-    margin-top: 1rem;
-}
-
-.loading {
-    text-align: center;
-    padding: 2rem;
+.scan-info span:first-child {
     color: var(--text-muted);
-    font-style: italic;
 }
 
-.loading::before {
-    content: "⏳ ";
-}
-
-.success {
-    background-color: #d4edda;
-    border: 1px solid #c3e6cb;
-    color: #155724;
-    padding: 1rem;
-    border-radius: 0.375rem;
-    margin: 1rem 0;
-}
-
-.error {
-    background-color: #f8d7da;
-    border: 1px solid #f5c6cb;
-    color: #721c24;
-    padding: 1rem;
-    border-radius: 0.375rem;
-    margin: 1rem 0;
-}
-
-/* Make text areas more distinctive */
-textarea {
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    font-size: 0.875rem;
-    resize: vertical;
-}
-
-/* Button variations for admin tools */
-.btn.btn-info {
-    background-color: #17a2b8;
-    border-color: #17a2b8;
-    color: white;
-}
-
-.btn.btn-info:hover {
-    background-color: #138496;
-    border-color: #117a8b;
-}
-
-/* Missing IMDb Items Styles */
-.missing-imdb-table-container {
-    overflow-x: auto;
-    max-height: 600px;
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    margin: 1rem 0;
-}
-
-.missing-imdb-table {
-    width: 100%;
-    border-collapse: collapse;
-    min-width: 800px;
-}
-
-.missing-imdb-table thead {
-    background-color: var(--bg-secondary);
-    position: sticky;
-    top: 0;
-    z-index: 1;
-}
-
-.missing-imdb-table th,
-.missing-imdb-table td {
-    padding: 0.75rem;
-    text-align: left;
-    border-bottom: 1px solid var(--border-color);
-    vertical-align: top;
-}
-
-.missing-imdb-table th {
+.scan-info span:last-child {
     font-weight: 600;
-    color: var(--text-primary);
-    white-space: nowrap;
-}
-
-.missing-imdb-table td {
-    color: var(--text-secondary);
-}
-
-.missing-imdb-table .file-path {
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    font-size: 0.85rem;
-    max-width: 300px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.media-type-badge {
-    display: inline-block;
-    padding: 0.25rem 0.5rem;
-    border-radius: 4px;
-    font-size: 0.75rem;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-
-.media-type-badge.tv-series {
-    background-color: #e3f2fd;
-    color: #1976d2;
-}
-
-.media-type-badge.movie {
-    background-color: #fff3e0;
-    color: #f57c00;
-}
-
-.missing-imdb-actions {
-    background-color: var(--bg-secondary);
-    padding: 1rem;
-    border-radius: 8px;
-    margin-top: 1rem;
-}
-
-.missing-imdb-actions ul {
-    margin: 0.5rem 0 0 1rem;
-    padding: 0;
-}
-
-.missing-imdb-actions li {
-    margin-bottom: 0.5rem;
-}
-
-.missing-imdb-actions code {
-    background-color: var(--bg-primary);
-    padding: 0.25rem 0.5rem;
-    border-radius: 4px;
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    font-size: 0.85rem;
-    border: 1px solid var(--border-color);
-}
-
-.btn-small {
-    padding: 0.25rem 0.5rem;
-    font-size: 0.75rem;
-    min-width: auto;
-}
-
-/* NFO Statistics Styling */
-.nfo-stats-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1rem;
-    margin: 1rem 0;
-}
-
-.stat-box {
-    background-color: var(--bg-secondary);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    padding: 1rem;
-    text-align: center;
-}
-
-.stat-number {
-    font-size: 2rem;
-    font-weight: 700;
     color: var(--primary-color);
-    margin-bottom: 0.5rem;
 }
 
-.stat-label {
+.form-group small {
+    display: block;
+    margin-top: 0.25rem;
+    color: var(--text-muted);
     font-size: 0.875rem;
-    color: var(--text-secondary);
-    font-weight: 500;
 }
 
-.recommendation-box {
-    background-color: #fff3cd;
-    border: 1px solid #ffeaa7;
-    border-radius: 8px;
-    padding: 1rem;
-    margin: 1rem 0;
-}
-
-.recommendation-box ul {
-    margin: 0.5rem 0 0 1rem;
-    padding: 0;
-}
-
-.recommendation-box li {
-    margin-bottom: 0.5rem;
-}
-
-.success-box {
-    background-color: #d4edda;
-    border: 1px solid #c3e6cb;
-    color: #155724;
-    border-radius: 8px;
-    padding: 1rem;
-    margin: 1rem 0;
-    text-align: center;
-    font-weight: 600;
-}
-
-/* Responsive adjustments for admin tools */
-@media (max-width: 768px) {
-    .table-container {
-        max-height: 300px;
-    }
-    
-    .results-table {
-        font-size: 0.75rem;
-    }
-    
-    .results-table th,
-    .results-table td {
-        padding: 0.5rem;
-    }
-    
-    .admin-tools {
-        gap: 0.75rem;
-    }
-    
-    .missing-imdb-table {
-        min-width: 600px;
-    }
-    
-    .missing-imdb-table th,
-    .missing-imdb-table td {
-        padding: 0.5rem;
-        font-size: 0.85rem;
-    }
-    
-    .missing-imdb-table .file-path {
-        max-width: 200px;
-    }
+.btn-sm {
+    padding: 0.375rem 0.75rem;
+    font-size: 0.875rem;
 }
\ No newline at end of file
diff --git a/nfoguard-web/static/index.html b/nfoguard-web/static/index.html
index 1f5a72a..45f2b3a 100644
--- a/nfoguard-web/static/index.html
+++ b/nfoguard-web/static/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>NFOGuard - Database Management</title>
-    <link rel="stylesheet" href="/static/css/styles.css?v=2.8.2-20241026-nfo-table-redesign">
+    <link rel="stylesheet" href="/static/css/styles.css?v=manual-scan-ui">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
 </head>
 <body>
@@ -12,12 +12,8 @@
         <!-- Header -->
         <header class="app-header">
             <div class="header-content">
-                <div class="header-logo">
-                    <div class="header-text">
-                        <h1>NFOGuard</h1>
-                        <p>Database Management & Reporting</p>
-                    </div>
-                </div>
+                <h1><i class="fas fa-shield-alt"></i> NFOGuard</h1>
+                <p>Database Management & Reporting</p>
             </div>
             <div class="auth-status" id="auth-status" style="display: none;">
                 <span class="auth-user">
@@ -50,24 +46,6 @@
         <main class="main-content">
             <!-- Dashboard Tab -->
             <div class="tab-content active" id="dashboard">
-                <!-- Scan Status Banner -->
-                <div class="scan-status-banner" id="dashboard-scan-status" style="display: none;">
-                    <div class="scan-status-content">
-                        <div class="scan-status-icon">
-                            <i class="fas fa-sync fa-spin"></i>
-                        </div>
-                        <div class="scan-status-info">
-                            <h4>Scan in Progress</h4>
-                            <p id="dashboard-scan-text">Processing media files...</p>
-                            <div class="scan-progress-mini">
-                                <div class="progress-bar-mini">
-                                    <div class="progress-fill-mini" id="dashboard-scan-progress"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
                 <div class="dashboard-grid">
                     <div class="stat-card">
                         <div class="stat-icon movies">
@@ -315,31 +293,50 @@
                     <h2><i class="fas fa-tools"></i> Database Tools</h2>
                 </div>
 
-                <!-- Scan Status Display -->
-                <div class="scan-status-card" id="scan-status" style="display: none;">
-                    <div class="scan-status-header">
-                        <h3><i class="fas fa-sync fa-spin"></i> Scan in Progress</h3>
-                        <div class="scan-progress">
-                            <div class="progress-bar">
-                                <div class="progress-fill" id="scan-progress"></div>
-                            </div>
-                            <span class="progress-text" id="scan-progress-text">Initializing...</span>
-                        </div>
-                    </div>
-                </div>
-
                 <div class="tools-grid">
-                    <!-- Manual Scan Tools -->
+                    <div class="tool-card">
+                        <h3><i class="fas fa-exchange-alt"></i> Bulk Source Update</h3>
+                        <p>Change source for multiple items at once</p>
+                        <form id="bulk-update-form">
+                            <div class="form-group">
+                                <label>Media Type:</label>
+                                <select id="bulk-media-type" required>
+                                    <option value="">Select type...</option>
+                                    <option value="movies">Movies</option>
+                                    <option value="episodes">Episodes</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label>From Source:</label>
+                                <input type="text" id="bulk-old-source" placeholder="e.g., no_valid_date_source" required>
+                            </div>
+                            <div class="form-group">
+                                <label>To Source:</label>
+                                <select id="bulk-new-source" required>
+                                    <option value="">Select new source...</option>
+                                    <option value="airdate">Air Date</option>
+                                    <option value="digital_release">Digital Release</option>
+                                    <option value="manual">Manual</option>
+                                    <option value="radarr:db.history.import">Radarr Import</option>
+                                    <option value="sonarr:history.import">Sonarr Import</option>
+                                </select>
+                            </div>
+                            <button type="submit" class="btn btn-warning">
+                                <i class="fas fa-exchange-alt"></i> Update Sources
+                            </button>
+                        </form>
+                    </div>
+
                     <div class="tool-card">
                         <h3><i class="fas fa-search"></i> Manual Scan</h3>
-                        <p>Run manual scans on your media library</p>
+                        <p>Scan specific folders or perform full library scans</p>
                         <form id="manual-scan-form">
                             <div class="form-group">
                                 <label>Scan Type:</label>
                                 <select id="scan-type" required>
-                                    <option value="both">Both (Movies & TV)</option>
+                                    <option value="both">TV Shows & Movies</option>
+                                    <option value="tv">TV Shows Only</option>
                                     <option value="movies">Movies Only</option>
-                                    <option value="tv">TV Series Only</option>
                                 </select>
                             </div>
                             <div class="form-group">
@@ -347,39 +344,34 @@
                                 <select id="scan-mode" required>
                                     <option value="smart">Smart (Recommended)</option>
                                     <option value="full">Full Scan</option>
-                                    <option value="incomplete">Incomplete Items Only</option>
+                                    <option value="incomplete">Incomplete Only</option>
                                 </select>
                             </div>
-                            <button type="submit" class="btn-primary">
+                            <div class="form-group">
+                                <label>Specific Path (Optional):</label>
+                                <input type="text" id="scan-path" placeholder="e.g., /mnt/unionfs/Media/TV/Series Name" title="Leave empty for full library scan">
+                                <small>Leave empty to scan entire library</small>
+                            </div>
+                            <button type="submit" class="btn btn-primary">
                                 <i class="fas fa-play"></i> Start Scan
                             </button>
                         </form>
-                    </div>
-
-                    <div class="tool-card">
-                        <h3><i class="fas fa-folder"></i> Custom Directory Scan</h3>
-                        <p>Scan a specific directory or path</p>
-                        <form id="custom-scan-form">
-                            <div class="form-group">
-                                <label>Directory Path:</label>
-                                <input type="text" id="scan-path" placeholder="/media/Movies/specific-folder" />
-                                <small>Enter the full path to scan (will be auto-formatted)</small>
+                        <div id="scan-status" class="scan-status" style="display: none;">
+                            <div class="scan-progress">
+                                <div class="progress-bar">
+                                    <div class="progress-fill" id="scan-progress-bar"></div>
+                                </div>
+                                <div class="scan-info">
+                                    <span id="scan-current-operation">Initializing...</span>
+                                    <span id="scan-progress-text">0%</span>
+                                </div>
                             </div>
-                            <div class="form-group">
-                                <label>Scan Type:</label>
-                                <select id="custom-scan-type" required>
-                                    <option value="both">Auto-detect</option>
-                                    <option value="movies">Movies</option>
-                                    <option value="tv">TV Series</option>
-                                </select>
-                            </div>
-                            <button type="submit" class="btn-primary">
-                                <i class="fas fa-search"></i> Scan Directory
+                            <button class="btn btn-secondary btn-sm" onclick="stopScanPolling()">
+                                <i class="fas fa-times"></i> Hide Status
                             </button>
-                        </form>
+                        </div>
                     </div>
 
-
                     <div class="tool-card">
                         <h3><i class="fas fa-database"></i> Database Statistics</h3>
                         <p>View detailed database information</p>
@@ -390,85 +382,6 @@
                             <i class="fas fa-sync"></i> Refresh Stats
                         </button>
                     </div>
-
-                    <!-- Database Query Tool -->
-                    <div class="tool-card">
-                        <h3><i class="fas fa-terminal"></i> Database Query Tool</h3>
-                        <p>Execute custom SQL queries on the NFOGuard database</p>
-                        <form id="database-query-form">
-                            <div class="form-group">
-                                <label>Quick Queries:</label>
-                                <select id="quick-query-select" onchange="loadQuickQuery()">
-                                    <option value="">Select a predefined query...</option>
-                                </select>
-                            </div>
-                            <div class="form-group">
-                                <label>SQL Query:</label>
-                                <textarea id="sql-query" rows="4" placeholder="SELECT * FROM episodes WHERE dateadded IS NULL LIMIT 10"></textarea>
-                                <small>Query will be automatically limited to 100 results for safety</small>
-                            </div>
-                            <div class="form-group">
-                                <label>Result Limit:</label>
-                                <select id="query-limit">
-                                    <option value="10">10 rows</option>
-                                    <option value="50">50 rows</option>
-                                    <option value="100" selected>100 rows</option>
-                                </select>
-                            </div>
-                            <button type="submit" class="btn btn-info">
-                                <i class="fas fa-play"></i> Execute Query
-                            </button>
-                        </form>
-                        <div id="query-results" class="query-results" style="display: none;">
-                            <h4>Query Results:</h4>
-                            <div id="query-results-content"></div>
-                        </div>
-                    </div>
-
-                    <!-- NFO File Repair Tool -->
-                    <div class="tool-card">
-                        <h3><i class="fas fa-file-medical"></i> NFO File Repair</h3>
-                        <p>Fix missing &lt;dateadded&gt; elements in NFO files</p>
-                        <div class="form-group">
-                            <button class="btn btn-warning" onclick="checkMissingNFODates()">
-                                <i class="fas fa-search"></i> Scan for Missing dateadded in NFO Files
-                            </button>
-                        </div>
-                        <div id="nfo-scan-results" style="display: none;">
-                            <div id="nfo-scan-content"></div>
-                            <div class="form-group">
-                                <button class="btn btn-success" onclick="fixAllMissingNFODates()">
-                                    <i class="fas fa-wrench"></i> Fix All Missing dateadded Elements
-                                </button>
-                                <button class="btn btn-secondary" onclick="fixSpecificSeries()">
-                                    <i class="fas fa-cog"></i> Fix Specific Series
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Database Admin Tools -->
-                    <div class="tool-card">
-                        <h3><i class="fas fa-user-shield"></i> Database Admin</h3>
-                        <p>Advanced database management tools</p>
-                        <div class="admin-tools">
-                            <button class="btn btn-info" onclick="showEpisodesMissingNFODateadded()">
-                                <i class="fas fa-exclamation-triangle"></i> Episodes Missing NFO dateadded
-                            </button>
-                            <button class="btn btn-warning" onclick="showMissingImdbItems()">
-                                <i class="fas fa-search"></i> Items Missing IMDb IDs
-                            </button>
-                            <button class="btn btn-secondary" onclick="exportDatabaseReport()">
-                                <i class="fas fa-download"></i> Export Database Report
-                            </button>
-                            <button class="btn btn-secondary" onclick="showRecentWebhookActivity()">
-                                <i class="fas fa-clock"></i> Recent Webhook Activity
-                            </button>
-                        </div>
-                        <div id="admin-results" class="admin-results" style="display: none;">
-                            <div id="admin-results-content"></div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </main>
@@ -536,6 +449,6 @@
     <!-- Toast Notifications -->
     <div class="toast-container" id="toast-container"></div>
 
-    <script src="/static/js/app.js?v=3.0.1-nfo-table-redesign"></script>
+    <script src="/static/js/app.js?v=manual-scan-ui"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/nfoguard-web/static/js/app.js b/nfoguard-web/static/js/app.js
index 09dbeeb..4a5f3b5 100644
--- a/nfoguard-web/static/js/app.js
+++ b/nfoguard-web/static/js/app.js
@@ -5,8 +5,6 @@ let currentTab = 'dashboard';
 let currentMoviesPage = 1;
 let currentSeriesPage = 1;
 let dashboardData = null;
-let seriesSourcesLoaded = false;
-let authRetryAttempts = 0;
 
 // Initialize app
 document.addEventListener('DOMContentLoaded', function() {
@@ -14,6 +12,7 @@ document.addEventListener('DOMContentLoaded', function() {
     initializeEventListeners();
     checkAuthStatus();  // Check authentication status on page load
     loadDashboard();
+    loadSeriesSources();
 });
 
 // Tab management
@@ -50,9 +49,6 @@ function switchTab(tabName) {
             break;
         case 'tv':
             loadSeries();
-            if (!seriesSourcesLoaded) {
-                loadSeriesSources();
-            }
             break;
         case 'reports':
             loadReport();
@@ -79,20 +75,14 @@ function initializeEventListeners() {
     
     // Forms
     document.getElementById('edit-form').addEventListener('submit', handleEditSubmit);
-    
-    // Manual scan forms
+    document.getElementById('bulk-update-form').addEventListener('submit', handleBulkUpdate);
     document.getElementById('manual-scan-form').addEventListener('submit', handleManualScan);
-    document.getElementById('custom-scan-form').addEventListener('submit', handleCustomScan);
-    
-    // Custom directory input auto-formatting
-    document.getElementById('scan-path').addEventListener('input', handleDirectoryFormatting);
 }
 
 // API calls
 async function apiCall(endpoint, options = {}) {
     try {
         const response = await fetch(endpoint, {
-            credentials: 'include',  // Include cookies for authentication
             headers: {
                 'Content-Type': 'application/json',
                 ...options.headers
@@ -118,9 +108,6 @@ async function loadDashboard() {
         dashboardData = await apiCall('/api/dashboard');
         updateDashboardStats();
         updateDashboardCharts();
-        
-        // Check if there's an ongoing scan when dashboard loads
-        await checkScanStatus();
     } catch (error) {
         console.error('Failed to load dashboard:', error);
     }
@@ -129,6 +116,9 @@ async function loadDashboard() {
 function updateDashboardStats() {
     if (!dashboardData) return;
     
+    // Debug: Log dashboard data to see what fields are available
+    console.log('Dashboard data received:', dashboardData);
+    
     const moviesTotal = dashboardData.movies_total || 0;
     const moviesWithDates = dashboardData.movies_with_dates || 0;
     const moviesWithoutDates = dashboardData.movies_without_dates || (moviesTotal - moviesWithDates);
@@ -209,6 +199,7 @@ async function loadMovies(page = 1) {
     const sourceFilter = document.getElementById('movies-filter-source').value;
     
     const skip = (page - 1) * 100;
+    console.log(`DEBUG: loadMovies called with page=${page}, calculated skip=${skip}`);
     
     const params = new URLSearchParams({
         skip: skip,
@@ -363,7 +354,6 @@ async function loadSeriesSources() {
         });
         
         select.value = currentValue;
-        seriesSourcesLoaded = true;
     } catch (error) {
         console.error('Failed to load series sources:', error);
     }
@@ -386,6 +376,7 @@ async function loadSeries(page = 1) {
     const sourceFilter = document.getElementById('series-filter-source').value;
     
     const skip = (page - 1) * 50;
+    console.log(`DEBUG: loadSeries called with page=${page}, calculated skip=${skip}`);
     
     const params = new URLSearchParams({
         skip: skip,
@@ -539,17 +530,17 @@ function showEpisodesModal(data) {
                                         `<td>${dateadded}</td>`;
                                     
                                     return `
-                                        <tr class="${rowClass}" data-has-date="${!missingDate}" data-has-video="${episode.has_video_file}">
+                                        <tr class="${rowClass}" data-has-date="${!missingDate}">
                                             <td>S${episode.season.toString().padStart(2, '0')}E${episode.episode.toString().padStart(2, '0')}</td>
                                             <td>${episode.aired || '-'}</td>
                                             ${dateCell}
                                             <td><span class="badge badge-secondary">${episode.source_description || episode.source || 'Unknown'}</span></td>
                                             <td>${hasVideoBadge}</td>
                                             <td>
-                                                <button class="btn btn-sm btn-primary" onclick="editEpisode('${data.series.imdb_id}', ${parseInt(episode.season)}, ${parseInt(episode.episode)}, '${dateadded}', '${episode.source || ''}')">
+                                                <button class="btn btn-sm btn-primary" onclick="editEpisode('${data.series.imdb_id}', ${episode.season}, ${episode.episode}, '${dateadded}', '${episode.source || ''}')">
                                                     <i class="fas fa-edit"></i> Edit
                                                 </button>
-                                                <button class="btn btn-sm btn-danger" onclick="deleteEpisode('${data.series.imdb_id}', ${parseInt(episode.season)}, ${parseInt(episode.episode)})" style="margin-left: 5px;">
+                                                <button class="btn btn-sm btn-danger" onclick="deleteEpisode('${data.series.imdb_id}', ${episode.season}, ${episode.episode})" style="margin-left: 5px;">
                                                     <i class="fas fa-trash"></i> Delete
                                                 </button>
                                             </td>
@@ -650,7 +641,7 @@ function updateReportTables(data) {
                 <td>${episode.aired || '-'}</td>
                 <td><span class="badge badge-warning">${episode.source_description || episode.source || 'Unknown'}</span></td>
                 <td>
-                    <button class="btn btn-sm btn-success" onclick="smartFixEpisode('${episode.imdb_id}', ${parseInt(episode.season)}, ${parseInt(episode.episode)})">
+                    <button class="btn btn-sm btn-success" onclick="smartFixEpisode('${episode.imdb_id}', ${episode.season}, ${episode.episode})">
                         <i class="fas fa-magic"></i> Smart Fix
                     </button>
                 </td>
@@ -867,6 +858,47 @@ async function loadDetailedStats() {
     }
 }
 
+async function handleBulkUpdate(event) {
+    event.preventDefault();
+    
+    const mediaType = document.getElementById('bulk-media-type').value;
+    const oldSource = document.getElementById('bulk-old-source').value;
+    const newSource = document.getElementById('bulk-new-source').value;
+    
+    if (!mediaType || !oldSource || !newSource) {
+        showToast('Please fill in all fields', 'warning');
+        return;
+    }
+    
+    if (!confirm(`This will update all ${mediaType} with source "${oldSource}" to "${newSource}". Continue?`)) {
+        return;
+    }
+    
+    try {
+        const result = await apiCall('/api/bulk/update-source', {
+            method: 'POST',
+            body: JSON.stringify({
+                media_type: mediaType,
+                old_source: oldSource,
+                new_source: newSource
+            })
+        });
+        
+        showToast(result.message, 'success');
+        
+        // Reset form
+        document.getElementById('bulk-update-form').reset();
+        
+        // Refresh current tab
+        if (currentTab === 'movies') loadMovies(currentMoviesPage);
+        if (currentTab === 'tv') loadSeries(currentSeriesPage);
+        if (currentTab === 'reports') loadReport();
+        if (currentTab === 'dashboard') loadDashboard();
+        
+    } catch (error) {
+        console.error('Bulk update failed:', error);
+    }
+}
 
 // Edit modal functions
 async function editMovie(imdbId, dateadded, source) {
@@ -913,7 +945,7 @@ function showEnhancedEditModal(mediaType, options, currentDateadded, currentSour
     `;
     
     // Add available date options
-    (options.date_options || options.options || []).forEach((option, index) => {
+    options.options.forEach((option, index) => {
         const isSelected = option.source === currentSource ? 'checked' : '';
         const optionId = `date-option-${index}`;
         
@@ -1047,39 +1079,25 @@ async function handleEnhancedEditSubmit(event) {
     const dateadded = document.getElementById('edit-dateadded').value;
     const source = document.getElementById('edit-source').value;
     
-    console.log('🔍 DEBUG: handleEnhancedEditSubmit called with:', {
-        dateadded: dateadded,
-        source: source,
-        mediaType: mediaType,
-        imdbId: imdbId
-    });
-    
-    if (!dateadded && source !== 'airdate') {
+    if (!dateadded) {
         showToast('Please enter a date', 'warning');
         return;
     }
     
     // Convert datetime-local to ISO string with error handling
     let isoDateadded = null;
-    if (dateadded) {
-        try {
-            isoDateadded = new Date(dateadded).toISOString();
-        } catch (e) {
-            showToast('Invalid date format', 'error');
-            return;
-        }
-    } else if (source === 'airdate') {
-        // For airdate source, let the backend handle the date conversion
-        isoDateadded = null;
+    try {
+        isoDateadded = new Date(dateadded).toISOString();
+    } catch (e) {
+        showToast('Invalid date format', 'error');
+        return;
     }
     
     try {
         if (mediaType === 'movie') {
             await updateMovieDate(imdbId, isoDateadded, source);
         } else {
-            const season = parseInt(document.getElementById('edit-season').value);
-            const episode = parseInt(document.getElementById('edit-episode').value);
-            await updateEpisodeDate(imdbId, season, episode, isoDateadded, source);
+            await updateEpisodeDate(imdbId, options.season, options.episode, isoDateadded, source);
         }
         
         closeModal();
@@ -1099,14 +1117,7 @@ async function editEpisode(imdbId, season, episode, dateadded, source) {
     
     try {
         // Load episode options to populate available dates
-        const dateOptions = await apiCall(`/api/episodes/${imdbId}/${season}/${episode}/date-options`);
-        // Create options object with episode metadata
-        const options = {
-            imdb_id: imdbId,
-            season: season,
-            episode: episode,
-            date_options: dateOptions.options || []
-        };
+        const options = await apiCall(`/api/episodes/${imdbId}/${season}/${episode}/date-options`);
         showEnhancedEditModal('episode', options, dateadded, source);
     } catch (error) {
         console.error('Failed to load episode options for edit:', error);
@@ -1301,11 +1312,16 @@ async function deleteEpisode(imdbId, season, episode) {
     }
     
     try {
-        const result = await apiCall(`/api/episodes/${imdbId}/${season}/${episode}`, {
-            method: 'DELETE'
+        const response = await fetch(`/api/episodes/${imdbId}/${season}/${episode}`, {
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json'
+            }
         });
         
-        if (result.success) {
+        const result = await response.json();
+        
+        if (response.ok && result.success) {
             showToast(`✅ Episode ${episodeStr} deleted successfully`, 'success');
             
             // Remove the row from the table
@@ -1319,8 +1335,10 @@ async function deleteEpisode(imdbId, season, episode) {
             
             // Update episode counts in modal header
             updateEpisodeModalCounts();
+            
         } else {
-            showToast(`❌ Failed to delete episode: ${result.message || 'Unknown error'}`, 'error');
+            const errorMsg = result.message || result.error || 'Unknown error';
+            showToast(`❌ Failed to delete episode: ${errorMsg}`, 'error');
         }
         
     } catch (error) {
@@ -1337,15 +1355,24 @@ async function deleteMovie(imdbId) {
     }
     
     try {
-        const result = await apiCall(`/api/movies/${imdbId}`, {
-            method: 'DELETE'
+        const response = await fetch(`/api/movies/${imdbId}`, {
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json'
+            }
         });
         
-        if (result.success) {
+        const result = await response.json();
+        
+        if (response.ok && result.success) {
             showToast(`✅ Movie deleted successfully`, 'success');
             
             // Refresh the movies table
             loadMovies(currentMoviesPage);
+            
+        } else {
+            const errorMsg = result.message || result.error || 'Unknown error';
+            showToast(`❌ Failed to delete movie: ${errorMsg}`, 'error');
         }
         
     } catch (error) {
@@ -1361,19 +1388,20 @@ function updateEpisodeModalCounts() {
     const episodesWithDates = Array.from(remainingRows).filter(row => 
         row.getAttribute('data-has-date') === 'true'
     ).length;
-    const episodesWithVideo = Array.from(remainingRows).filter(row => 
-        row.getAttribute('data-has-video') === 'true'
-    ).length;
     const episodesWithoutDates = totalEpisodes - episodesWithDates;
     
     // Update the stats in the modal
     const statsDiv = document.querySelector('.episode-stats');
     if (statsDiv) {
+        // Keep the existing "With Video" count by finding it
+        const videoCountDiv = statsDiv.querySelector('div:nth-child(4)');
+        const videoCountText = videoCountDiv ? videoCountDiv.innerHTML : '<div><strong>With Video:</strong> -</div>';
+        
         statsDiv.innerHTML = `
             <div><strong>Total Episodes:</strong> ${totalEpisodes}</div>
             <div><strong>With Dates:</strong> ${episodesWithDates}</div>
             <div style="color: #dc3545;"><strong>Missing Dates:</strong> ${episodesWithoutDates}</div>
-            <div><strong>With Video:</strong> ${episodesWithVideo}</div>
+            ${videoCountText}
         `;
     }
 }
@@ -1395,16 +1423,8 @@ async function checkAuthStatus() {
             authUsernameSpan.textContent = authStatus.username;
             authStatusDiv.style.display = 'flex';
         } else if (authStatus.auth_enabled && !authStatus.authenticated) {
-            // This can happen briefly during page load - retry once after a short delay
-            if (authRetryAttempts < 1) {
-                authRetryAttempts++;
-                console.debug('Auth enabled but not authenticated - retrying auth check in 500ms');
-                setTimeout(() => {
-                    checkAuthStatus();
-                }, 500);
-            } else {
-                console.warn('Auth enabled but not authenticated after retry - middleware may be misconfigured');
-            }
+            // This shouldn't happen if middleware is working, but handle it
+            console.warn('Auth enabled but not authenticated - middleware may be misconfigured');
         } else {
             // Authentication disabled - hide auth status
             authStatusDiv.style.display = 'none';
@@ -1417,6 +1437,169 @@ async function checkAuthStatus() {
     }
 }
 
+// Manual Scan Functions
+async function handleManualScan(event) {
+    event.preventDefault();
+    
+    const scanType = document.getElementById('scan-type').value;
+    const scanMode = document.getElementById('scan-mode').value;
+    const scanPath = document.getElementById('scan-path').value.trim();
+    
+    // Validate inputs
+    if (!scanType || !scanMode) {
+        showToast('❌ Please select scan type and mode', 'error');
+        return;
+    }
+    
+    // Build query parameters
+    const params = new URLSearchParams({
+        scan_type: scanType,
+        scan_mode: scanMode
+    });
+    
+    if (scanPath) {
+        params.append('path', scanPath);
+    }
+    
+    try {
+        // Show scan status
+        showScanStatus();
+        
+        // Start the scan
+        showToast('🚀 Starting manual scan...', 'info');
+        const response = await fetch(`/manual/scan?${params}`, {
+            method: 'POST',
+            credentials: 'include'
+        });
+        
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+        }
+        
+        const result = await response.json();
+        
+        if (result.status === 'started') {
+            showToast('✅ Scan started successfully', 'success');
+            // Start polling for status
+            startScanPolling();
+        } else {
+            showToast(`ℹ️ ${result.message || 'Scan completed'}`, 'info');
+            hideScanStatus();
+        }
+        
+    } catch (error) {
+        console.error('Manual scan failed:', error);
+        showToast(`❌ Scan failed: ${error.message}`, 'error');
+        hideScanStatus();
+    }
+}
+
+function showScanStatus() {
+    const scanStatus = document.getElementById('scan-status');
+    const progressBar = document.getElementById('scan-progress-bar');
+    const operationText = document.getElementById('scan-current-operation');
+    const progressText = document.getElementById('scan-progress-text');
+    
+    // Reset and show
+    progressBar.style.width = '0%';
+    operationText.textContent = 'Initializing scan...';
+    progressText.textContent = '0%';
+    scanStatus.style.display = 'block';
+}
+
+function hideScanStatus() {
+    document.getElementById('scan-status').style.display = 'none';
+    if (window.scanPollingInterval) {
+        clearInterval(window.scanPollingInterval);
+        window.scanPollingInterval = null;
+    }
+}
+
+function stopScanPolling() {
+    hideScanStatus();
+}
+
+function startScanPolling() {
+    // Poll every 2 seconds for scan status
+    window.scanPollingInterval = setInterval(async () => {
+        try {
+            const response = await fetch('/api/scan/status');
+            if (!response.ok) {
+                throw new Error('Failed to get scan status');
+            }
+            
+            const status = await response.json();
+            updateScanProgress(status);
+            
+            // Stop polling if scan is complete
+            if (!status.scanning) {
+                stopScanPolling();
+                showToast('✅ Scan completed!', 'success');
+            }
+            
+        } catch (error) {
+            console.error('Failed to poll scan status:', error);
+            // Don't show error toast repeatedly, just stop polling
+            stopScanPolling();
+        }
+    }, 2000);
+}
+
+function updateScanProgress(status) {
+    const progressBar = document.getElementById('scan-progress-bar');
+    const operationText = document.getElementById('scan-current-operation');
+    const progressText = document.getElementById('scan-progress-text');
+    
+    if (!status.scanning) {
+        progressBar.style.width = '100%';
+        operationText.textContent = 'Scan completed';
+        progressText.textContent = '100%';
+        return;
+    }
+    
+    // Calculate overall progress
+    let totalProgress = 0;
+    let progressDetails = '';
+    
+    if (status.scan_type === 'both' || status.scan_type === 'tv') {
+        const tvProgress = status.tv_series_total > 0 ? 
+            ((status.tv_series_processed + status.tv_series_skipped) / status.tv_series_total) * 50 : 0;
+        totalProgress += tvProgress;
+        
+        if (status.tv_series_total > 0) {
+            progressDetails += `TV: ${status.tv_series_processed + status.tv_series_skipped}/${status.tv_series_total} `;
+        }
+    }
+    
+    if (status.scan_type === 'both' || status.scan_type === 'movies') {
+        const movieProgress = status.movies_total > 0 ? 
+            ((status.movies_processed + status.movies_skipped) / status.movies_total) * 50 : 0;
+        totalProgress += movieProgress;
+        
+        if (status.movies_total > 0) {
+            progressDetails += `Movies: ${status.movies_processed + status.movies_skipped}/${status.movies_total}`;
+        }
+    }
+    
+    // For single type scans, use full 100%
+    if (status.scan_type !== 'both') {
+        totalProgress *= 2;
+    }
+    
+    // Update progress bar
+    progressBar.style.width = `${Math.min(totalProgress, 100)}%`;
+    progressText.textContent = `${Math.round(totalProgress)}%`;
+    
+    // Update operation text
+    if (status.current_operation) {
+        operationText.textContent = status.current_operation;
+    } else if (status.current_item) {
+        operationText.textContent = `Processing: ${status.current_item}`;
+    } else {
+        operationText.textContent = progressDetails || 'Scanning...';
+    }
+}
+
 async function logout() {
     if (!confirm('Are you sure you want to logout?')) {
         return;
@@ -1442,786 +1625,4 @@ async function logout() {
         console.error('Logout failed:', error);
         showToast('❌ Logout error', 'error');
     }
-}
-
-// ===========================
-// Manual Scan Functions
-// ===========================
-
-async function handleManualScan(event) {
-    event.preventDefault();
-    
-    const scanType = document.getElementById('scan-type').value;
-    const scanMode = document.getElementById('scan-mode').value;
-    
-    if (!scanType || !scanMode) {
-        showToast('Please select both scan type and mode', 'warning');
-        return;
-    }
-    
-    try {
-        showToast('🔍 Starting manual scan...', 'info');
-        updateScanStatus('Starting manual scan...', true);
-        
-        // Send as query parameters instead of JSON body
-        const params = new URLSearchParams({
-            scan_type: scanType,
-            scan_mode: scanMode
-        });
-        
-        const result = await apiCall(`/manual/scan?${params}`, {
-            method: 'POST'
-        });
-        
-        showToast(`✅ Manual scan initiated: ${result.message}`, 'success');
-        
-        // Track scan start time for status monitoring
-        try {
-            await apiCall('/api/scan/track', { method: 'POST' });
-        } catch (e) {
-            console.log('Failed to track scan start:', e);
-        }
-        
-        // Start polling for scan status
-        startScanStatusPolling();
-        
-    } catch (error) {
-        console.error('Manual scan failed:', error);
-        showToast(`❌ Manual scan failed: ${error.message}`, 'error');
-        updateScanStatus('Scan failed', false);
-    }
-}
-
-async function handleCustomScan(event) {
-    event.preventDefault();
-    
-    const customDirectory = document.getElementById('scan-path').value.trim();
-    const customScanType = document.getElementById('custom-scan-type').value;
-    
-    if (!customDirectory) {
-        showToast('Please enter a directory path', 'warning');
-        return;
-    }
-    
-    if (!customScanType) {
-        showToast('Please select a scan type', 'warning');
-        return;
-    }
-    
-    try {
-        showToast('🔍 Starting custom directory scan...', 'info');
-        updateScanStatus('Starting custom directory scan...', true);
-        
-        // Send as query parameters instead of JSON body
-        const params = new URLSearchParams({
-            path: customDirectory,
-            scan_type: customScanType,
-            scan_mode: 'smart' // Default to smart mode for custom scans
-        });
-        
-        const result = await apiCall(`/manual/scan?${params}`, {
-            method: 'POST'
-        });
-        
-        showToast(`✅ Custom scan initiated: ${result.message}`, 'success');
-        
-        // Track scan start time for status monitoring
-        try {
-            await apiCall('/api/scan/track', { method: 'POST' });
-        } catch (e) {
-            console.log('Failed to track scan start:', e);
-        }
-        
-        // Start polling for scan status
-        startScanStatusPolling();
-        
-    } catch (error) {
-        console.error('Custom scan failed:', error);
-        showToast(`❌ Custom scan failed: ${error.message}`, 'error');
-        updateScanStatus('Scan failed', false);
-    }
-}
-
-function handleDirectoryFormatting(event) {
-    const input = event.target;
-    let value = input.value;
-    
-    // Auto-format common directory patterns
-    if (value && !value.startsWith('/')) {
-        // Add leading slash for absolute paths
-        value = '/' + value;
-        input.value = value;
-    }
-    
-    // Remove multiple consecutive slashes
-    value = value.replace(/\/+/g, '/');
-    
-    // Remove trailing slash unless it's just '/'
-    if (value.length > 1 && value.endsWith('/')) {
-        value = value.slice(0, -1);
-    }
-    
-    input.value = value;
-}
-
-// ===========================
-// Scan Status Functions
-// ===========================
-
-let scanStatusInterval = null;
-
-function updateScanStatus(message, isActive = false) {
-    const statusBanner = document.getElementById('dashboard-scan-status');
-    const statusText = document.getElementById('dashboard-scan-text');
-    
-    if (!statusBanner || !statusText) {
-        return;
-    }
-    
-    statusText.textContent = message;
-    
-    if (isActive) {
-        statusBanner.className = 'scan-status-banner active';
-        statusBanner.style.display = 'block';
-    } else {
-        statusBanner.className = 'scan-status-banner';
-        // Don't hide completely, just mark as inactive
-        setTimeout(() => {
-            if (statusBanner.className === 'scan-status-banner') {
-                statusBanner.style.display = 'none';
-            }
-        }, 3000);
-    }
-}
-
-async function checkScanStatus() {
-    try {
-        const status = await apiCall('/api/scan/status');
-        
-        if (status.scanning) {
-            // Build detailed status message from core container data
-            let message = status.message || 'Scan in progress...';
-            
-            // Add progress details if available
-            if (status.current_operation === 'tv' && status.tv_series_total > 0) {
-                const progress = `${status.tv_series_processed}/${status.tv_series_total}`;
-                message = `Processing TV series (${progress})`;
-                if (status.current_item) {
-                    message += ` | Current: ${status.current_item}`;
-                }
-                if (status.elapsed_seconds) {
-                    const elapsed = formatElapsedTime(status.elapsed_seconds);
-                    message += ` | ${elapsed} elapsed`;
-                }
-            } else if (status.current_operation === 'movies' && status.movies_total > 0) {
-                const progress = `${status.movies_processed}/${status.movies_total}`;
-                message = `Processing movies (${progress})`;
-                if (status.current_item) {
-                    message += ` | Current: ${status.current_item}`;
-                }
-                if (status.elapsed_seconds) {
-                    const elapsed = formatElapsedTime(status.elapsed_seconds);
-                    message += ` | ${elapsed} elapsed`;
-                }
-            } else if (status.elapsed_seconds) {
-                const elapsed = formatElapsedTime(status.elapsed_seconds);
-                message = `Scan in progress | ${elapsed} elapsed`;
-                if (status.current_item) {
-                    message += ` | Current: ${status.current_item}`;
-                }
-            }
-            
-            updateScanStatus(message, true);
-            
-            // Start polling if not already polling
-            if (!scanStatusInterval) {
-                startScanStatusPolling();
-            }
-            return true; // Continue polling
-        } else {
-            updateScanStatus(status.message || 'No scan in progress', false);
-            return false; // Stop polling
-        }
-        
-    } catch (error) {
-        console.error('Failed to check scan status:', error);
-        updateScanStatus('Unable to check scan status', false);
-        return false; // Stop polling on error
-    }
-}
-
-function formatElapsedTime(seconds) {
-    if (seconds >= 60) {
-        const minutes = Math.floor(seconds / 60);
-        const remainingSeconds = seconds % 60;
-        return `${minutes}m ${remainingSeconds}s`;
-    } else {
-        return `${seconds}s`;
-    }
-}
-
-function startScanStatusPolling() {
-    // Don't start if already polling
-    if (scanStatusInterval) {
-        return;
-    }
-    
-    // Check status every 2 seconds
-    scanStatusInterval = setInterval(async () => {
-        const shouldContinue = await checkScanStatus();
-        
-        if (!shouldContinue) {
-            clearInterval(scanStatusInterval);
-            scanStatusInterval = null;
-            
-            // Refresh dashboard data after scan completes
-            if (currentTab === 'dashboard') {
-                setTimeout(loadDashboard, 1000);
-            }
-        }
-    }, 2000);
-    
-}
-
-function stopScanStatusPolling() {
-    if (scanStatusInterval) {
-        clearInterval(scanStatusInterval);
-        scanStatusInterval = null;
-    }
-}
-
-// ============================================================================
-// DATABASE ADMIN TOOLS
-// ============================================================================
-
-// Initialize database admin tools
-document.addEventListener('DOMContentLoaded', function() {
-    initializeDatabaseAdminTools();
-});
-
-function initializeDatabaseAdminTools() {
-    // Load quick queries
-    loadQuickQueries();
-    
-    // Initialize database query form
-    const dbQueryForm = document.getElementById('database-query-form');
-    if (dbQueryForm) {
-        dbQueryForm.addEventListener('submit', function(e) {
-            e.preventDefault();
-            executeDatabaseQuery();
-        });
-    }
-}
-
-async function loadQuickQueries() {
-    try {
-        const response = await apiCall('/api/admin/database/quick-queries');
-        const select = document.getElementById('quick-query-select');
-        
-        if (response.success && select) {
-            // Clear existing options except first
-            select.innerHTML = '<option value="">Select a predefined query...</option>';
-            
-            response.queries.forEach(query => {
-                const option = document.createElement('option');
-                option.value = query.query;
-                option.textContent = `${query.name} - ${query.description}`;
-                select.appendChild(option);
-            });
-        }
-    } catch (error) {
-        console.error('Failed to load quick queries:', error);
-    }
-}
-
-function loadQuickQuery() {
-    const select = document.getElementById('quick-query-select');
-    const textarea = document.getElementById('sql-query');
-    
-    if (select && textarea && select.value) {
-        textarea.value = select.value;
-    }
-}
-
-async function executeDatabaseQuery() {
-    const query = document.getElementById('sql-query').value.trim();
-    const limit = document.getElementById('query-limit').value;
-    const resultsDiv = document.getElementById('query-results');
-    const resultsContent = document.getElementById('query-results-content');
-    
-    if (!query) {
-        alert('Please enter a SQL query');
-        return;
-    }
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Executing query...</div>';
-        resultsDiv.style.display = 'block';
-        
-        const response = await apiCall('/api/admin/database/query', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ query, limit: parseInt(limit) })
-        });
-        
-        if (response.success) {
-            if (response.columns && response.rows) {
-                // SELECT query results
-                let html = `
-                    <div class="query-info">
-                        <strong>Query:</strong> ${response.query}<br>
-                        <strong>Rows returned:</strong> ${response.row_count}
-                    </div>
-                    <div class="table-container">
-                        <table class="results-table">
-                            <thead>
-                                <tr>
-                `;
-                
-                response.columns.forEach(col => {
-                    html += `<th>${col}</th>`;
-                });
-                html += '</tr></thead><tbody>';
-                
-                response.rows.forEach(row => {
-                    html += '<tr>';
-                    response.columns.forEach(col => {
-                        const value = row[col];
-                        html += `<td>${value !== null ? value : '<em>NULL</em>'}</td>`;
-                    });
-                    html += '</tr>';
-                });
-                
-                html += '</tbody></table></div>';
-                resultsContent.innerHTML = html;
-            } else {
-                // Non-SELECT query
-                resultsContent.innerHTML = `
-                    <div class="query-info success">
-                        <strong>Query:</strong> ${response.query}<br>
-                        <strong>Result:</strong> ${response.message}<br>
-                        <strong>Rows affected:</strong> ${response.rows_affected}
-                    </div>
-                `;
-            }
-        } else {
-            resultsContent.innerHTML = `
-                <div class="query-info error">
-                    <strong>Error:</strong> ${response.error}<br>
-                    <strong>Query:</strong> ${response.query}
-                </div>
-            `;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `
-            <div class="query-info error">
-                <strong>Error:</strong> Failed to execute query: ${error.message}
-            </div>
-        `;
-    }
-}
-
-// NFO File Repair Functions
-async function checkMissingNFODates() {
-    const resultsDiv = document.getElementById('nfo-scan-results');
-    const resultsContent = document.getElementById('nfo-scan-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Scanning NFO files for missing dateadded elements...</div>';
-        resultsDiv.style.display = 'block';
-        
-        const response = await apiCall('/api/admin/nfo/missing-dateadded');
-        
-        if (response.success) {
-            let html = `
-                <div class="scan-summary">
-                    <h4>NFO Scan Results</h4>
-                    <p><strong>Total episodes checked:</strong> ${response.total_episodes_checked || 0}</p>
-                    <p><strong>Total movies checked:</strong> ${response.total_movies_checked || 0}</p>
-                    <p><strong>Total items checked:</strong> ${response.total_items_checked || 0}</p>
-                    <p><strong>Items missing dateadded in NFO:</strong> ${response.missing_dateadded_count}</p>
-                </div>
-            `;
-            
-            if (response.missing_dateadded_count > 0) {
-                html += `
-                    <div class="missing-episodes">
-                        <h5>Items with missing dateadded (showing first 50):</h5>
-                        <div class="nfo-repair-table-container">
-                            <table class="nfo-repair-table">
-                                <thead>
-                                    <tr>
-                                        <th style="width: 8%">Type</th>
-                                        <th style="width: 12%">IMDb ID</th>
-                                        <th style="width: 8%">Season</th>
-                                        <th style="width: 8%">Episode</th>
-                                        <th style="width: 15%">Database Date</th>
-                                        <th style="width: 10%">Source</th>
-                                        <th style="width: 25%">Series/Movie</th>
-                                        <th style="width: 14%">Actions</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                `;
-                
-                (response.items || response.episodes || []).forEach(item => {
-                    const displayDate = item.dateadded ? new Date(item.dateadded).toLocaleString() : 'None';
-                    const seriesName = item.series_name || item.title || 'Unknown';
-                    const nfoFileName = item.nfo_path ? item.nfo_path.split('/').pop() : 'Unknown';
-                    
-                    html += `
-                        <tr>
-                            <td><span class="media-type-badge ${item.media_type || 'episode'}">${item.media_type || 'episode'}</span></td>
-                            <td><code>${item.imdb_id}</code></td>
-                            <td class="text-center">${item.season || 'N/A'}</td>
-                            <td class="text-center">${item.episode || 'N/A'}</td>
-                            <td><small>${displayDate}</small></td>
-                            <td><small>${item.source || 'unknown'}</small></td>
-                            <td><strong>${seriesName}</strong><br><small class="text-muted">${nfoFileName}</small></td>
-                            <td>
-                                ${item.dateadded ? 
-                                    '<span class="status-ready">✅ Ready to fix</span>' : 
-                                    '<span class="status-missing">❌ No DB date</span>'
-                                }
-                            </td>
-                        </tr>
-                    `;
-                });
-                
-                html += `
-                        </tbody>
-                    </table>
-                </div>
-                <div class="nfo-fix-actions">
-                    <button onclick="fixAllMissingNFODates()" class="btn btn-primary">
-                        🔧 Fix All Missing dateadded Elements
-                    </button>
-                    <p class="text-muted">This will automatically add dateadded elements to NFO files using database values.</p>
-                </div>
-                </div>`;
-            } else {
-                html += '<div class="success">✅ All NFO files have dateadded elements!</div>';
-            }
-            
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = `<div class="error">Error: ${response.message}</div>`;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to scan NFO files: ${error.message}</div>`;
-    }
-}
-
-async function fixAllMissingNFODates() {
-    if (!confirm('This will update all NFO files that are missing dateadded elements. Continue?')) {
-        return;
-    }
-    
-    const resultsContent = document.getElementById('nfo-scan-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Fixing all missing dateadded elements in NFO files...</div>';
-        
-        const response = await apiCall('/api/admin/nfo/bulk-update', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ fix_all: true })
-        });
-        
-        if (response.success) {
-            let html = `
-                <div class="fix-summary success">
-                    <h4>NFO Fix Results</h4>
-                    <p>✅ <strong>${response.updated_count}</strong> NFO files updated successfully</p>
-                    <p><strong>Total episodes processed:</strong> ${response.total_episodes}</p>
-                    <p><strong>Message:</strong> ${response.message}</p>
-                </div>
-            `;
-            
-            if (response.errors && response.errors.length > 0) {
-                html += `
-                    <div class="fix-errors">
-                        <h5>Errors (first 10):</h5>
-                        <ul>
-                `;
-                response.errors.forEach(error => {
-                    html += `<li>${error}</li>`;
-                });
-                html += '</ul></div>';
-            }
-            
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = `<div class="error">Error: ${response.message}</div>`;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to fix NFO files: ${error.message}</div>`;
-    }
-}
-
-async function fixSpecificSeries() {
-    const imdbIds = prompt('Enter IMDb IDs to fix (comma-separated):\nExample: tt9111220,tt12327578');
-    
-    if (!imdbIds) return;
-    
-    const idArray = imdbIds.split(',').map(id => id.trim()).filter(id => id);
-    
-    if (idArray.length === 0) {
-        alert('Please enter valid IMDb IDs');
-        return;
-    }
-    
-    const resultsContent = document.getElementById('nfo-scan-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Fixing NFO files for specified series...</div>';
-        
-        const response = await apiCall('/api/admin/nfo/bulk-update', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ imdb_ids: idArray })
-        });
-        
-        if (response.success) {
-            let html = `
-                <div class="fix-summary success">
-                    <h4>NFO Fix Results for Specific Series</h4>
-                    <p>✅ <strong>${response.updated_count}</strong> NFO files updated successfully</p>
-                    <p><strong>Series processed:</strong> ${idArray.join(', ')}</p>
-                    <p><strong>Message:</strong> ${response.message}</p>
-                </div>
-            `;
-            
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = `<div class="error">Error: ${response.message}</div>`;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to fix NFO files: ${error.message}</div>`;
-    }
-}
-
-// Database Admin Functions
-async function showEpisodesMissingNFODateadded() {
-    const resultsDiv = document.getElementById('admin-results');
-    const resultsContent = document.getElementById('admin-results-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Checking for episodes missing NFO dateadded...</div>';
-        resultsDiv.style.display = 'block';
-        
-        const response = await apiCall('/api/admin/nfo/missing-dateadded');
-        
-        if (response.success) {
-            const totalFiles = response.total_nfo_files_missing || response.missing_dateadded_count;
-            const fixableItems = response.missing_dateadded_count;
-            const tvFiles = response.tv_nfo_files_missing || 0;
-            const movieFiles = response.movie_nfo_files_missing || 0;
-            
-            const html = `
-                <h4>NFO Files Missing dateadded Elements</h4>
-                <div class="nfo-stats-grid">
-                    <div class="stat-box">
-                        <div class="stat-number">${totalFiles}</div>
-                        <div class="stat-label">Total NFO Files Missing dateadded</div>
-                    </div>
-                    <div class="stat-box">
-                        <div class="stat-number">${fixableItems}</div>
-                        <div class="stat-label">Can Be Fixed Automatically</div>
-                    </div>
-                </div>
-                <p><strong>Breakdown:</strong> ${tvFiles} TV episodes, ${movieFiles} movies</p>
-                <p><strong>Scanned:</strong> ${response.total_episodes_checked} TV NFO files, ${response.total_movies_checked} movie NFO files</p>
-                ${totalFiles > 0 ? `
-                    <div class="recommendation-box">
-                        <p><strong>📋 Action Required:</strong></p>
-                        <ul>
-                            <li><strong>${fixableItems} items</strong> have IMDb IDs and database entries - use "NFO File Repair" tool to fix</li>
-                            ${totalFiles > fixableItems ? `<li><strong>${totalFiles - fixableItems} items</strong> need IMDb IDs first - check "Items Missing IMDb IDs" tool</li>` : ''}
-                        </ul>
-                    </div>
-                ` : 
-                    '<div class="success-box">✅ All NFO files are properly maintained!</div>'
-                }
-            `;
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = `<div class="error">Error: ${response.message}</div>`;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to check NFO files: ${error.message}</div>`;
-    }
-}
-
-async function showMissingImdbItems() {
-    const resultsDiv = document.getElementById('admin-results');
-    const resultsContent = document.getElementById('admin-results-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Checking for items missing IMDb IDs...</div>';
-        resultsDiv.style.display = 'block';
-        
-        const response = await apiCall('/api/admin/missing-imdb');
-        
-        if (response.success) {
-            let html = `
-                <h4>Items Missing IMDb IDs</h4>
-                <p><strong>Found:</strong> ${response.total_missing} items missing IMDb IDs</p>
-                <p><strong>TV Series:</strong> ${response.tv_series_missing} | <strong>Movies:</strong> ${response.movies_missing}</p>
-            `;
-            
-            if (response.total_missing > 0) {
-                html += `
-                    <p><strong>Recommendation:</strong> These items need manual IMDb ID assignment or folder/filename correction.</p>
-                    <div class="missing-imdb-table-container">
-                        <table class="missing-imdb-table">
-                            <thead>
-                                <tr>
-                                    <th style="width: 10%">Type</th>
-                                    <th style="width: 25%">Folder Name</th>
-                                    <th style="width: 35%">File Path</th>
-                                    <th style="width: 15%">Discovered</th>
-                                    <th style="width: 10%">Checks</th>
-                                    <th style="width: 5%">Action</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                `;
-                
-                response.items.forEach(item => {
-                    const discoveredDate = item.discovered_at ? new Date(item.discovered_at).toLocaleDateString() : 'Unknown';
-                    const checkCount = item.check_count || 1;
-                    
-                    html += `
-                        <tr>
-                            <td>
-                                <span class="media-type-badge ${item.type.toLowerCase().replace(' ', '-')}">${item.type}</span>
-                            </td>
-                            <td title="${item.folder_name}">${item.folder_name}</td>
-                            <td title="${item.file_path}" class="file-path">${item.file_path}</td>
-                            <td>${discoveredDate}</td>
-                            <td>${checkCount}</td>
-                            <td>
-                                <button class="btn btn-small btn-info" title="Copy path to clipboard" onclick="copyToClipboard('${item.file_path}')">
-                                    <i class="fas fa-copy"></i>
-                                </button>
-                            </td>
-                        </tr>
-                    `;
-                });
-                
-                html += `
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="missing-imdb-actions">
-                        <p><strong>How to fix:</strong></p>
-                        <ul>
-                            <li>Add IMDb ID to folder name: <code>[imdb-tt1234567]</code></li>
-                            <li>Add IMDb ID to filename: <code>Movie.Name.2023.imdb-tt1234567.mkv</code></li>
-                            <li>Add IMDb ID to NFO file content</li>
-                            <li>Check folder structure and naming conventions</li>
-                        </ul>
-                    </div>
-                `;
-            } else {
-                html += '<p>✅ All items have valid IMDb IDs!</p>';
-            }
-            
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = `<div class="error">Error: ${response.message}</div>`;
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to check missing IMDb items: ${error.message}</div>`;
-    }
-}
-
-async function exportDatabaseReport() {
-    alert('Database export functionality will be implemented in a future update.');
-}
-
-async function showRecentWebhookActivity() {
-    const resultsDiv = document.getElementById('admin-results');
-    const resultsContent = document.getElementById('admin-results-content');
-    
-    try {
-        resultsContent.innerHTML = '<div class="loading">Loading recent webhook activity...</div>';
-        resultsDiv.style.display = 'block';
-        
-        const response = await apiCall('/api/admin/database/query', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ 
-                query: "SELECT * FROM episodes WHERE last_updated > NOW() - INTERVAL '24 hours' ORDER BY last_updated DESC",
-                limit: 20 
-            })
-        });
-        
-        if (response.success && response.rows) {
-            let html = `
-                <h4>Recent Webhook Activity (Last 24 Hours)</h4>
-                <p><strong>Episodes processed:</strong> ${response.row_count}</p>
-                <div class="table-container">
-                    <table class="results-table">
-                        <thead>
-                            <tr>
-                                <th>IMDb ID</th>
-                                <th>Season</th>
-                                <th>Episode</th>
-                                <th>Date Added</th>
-                                <th>Source</th>
-                                <th>Last Updated</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-            `;
-            
-            response.rows.forEach(row => {
-                html += `
-                    <tr>
-                        <td>${row.imdb_id}</td>
-                        <td>${row.season}</td>
-                        <td>${row.episode}</td>
-                        <td>${row.dateadded ? new Date(row.dateadded).toLocaleString() : 'None'}</td>
-                        <td>${row.source}</td>
-                        <td>${new Date(row.last_updated).toLocaleString()}</td>
-                    </tr>
-                `;
-            });
-            
-            html += '</tbody></table></div>';
-            resultsContent.innerHTML = html;
-        } else {
-            resultsContent.innerHTML = '<p>No recent webhook activity found.</p>';
-        }
-    } catch (error) {
-        resultsContent.innerHTML = `<div class="error">Failed to load webhook activity: ${error.message}</div>`;
-    }
-}
-
-async function copyToClipboard(text) {
-    try {
-        await navigator.clipboard.writeText(text);
-        // Show a temporary success message
-        const button = event.target.closest('button');
-        const originalIcon = button.innerHTML;
-        button.innerHTML = '<i class="fas fa-check"></i>';
-        button.style.backgroundColor = '#4CAF50';
-        
-        setTimeout(() => {
-            button.innerHTML = originalIcon;
-            button.style.backgroundColor = '';
-        }, 1500);
-    } catch (err) {
-        // Fallback for older browsers
-        const textArea = document.createElement('textarea');
-        textArea.value = text;
-        document.body.appendChild(textArea);
-        textArea.select();
-        document.execCommand('copy');
-        document.body.removeChild(textArea);
-        
-        alert('Path copied to clipboard!');
-    }
 }
\ No newline at end of file
diff --git a/static/css/styles.css b/static/css/styles.css
index c41f5fb..ba017d1 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -842,4 +842,61 @@ body {
 .d-block { display: block; }
 .d-flex { display: flex; }
 .justify-content-between { justify-content: space-between; }
-.align-items-center { align-items: center; }
\ No newline at end of file
+.align-items-center { align-items: center; }
+
+/* Manual Scan Styles */
+.scan-status {
+    margin-top: 1rem;
+    padding: 1rem;
+    background-color: var(--light-color);
+    border: 1px solid var(--border-color);
+    border-radius: 0.375rem;
+}
+
+.scan-progress {
+    margin-bottom: 1rem;
+}
+
+.progress-bar {
+    width: 100%;
+    height: 1.5rem;
+    background-color: #e9ecef;
+    border-radius: 0.375rem;
+    overflow: hidden;
+    margin-bottom: 0.5rem;
+}
+
+.progress-fill {
+    height: 100%;
+    background: linear-gradient(90deg, var(--primary-color), var(--success-color));
+    transition: width 0.3s ease;
+    width: 0%;
+}
+
+.scan-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 0.875rem;
+}
+
+.scan-info span:first-child {
+    color: var(--text-muted);
+}
+
+.scan-info span:last-child {
+    font-weight: 600;
+    color: var(--primary-color);
+}
+
+.form-group small {
+    display: block;
+    margin-top: 0.25rem;
+    color: var(--text-muted);
+    font-size: 0.875rem;
+}
+
+.btn-sm {
+    padding: 0.375rem 0.75rem;
+    font-size: 0.875rem;
+}
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index 5aee3c9..45f2b3a 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>NFOGuard - Database Management</title>
-    <link rel="stylesheet" href="/static/css/styles.css">
+    <link rel="stylesheet" href="/static/css/styles.css?v=manual-scan-ui">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
 </head>
 <body>
@@ -327,6 +327,51 @@
                         </form>
                     </div>
 
+                    <div class="tool-card">
+                        <h3><i class="fas fa-search"></i> Manual Scan</h3>
+                        <p>Scan specific folders or perform full library scans</p>
+                        <form id="manual-scan-form">
+                            <div class="form-group">
+                                <label>Scan Type:</label>
+                                <select id="scan-type" required>
+                                    <option value="both">TV Shows & Movies</option>
+                                    <option value="tv">TV Shows Only</option>
+                                    <option value="movies">Movies Only</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label>Scan Mode:</label>
+                                <select id="scan-mode" required>
+                                    <option value="smart">Smart (Recommended)</option>
+                                    <option value="full">Full Scan</option>
+                                    <option value="incomplete">Incomplete Only</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label>Specific Path (Optional):</label>
+                                <input type="text" id="scan-path" placeholder="e.g., /mnt/unionfs/Media/TV/Series Name" title="Leave empty for full library scan">
+                                <small>Leave empty to scan entire library</small>
+                            </div>
+                            <button type="submit" class="btn btn-primary">
+                                <i class="fas fa-play"></i> Start Scan
+                            </button>
+                        </form>
+                        <div id="scan-status" class="scan-status" style="display: none;">
+                            <div class="scan-progress">
+                                <div class="progress-bar">
+                                    <div class="progress-fill" id="scan-progress-bar"></div>
+                                </div>
+                                <div class="scan-info">
+                                    <span id="scan-current-operation">Initializing...</span>
+                                    <span id="scan-progress-text">0%</span>
+                                </div>
+                            </div>
+                            <button class="btn btn-secondary btn-sm" onclick="stopScanPolling()">
+                                <i class="fas fa-times"></i> Hide Status
+                            </button>
+                        </div>
+                    </div>
+
                     <div class="tool-card">
                         <h3><i class="fas fa-database"></i> Database Statistics</h3>
                         <p>View detailed database information</p>
@@ -404,6 +449,6 @@
     <!-- Toast Notifications -->
     <div class="toast-container" id="toast-container"></div>
 
-    <script src="/static/js/app.js"></script>
+    <script src="/static/js/app.js?v=manual-scan-ui"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/static/js/app.js b/static/js/app.js
index 091183e..4a5f3b5 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -76,6 +76,7 @@ function initializeEventListeners() {
     // Forms
     document.getElementById('edit-form').addEventListener('submit', handleEditSubmit);
     document.getElementById('bulk-update-form').addEventListener('submit', handleBulkUpdate);
+    document.getElementById('manual-scan-form').addEventListener('submit', handleManualScan);
 }
 
 // API calls
@@ -1436,6 +1437,169 @@ async function checkAuthStatus() {
     }
 }
 
+// Manual Scan Functions
+async function handleManualScan(event) {
+    event.preventDefault();
+    
+    const scanType = document.getElementById('scan-type').value;
+    const scanMode = document.getElementById('scan-mode').value;
+    const scanPath = document.getElementById('scan-path').value.trim();
+    
+    // Validate inputs
+    if (!scanType || !scanMode) {
+        showToast('❌ Please select scan type and mode', 'error');
+        return;
+    }
+    
+    // Build query parameters
+    const params = new URLSearchParams({
+        scan_type: scanType,
+        scan_mode: scanMode
+    });
+    
+    if (scanPath) {
+        params.append('path', scanPath);
+    }
+    
+    try {
+        // Show scan status
+        showScanStatus();
+        
+        // Start the scan
+        showToast('🚀 Starting manual scan...', 'info');
+        const response = await fetch(`/manual/scan?${params}`, {
+            method: 'POST',
+            credentials: 'include'
+        });
+        
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+        }
+        
+        const result = await response.json();
+        
+        if (result.status === 'started') {
+            showToast('✅ Scan started successfully', 'success');
+            // Start polling for status
+            startScanPolling();
+        } else {
+            showToast(`ℹ️ ${result.message || 'Scan completed'}`, 'info');
+            hideScanStatus();
+        }
+        
+    } catch (error) {
+        console.error('Manual scan failed:', error);
+        showToast(`❌ Scan failed: ${error.message}`, 'error');
+        hideScanStatus();
+    }
+}
+
+function showScanStatus() {
+    const scanStatus = document.getElementById('scan-status');
+    const progressBar = document.getElementById('scan-progress-bar');
+    const operationText = document.getElementById('scan-current-operation');
+    const progressText = document.getElementById('scan-progress-text');
+    
+    // Reset and show
+    progressBar.style.width = '0%';
+    operationText.textContent = 'Initializing scan...';
+    progressText.textContent = '0%';
+    scanStatus.style.display = 'block';
+}
+
+function hideScanStatus() {
+    document.getElementById('scan-status').style.display = 'none';
+    if (window.scanPollingInterval) {
+        clearInterval(window.scanPollingInterval);
+        window.scanPollingInterval = null;
+    }
+}
+
+function stopScanPolling() {
+    hideScanStatus();
+}
+
+function startScanPolling() {
+    // Poll every 2 seconds for scan status
+    window.scanPollingInterval = setInterval(async () => {
+        try {
+            const response = await fetch('/api/scan/status');
+            if (!response.ok) {
+                throw new Error('Failed to get scan status');
+            }
+            
+            const status = await response.json();
+            updateScanProgress(status);
+            
+            // Stop polling if scan is complete
+            if (!status.scanning) {
+                stopScanPolling();
+                showToast('✅ Scan completed!', 'success');
+            }
+            
+        } catch (error) {
+            console.error('Failed to poll scan status:', error);
+            // Don't show error toast repeatedly, just stop polling
+            stopScanPolling();
+        }
+    }, 2000);
+}
+
+function updateScanProgress(status) {
+    const progressBar = document.getElementById('scan-progress-bar');
+    const operationText = document.getElementById('scan-current-operation');
+    const progressText = document.getElementById('scan-progress-text');
+    
+    if (!status.scanning) {
+        progressBar.style.width = '100%';
+        operationText.textContent = 'Scan completed';
+        progressText.textContent = '100%';
+        return;
+    }
+    
+    // Calculate overall progress
+    let totalProgress = 0;
+    let progressDetails = '';
+    
+    if (status.scan_type === 'both' || status.scan_type === 'tv') {
+        const tvProgress = status.tv_series_total > 0 ? 
+            ((status.tv_series_processed + status.tv_series_skipped) / status.tv_series_total) * 50 : 0;
+        totalProgress += tvProgress;
+        
+        if (status.tv_series_total > 0) {
+            progressDetails += `TV: ${status.tv_series_processed + status.tv_series_skipped}/${status.tv_series_total} `;
+        }
+    }
+    
+    if (status.scan_type === 'both' || status.scan_type === 'movies') {
+        const movieProgress = status.movies_total > 0 ? 
+            ((status.movies_processed + status.movies_skipped) / status.movies_total) * 50 : 0;
+        totalProgress += movieProgress;
+        
+        if (status.movies_total > 0) {
+            progressDetails += `Movies: ${status.movies_processed + status.movies_skipped}/${status.movies_total}`;
+        }
+    }
+    
+    // For single type scans, use full 100%
+    if (status.scan_type !== 'both') {
+        totalProgress *= 2;
+    }
+    
+    // Update progress bar
+    progressBar.style.width = `${Math.min(totalProgress, 100)}%`;
+    progressText.textContent = `${Math.round(totalProgress)}%`;
+    
+    // Update operation text
+    if (status.current_operation) {
+        operationText.textContent = status.current_operation;
+    } else if (status.current_item) {
+        operationText.textContent = `Processing: ${status.current_item}`;
+    } else {
+        operationText.textContent = progressDetails || 'Scanning...';
+    }
+}
+
 async function logout() {
     if (!confirm('Are you sure you want to logout?')) {
         return;