diff --git a/components/admin_logs.templ b/components/admin_logs.templ
new file mode 100644
index 0000000..b37321a
--- /dev/null
+++ b/components/admin_logs.templ
@@ -0,0 +1,536 @@
+package components
+
+import (
+    "context"
+    "time"
+)
+
+// LogEntry represents a log entry for display
+type LogEntry struct {
+    Timestamp time.Time
+    Level     string
+    Message   string
+    Source    string
+    Details   map[string]interface{}
+}
+
+// LogViewerData represents the data for the log viewer component
+type LogViewerData struct {
+    Logs          []LogEntry
+    CurrentFilter string
+    LogFilePath   string
+}
+
+// AdminLogs renders the log viewer page
+templ AdminLogs(ctx context.Context, data LogViewerData) {
+    @LayoutWithContext("Log Viewer", ctx) {
+        <div class="log-viewer-page">
+            <!-- Page Header -->
+            <div class="mb-6 flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+                <h1 class="text-2xl font-bold text-gray-900 dark:text-white flex items-center">
+                    <i class="fas fa-stream w-6 h-6 mr-2 text-blue-500 dark:text-blue-400"></i> Log Viewer
+                </h1>
+                <div class="flex gap-2">
+                    <button id="pause-logs" class="flex items-center justify-center text-white bg-yellow-500 hover:bg-yellow-600 focus:ring-4 focus:ring-yellow-300 font-medium rounded-lg px-4 py-2 dark:bg-yellow-600 dark:hover:bg-yellow-700 focus:outline-none dark:focus:ring-yellow-800">
+                        <i class="fas fa-pause w-4 h-4 mr-2"></i> Pause
+                    </button>
+                    <button id="resume-logs" class="hidden flex items-center justify-center text-white bg-green-500 hover:bg-green-600 focus:ring-4 focus:ring-green-300 font-medium rounded-lg px-4 py-2 dark:bg-green-600 dark:hover:bg-green-700 focus:outline-none dark:focus:ring-green-800">
+                        <i class="fas fa-play w-4 h-4 mr-2"></i> Resume
+                    </button>
+                    <button id="clear-logs" class="flex items-center justify-center text-white bg-red-500 hover:bg-red-600 focus:ring-4 focus:ring-red-300 font-medium rounded-lg px-4 py-2 dark:bg-red-600 dark:hover:bg-red-700 focus:outline-none dark:focus:ring-red-800">
+                        <i class="fas fa-trash w-4 h-4 mr-2"></i> Clear
+                    </button>
+                    <button id="download-logs" class="flex items-center justify-center text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg px-4 py-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
+                        <i class="fas fa-download w-4 h-4 mr-2"></i> Download
+                    </button>
+                </div>
+            </div>
+
+            <!-- Log Information -->
+            <div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 mb-4 p-4">
+                <div class="text-sm text-gray-600 dark:text-gray-300">
+                    <p><i class="fas fa-info-circle mr-2 text-blue-500 dark:text-blue-400"></i> Viewing logs from: <span class="font-mono">{ data.LogFilePath }</span></p>
+                    <p><i class="fas fa-circle text-green-500 dark:text-green-400 mr-2"></i> Real-time log streaming is active, logs are automatically captured and displayed</p>
+                </div>
+            </div>
+
+            <!-- Filters -->
+            <div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 mb-6">
+                <div class="p-4 border-b border-gray-200 dark:border-gray-700">
+                    <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Filter Logs</h3>
+                </div>
+                <div class="p-4">
+                    <div class="flex flex-wrap gap-4">
+                        <!-- Log Level Filter -->
+                        <div class="flex-1 min-w-[200px]">
+                            <label for="filter-level" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Log Level</label>
+                            <select id="filter-level" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+                                <option value="">All Levels</option>
+                                <option value="debug">Debug</option>
+                                <option value="info">Info</option>
+                                <option value="warn">Warning</option>
+                                <option value="error">Error</option>
+                                <option value="fatal">Fatal</option>
+                            </select>
+                        </div>
+
+                        <!-- Source Filter -->
+                        <div class="flex-1 min-w-[200px]">
+                            <label for="filter-source" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Source</label>
+                            <select id="filter-source" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+                                <option value="">All Sources</option>
+                                <option value="api">API</option>
+                                <option value="web">Web</option>
+                                <option value="scheduler">Scheduler</option>
+                                <option value="auth">Authentication</option>
+                                <option value="database">Database</option>
+                            </select>
+                        </div>
+
+                        <!-- Search Filter -->
+                        <div class="flex-1 min-w-[200px]">
+                            <label for="filter-search" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Search</label>
+                            <input type="text" id="filter-search" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Search logs...">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Log Table -->
+            <div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 overflow-hidden">
+                <div class="p-4 border-b border-gray-200 dark:border-gray-700 flex justify-between items-center">
+                    <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Live Logs</h3>
+                    <div class="flex items-center">
+                        <span id="connection-status" class="flex items-center text-sm text-green-500 dark:text-green-400">
+                            <span class="inline-block w-2 h-2 bg-green-500 dark:bg-green-400 rounded-full mr-2"></span>
+                            Connected
+                        </span>
+                    </div>
+                </div>
+                
+                <div class="overflow-x-auto" style="max-height: 60vh; overflow-y: auto;">
+                    <table class="w-full">
+                        <thead class="bg-gray-50 dark:bg-gray-700 sticky top-0 z-10">
+                            <tr>
+                                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase">Timestamp</th>
+                                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase w-[100px]">Level</th>
+                                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase w-[120px]">Source</th>
+                                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase">Message</th>
+                            </tr>
+                        </thead>
+                        <tbody id="log-entries" class="divide-y divide-gray-200 dark:divide-gray-700">
+                            <!-- Log entries will be inserted here dynamically -->
+                            if len(data.Logs) == 0 {
+                                <tr>
+                                    <td colspan="4" class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">Waiting for logs...</td>
+                                </tr>
+                            } else {
+                                for _, log := range data.Logs {
+                                    <tr class="hover:bg-gray-50 dark:hover:bg-gray-700">
+                                        <td class="px-4 py-2 text-sm text-gray-500 dark:text-gray-400 whitespace-nowrap">{ log.Timestamp.Format("2006-01-02 15:04:05.000") }</td>
+                                        <td class={ getLogLevelClass(log.Level) }>{ log.Level }</td>
+                                        <td class="px-4 py-2 text-sm text-gray-500 dark:text-gray-400">{ log.Source }</td>
+                                        <td class="px-4 py-2 text-sm text-gray-900 dark:text-white font-mono">{ log.Message }</td>
+                                    </tr>
+                                }
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        <script>
+            document.addEventListener('DOMContentLoaded', function() {
+                const logEntries = document.getElementById('log-entries');
+                const pauseButton = document.getElementById('pause-logs');
+                const resumeButton = document.getElementById('resume-logs');
+                const clearButton = document.getElementById('clear-logs');
+                const downloadButton = document.getElementById('download-logs');
+                const connectionStatus = document.getElementById('connection-status');
+                const filterLevel = document.getElementById('filter-level');
+                const filterSource = document.getElementById('filter-source');
+                const filterSearch = document.getElementById('filter-search');
+                
+                let isPaused = false;
+                let logs = [];
+                let filteredLogs = [];
+                let ws;
+                let knownSources = new Set();
+                let reconnectTimer = null;
+                let pingInterval = null;
+                
+                // Connect to WebSocket
+                function connectWebSocket() {
+                    // Clear any existing reconnect timer
+                    if (reconnectTimer) {
+                        clearTimeout(reconnectTimer);
+                        reconnectTimer = null;
+                    }
+                    
+                    // Clear any existing ping interval
+                    if (pingInterval) {
+                        clearInterval(pingInterval);
+                        pingInterval = null;
+                    }
+                    
+                    const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+                    const wsUrl = `${protocol}//${window.location.host}/admin/logs/ws`;
+                    
+                    console.log("Connecting to WebSocket:", wsUrl);
+                    connectionStatus.innerHTML = '<span class="inline-block w-2 h-2 bg-yellow-500 dark:bg-yellow-400 rounded-full mr-2"></span>Connecting...';
+                    connectionStatus.className = 'flex items-center text-sm text-yellow-500 dark:text-yellow-400';
+                    
+                    try {
+                        ws = new WebSocket(wsUrl);
+                        
+                        ws.onopen = function() {
+                            console.log("WebSocket connection established");
+                            connectionStatus.innerHTML = '<span class="inline-block w-2 h-2 bg-green-500 dark:bg-green-400 rounded-full mr-2"></span>Connected';
+                            connectionStatus.className = 'flex items-center text-sm text-green-500 dark:text-green-400';
+                            
+                            // Set up ping interval to keep connection alive
+                            pingInterval = setInterval(function() {
+                                if (ws && ws.readyState === WebSocket.OPEN) {
+                                    console.debug("Sending ping to server");
+                                    // Send a simple ping message
+                                    ws.send(JSON.stringify({type: "ping"}));
+                                }
+                            }, 30000); // 30 seconds
+                        };
+                        
+                        ws.onclose = function(event) {
+                            console.log("WebSocket connection closed", event);
+                            connectionStatus.innerHTML = '<span class="inline-block w-2 h-2 bg-red-500 dark:bg-red-400 rounded-full mr-2"></span>Disconnected';
+                            connectionStatus.className = 'flex items-center text-sm text-red-500 dark:text-red-400';
+                            
+                            // Clear the ping interval
+                            if (pingInterval) {
+                                clearInterval(pingInterval);
+                                pingInterval = null;
+                            }
+                            
+                            // Attempt to reconnect after 5 seconds
+                            console.log("Scheduling reconnect in 5 seconds...");
+                            reconnectTimer = setTimeout(connectWebSocket, 5000);
+                        };
+                        
+                        ws.onerror = function(error) {
+                            console.error("WebSocket error:", error);
+                            connectionStatus.innerHTML = '<span class="inline-block w-2 h-2 bg-red-500 dark:bg-red-400 rounded-full mr-2"></span>Error';
+                            connectionStatus.className = 'flex items-center text-sm text-red-500 dark:text-red-400';
+                            
+                            // Don't set up reconnect here, let onclose handle it
+                        };
+                        
+                        ws.onmessage = function(event) {
+                            // Debug log the received data
+                            console.debug("Raw log entry received:", event.data);
+                            
+                            try {
+                                const logEntry = JSON.parse(event.data);
+                                
+                                // Debug log the parsed entry
+                                console.debug("Parsed log entry:", logEntry);
+                                
+                                // Extract source and add to known sources for filtering
+                                const source = logEntry.Source || logEntry.source || '';
+                                if (source && !knownSources.has(source)) {
+                                    knownSources.add(source);
+                                    updateSourceFilter();
+                                }
+                                
+                                // Handle potential log prefixes in the message
+                                const message = logEntry.Message || logEntry.message || '';
+                                if (message.startsWith("DEBUG:")) {
+                                    logEntry.Level = "debug";
+                                    logEntry.Message = message.substring(7).trim();
+                                } else if (message.startsWith("INFO:")) {
+                                    logEntry.Level = "info";
+                                    logEntry.Message = message.substring(6).trim();
+                                } else if (message.startsWith("ERROR:")) {
+                                    logEntry.Level = "error";
+                                    logEntry.Message = message.substring(7).trim();
+                                } else if (message.startsWith("WARN:")) {
+                                    logEntry.Level = "warn";
+                                    logEntry.Message = message.substring(6).trim();
+                                } else if (message.startsWith("WARNING:")) {
+                                    logEntry.Level = "warn";
+                                    logEntry.Message = message.substring(9).trim();
+                                } else if (message.startsWith("FATAL:")) {
+                                    logEntry.Level = "fatal";
+                                    logEntry.Message = message.substring(7).trim();
+                                }
+                                
+                                // Add to logs array
+                                logs.push(logEntry);
+                                
+                                // Apply filters and update display if not paused
+                                if (!isPaused) {
+                                    applyFilters();
+                                }
+                            } catch (error) {
+                                console.error("Error processing log entry:", error);
+                            }
+                        };
+                    } catch (error) {
+                        console.error("Error creating WebSocket:", error);
+                        connectionStatus.innerHTML = '<span class="inline-block w-2 h-2 bg-red-500 dark:bg-red-400 rounded-full mr-2"></span>Connection Failed';
+                        connectionStatus.className = 'flex items-center text-sm text-red-500 dark:text-red-400';
+                        
+                        // Retry connection after 5 seconds
+                        reconnectTimer = setTimeout(connectWebSocket, 5000);
+                    }
+                }
+                
+                // Update the source filter dropdown with dynamically discovered sources
+                function updateSourceFilter() {
+                    // Remember the current selection
+                    const currentValue = filterSource.value;
+                    
+                    // Clear existing options except the first "All Sources" option
+                    while (filterSource.options.length > 1) {
+                        filterSource.remove(1);
+                    }
+                    
+                    // Add sorted sources to dropdown
+                    Array.from(knownSources).sort().forEach(source => {
+                        const option = document.createElement('option');
+                        option.value = source.toLowerCase();
+                        option.textContent = source;
+                        filterSource.appendChild(option);
+                    });
+                    
+                    // Restore previous selection if it still exists
+                    if (currentValue) {
+                        for (let i = 0; i < filterSource.options.length; i++) {
+                            if (filterSource.options[i].value === currentValue) {
+                                filterSource.selectedIndex = i;
+                                break;
+                            }
+                        }
+                    }
+                }
+                
+                // Apply filters to logs
+                function applyFilters() {
+                    const levelFilter = filterLevel.value.toLowerCase();
+                    const sourceFilter = filterSource.value.toLowerCase();
+                    const searchFilter = filterSearch.value.toLowerCase();
+                    
+                    filteredLogs = logs.filter(log => {
+                        // Handle capitalized properties from the server
+                        const level = (log.Level || log.level || '').toLowerCase();
+                        const source = (log.Source || log.source || '').toLowerCase();
+                        const message = (log.Message || log.message || '').toLowerCase();
+                        
+                        return (levelFilter === '' || level === levelFilter) &&
+                               (sourceFilter === '' || source === sourceFilter) &&
+                               (searchFilter === '' || message.includes(searchFilter));
+                    });
+                    
+                    renderLogs();
+                }
+                
+                // Render logs to the table
+                function renderLogs() {
+                    // Clear existing logs
+                    logEntries.innerHTML = '';
+                    
+                    if (filteredLogs.length === 0) {
+                        const emptyRow = document.createElement('tr');
+                        emptyRow.innerHTML = `<td colspan="4" class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">No logs found</td>`;
+                        logEntries.appendChild(emptyRow);
+                        return;
+                    }
+                    
+                    // Add filtered logs
+                    filteredLogs.forEach(log => {
+                        // Handle capitalized property names from the server
+                        const timestamp = log.Timestamp || log.timestamp;
+                        const level = log.Level || log.level || 'unknown';
+                        const source = log.Source || log.source || 'unknown';
+                        const message = log.Message || log.message || '';
+                        
+                        let formattedTime;
+                        try {
+                            // Convert to date object
+                            const date = new Date(timestamp);
+                            
+                            // Format in local time with milliseconds
+                            const options = {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false
+                            };
+                            
+                            // Format main part of the timestamp
+                            formattedTime = date.toLocaleString(undefined, options);
+                            
+                            // Add milliseconds
+                            const ms = String(date.getMilliseconds()).padStart(3, '0');
+                            formattedTime += `.${ms}`;
+                        } catch (e) {
+                            console.error("Error formatting timestamp:", e);
+                            formattedTime = String(timestamp);
+                        }
+                        
+                        const row = document.createElement('tr');
+                        row.className = 'hover:bg-gray-50 dark:hover:bg-gray-700';
+                        
+                        let levelClass = 'px-4 py-2 text-sm font-medium whitespace-nowrap ';
+                        
+                        switch(level.toLowerCase()) {
+                            case 'debug':
+                                levelClass += 'text-purple-500 dark:text-purple-400';
+                                break;
+                            case 'info':
+                                levelClass += 'text-blue-500 dark:text-blue-400';
+                                break;
+                            case 'warn':
+                                levelClass += 'text-yellow-500 dark:text-yellow-400';
+                                break;
+                            case 'error':
+                                levelClass += 'text-red-500 dark:text-red-400';
+                                break;
+                            case 'fatal':
+                                levelClass += 'text-red-700 dark:text-red-600 font-bold';
+                                break;
+                            default:
+                                levelClass += 'text-gray-500 dark:text-gray-400';
+                        }
+                        
+                        row.innerHTML = `
+                            <td class="px-4 py-2 text-sm text-gray-500 dark:text-gray-400 whitespace-nowrap">${formattedTime}</td>
+                            <td class="${levelClass}">${level}</td>
+                            <td class="px-4 py-2 text-sm text-gray-500 dark:text-gray-400">${source}</td>
+                            <td class="px-4 py-2 text-sm text-gray-900 dark:text-white font-mono">${message}</td>
+                        `;
+                        
+                        logEntries.appendChild(row);
+                    });
+                    
+                    // Auto-scroll to bottom unless user has scrolled up
+                    const container = logEntries.parentElement;
+                    if (container.scrollTop + container.clientHeight >= container.scrollHeight - 100) {
+                        container.scrollTop = container.scrollHeight;
+                    }
+                }
+                
+                // Pause button click
+                pauseButton.addEventListener('click', function() {
+                    isPaused = true;
+                    pauseButton.classList.add('hidden');
+                    resumeButton.classList.remove('hidden');
+                });
+                
+                // Resume button click
+                resumeButton.addEventListener('click', function() {
+                    isPaused = false;
+                    resumeButton.classList.add('hidden');
+                    pauseButton.classList.remove('hidden');
+                    applyFilters(); // Re-apply filters and update
+                });
+                
+                // Clear button click
+                clearButton.addEventListener('click', function() {
+                    logs = [];
+                    applyFilters();
+                });
+                
+                // Download button click
+                downloadButton.addEventListener('click', function() {
+                    // Create CSV from logs
+                    let csv = 'Timestamp,Level,Source,Message\n';
+                    
+                    logs.forEach(log => {
+                        // Handle capitalized property names from the server
+                        const timestamp = log.Timestamp || log.timestamp;
+                        const level = log.Level || log.level || 'unknown';
+                        const source = log.Source || log.source || 'unknown';
+                        const message = log.Message || log.message || '';
+                        
+                        let formattedTime;
+                        try {
+                            // Convert to date object
+                            const date = new Date(timestamp);
+                            
+                            // Format in local time with milliseconds
+                            const options = {
+                                year: 'numeric',
+                                month: '2-digit',
+                                day: '2-digit',
+                                hour: '2-digit',
+                                minute: '2-digit',
+                                second: '2-digit',
+                                hour12: false
+                            };
+                            
+                            // Format main part of the timestamp
+                            formattedTime = date.toLocaleString(undefined, options);
+                            
+                            // Add milliseconds
+                            const ms = String(date.getMilliseconds()).padStart(3, '0');
+                            formattedTime += `.${ms}`;
+                        } catch (e) {
+                            formattedTime = String(timestamp);
+                        }
+                        
+                        // Properly escape CSV fields
+                        const escapedMessage = message.replace(/"/g, '""');
+                        
+                        csv += `"${formattedTime}","${level}","${source}","${escapedMessage}"\n`;
+                    });
+                    
+                    // Create and trigger download
+                    const blob = new Blob([csv], { type: 'text/csv' });
+                    const url = window.URL.createObjectURL(blob);
+                    const a = document.createElement('a');
+                    const date = new Date().toISOString().replace(/[:.]/g, '-').substring(0, 19);
+                    
+                    a.setAttribute('href', url);
+                    a.setAttribute('download', `gomft-logs-${date}.csv`);
+                    a.click();
+                });
+                
+                // Filter change handlers
+                filterLevel.addEventListener('change', applyFilters);
+                filterSource.addEventListener('change', applyFilters);
+                
+                // Debounce search input
+                let searchTimeout;
+                filterSearch.addEventListener('input', function() {
+                    clearTimeout(searchTimeout);
+                    searchTimeout = setTimeout(applyFilters, 300);
+                });
+                
+                // Initial connection
+                connectWebSocket();
+            });
+        </script>
+    }
+}
+
+// Helper function to get the appropriate CSS class for log levels
+func getLogLevelClass(level string) string {
+    baseClass := "px-4 py-2 text-sm font-medium whitespace-nowrap "
+    
+    switch level {
+    case "debug":
+        return baseClass + "text-purple-500 dark:text-purple-400"
+    case "info":
+        return baseClass + "text-blue-500 dark:text-blue-400"
+    case "warn":
+        return baseClass + "text-yellow-500 dark:text-yellow-400"
+    case "error":
+        return baseClass + "text-red-500 dark:text-red-400"
+    case "fatal":
+        return baseClass + "text-red-700 dark:text-red-600 font-bold"
+    default:
+        return baseClass + "text-gray-500 dark:text-gray-400"
+    }
+} 
\ No newline at end of file
diff --git a/components/layout.templ b/components/layout.templ
index b7c9006..c318405 100644
--- a/components/layout.templ
+++ b/components/layout.templ
@@ -193,6 +193,10 @@ templ LayoutWithContext(title string, ctx context.Context) {
 											<i class="fas fa-clipboard-list w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
 											Audit Logs
 										</a>
+										<a href="/admin/logs" class="group flex items-center px-2 py-2 text-sm font-medium rounded-md text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+											<i class="fas fa-stream w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
+											Log Viewer
+										</a>
 										<a href="/admin/database" class="group flex items-center px-2 py-2 text-sm font-medium rounded-md text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
 											<i class="fas fa-database w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
 											Database Tools
@@ -293,19 +297,23 @@ templ LayoutWithContext(title string, ctx context.Context) {
 										<i class="fas fa-clipboard-list w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
 										Audit Logs
 									</a>
+									<a href="/admin/logs" class="group flex items-center px-2 py-2 text-sm font-medium rounded-md text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+										<i class="fas fa-stream w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
+										Log Viewer
+									</a>
 									<a href="/admin/database" class="group flex items-center px-2 py-2 text-sm font-medium rounded-md text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
 										<i class="fas fa-database w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
 										Database Tools
 									</a>
 									// Settings Dropdown
-									<button type="button" class="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-settings" data-collapse-toggle="dropdown-settings">
+									<button type="button" class="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="dropdown-settings-mobile" data-collapse-toggle="dropdown-settings-mobile">
 										<i class="fas fa-cog w-4 h-4 mr-2 text-gray-500 dark:text-gray-400"></i>
 										<span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">Settings</span>
 										<svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
 											<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
 										</svg>
 									</button>
-									<ul id="dropdown-settings" class="hidden py-2 space-y-2">
+									<ul id="dropdown-settings-mobile" class="hidden py-2 space-y-2">
 										// <li>
 										// 	<a href="#" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">General (Coming Soon)</a>
 										// </li>
@@ -506,6 +514,26 @@ templ LayoutWithContext(title string, ctx context.Context) {
 			<!-- Application scripts -->
 			<script defer src="/static/dist/app.js"></script>
 			<script defer src="/static/dist/init.js"></script>
+			<!-- Dropdown fix for mobile -->
+			<script>
+				document.addEventListener("DOMContentLoaded", function() {
+					// Initialize the mobile dropdown separately
+					const mobileDropdownButton = document.querySelector('[data-collapse-toggle="dropdown-settings-mobile"]');
+					const mobileDropdown = document.getElementById("dropdown-settings-mobile");
+					
+					if (mobileDropdownButton && mobileDropdown) {
+						// Show dropdown if on admin pages
+						if (window.location.pathname.startsWith("/admin")) {
+							// Keep it hidden by default, will be toggled by button
+							mobileDropdown.classList.add("hidden");
+						}
+						
+						mobileDropdownButton.addEventListener("click", function() {
+							mobileDropdown.classList.toggle("hidden");
+						});
+					}
+				});
+			</script>
 		</body>
 	</html>
 }
diff --git a/go.mod b/go.mod
index d65fd64..e9e401c 100644
--- a/go.mod
+++ b/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.2.2 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
diff --git a/go.sum b/go.sum
index 8c21618..1332495 100644
--- a/go.sum
+++ b/go.sum
@@ -56,6 +56,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
 github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
diff --git a/internal/db/db.go b/internal/db/db.go
index aac927b..87599fb 100644
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -33,6 +33,21 @@ func Initialize(dbPath string) (*DB, error) {
 		return nil, fmt.Errorf("failed to run migrations: %v", err)
 	}
 
+	// Close the database connection after migrations
+	sqlDB, err := db.DB()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get underlying database: %v", err)
+	}
+	if err := sqlDB.Close(); err != nil {
+		return nil, fmt.Errorf("failed to close database after migrations: %v", err)
+	}
+
+	// Reopen the database connection for a clean state
+	db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to reconnect to database after migrations: %v", err)
+	}
+
 	return &DB{DB: db}, nil
 }
 
@@ -55,10 +70,3 @@ func (db *DB) Close() error {
 	}
 	return sqlDB.Close()
 }
-
-// GetEnabledAuthProviders returns all enabled authentication providers
-// func (db *DB) GetEnabledAuthProviders(ctx context.Context) ([]AuthProvider, error) {
-// 	var providers []AuthProvider
-// 	result := db.WithContext(ctx).Where("enabled = ?", true).Find(&providers)
-// 	return providers, result.Error
-// }
diff --git a/internal/logging/logger.go b/internal/logging/logger.go
new file mode 100644
index 0000000..f1264a7
--- /dev/null
+++ b/internal/logging/logger.go
@@ -0,0 +1,310 @@
+package logging
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"sync"
+
+	"github.com/starfleetcptn/gomft/internal/web"
+)
+
+var (
+	// Global logger instance
+	stdLogger *Logger
+
+	// Mutex to protect the logger
+	loggerMutex sync.RWMutex
+
+	// Flag to prevent recursive logging
+	isLogging sync.Mutex
+
+	// Log levels
+	LevelDebug   = "debug"
+	LevelInfo    = "info"
+	LevelWarning = "warn"
+	LevelError   = "error"
+	LevelFatal   = "fatal"
+
+	// Regex to parse standard log lines (YYYY/MM/DD HH:MM:SS file:line msg)
+	// Adjust if Lmicroseconds is used
+	logLineRegex *regexp.Regexp
+)
+
+func init() {
+	// Check log flags to build the correct regex
+	flags := log.Flags()
+	timestampFormat := `\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}`
+	if flags&log.Lmicroseconds != 0 {
+		timestampFormat += `\.\d{6}`
+	}
+	fileFormat := ``
+	if flags&log.Lshortfile != 0 || flags&log.Llongfile != 0 {
+		fileFormat = ` (.+?:\d+): ` // Group 1: file:line
+	}
+	// Regex captures: 1=file:line (optional), 2=message
+	logLineRegex = regexp.MustCompile(fmt.Sprintf(`^%s%s(.*)$`, timestampFormat, fileFormat))
+}
+
+// Logger is a custom logger that broadcasts to WebSocket and writes to file
+type Logger struct {
+	fileWriter io.Writer
+	broadcast  bool
+}
+
+// Setup initializes the global logger
+func Setup(logsDir string, broadcast bool) error {
+	// Create logs directory if it doesn't exist
+	if err := os.MkdirAll(logsDir, 0755); err != nil {
+		return fmt.Errorf("failed to create logs directory: %w", err)
+	}
+
+	// Create or open the log file
+	logFilePath := filepath.Join(logsDir, "scheduler.log")
+	logFile, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
+	if err != nil {
+		return fmt.Errorf("failed to open log file: %w", err)
+	}
+
+	// Create a multi-writer to log to both stderr and file
+	multiWriter := io.MultiWriter(os.Stderr, logFile)
+
+	// Initialize the logger with mutex protection
+	loggerMutex.Lock()
+	defer loggerMutex.Unlock()
+
+	stdLogger = &Logger{
+		fileWriter: multiWriter,
+		broadcast:  broadcast,
+	}
+
+	// Configure the standard log package to use our custom logger
+	log.SetOutput(stdLogger)
+	// Ensure standard flags are set (adjust regex if flags change)
+	log.SetFlags(log.LstdFlags | log.Lshortfile | log.Lmicroseconds)
+
+	log.Printf("Logger initialized: broadcasting to WebSocket = %v, file = %s", broadcast, logFilePath)
+	return nil
+}
+
+// Write implements io.Writer interface for capturing standard log output
+func (l *Logger) Write(p []byte) (n int, err error) {
+	// Write to the original outputs first
+	n, err = l.fileWriter.Write(p)
+	if err != nil {
+		return n, err // Return error from underlying writer
+	}
+
+	if !l.broadcast {
+		return n, nil // Broadcasting disabled
+	}
+
+	// Use a mutex to prevent recursive logging from BroadcastLog itself
+	if !isLogging.TryLock() {
+		return n, nil // Already processing a log, skip to avoid recursion
+	}
+	defer isLogging.Unlock()
+
+	// Parse the full log line
+	logLine := string(p)
+	level, source, message := parseLogEntry(logLine)
+
+	// *** DEBUG: Print parsed result to stderr ***
+	fmt.Fprintf(os.Stderr, "[DEBUG-LOGGER-V2] Parsed: Level='%s', Source='%s', Message='%s'\n", level, source, strings.TrimSpace(message))
+
+	// --- TEMPORARILY DISABLED FILTER ---
+	/*
+		// Don't broadcast logs about WebSocket activity to avoid potential loops
+		if source == "handler" || source == "admin_handlers" || strings.Contains(message, "WebSocket") || strings.Contains(message, "Broadcasting log") || source == "routes" {
+			fmt.Fprintf(os.Stderr, "[DEBUG-LOGGER-V2] Filtered out log from source '%s'\n", source)
+			return n, nil
+		}
+	*/
+	// --- END TEMPORARILY DISABLED FILTER ---
+
+	// Broadcast to WebSocket clients if handlers are initialized
+	if handlers, ok := web.GetHandlersInstance(); ok && handlers != nil {
+		fmt.Fprintf(os.Stderr, "[DEBUG-LOGGER-V2] Broadcasting: Level='%s', Source='%s'\n", level, source)
+		handlers.BroadcastLog(level, message, source) // Pass parsed values
+	} else {
+		fmt.Fprintf(os.Stderr, "[DEBUG-LOGGER-V2] Skipped broadcast: handlers not ready\n")
+	}
+
+	return n, nil // Return the number of bytes written and no error
+}
+
+// parseLogEntry extracts level, source, and message from a standard Go log line
+func parseLogEntry(logLine string) (level, source, message string) {
+	// Default values
+	level = LevelInfo
+	source = "system"
+	message = strings.TrimSpace(logLine) // Use full line as message by default
+
+	matches := logLineRegex.FindStringSubmatch(logLine)
+	flags := log.Flags()
+	hasFileInfo := flags&log.Lshortfile != 0 || flags&log.Llongfile != 0
+
+	msgIndex := 1 // Index of the message part in regex matches
+	if hasFileInfo {
+		msgIndex = 2
+	}
+
+	if len(matches) > msgIndex {
+		rawMessage := strings.TrimSpace(matches[msgIndex])
+		message = rawMessage // Assign raw message first
+
+		// Extract source from file info if present
+		if hasFileInfo && len(matches) > 1 && matches[1] != "" {
+			fileInfo := matches[1]
+			parts := strings.Split(fileInfo, ":")
+			if len(parts) > 0 {
+				fileName := filepath.Base(parts[0])
+				source = strings.TrimSuffix(fileName, ".go")
+			}
+		} else {
+			// Attempt to infer source if no file info
+			if strings.Contains(rawMessage, "scheduler") {
+				source = "scheduler"
+			} // Add other inferences if needed
+		}
+
+		// Now, parse the level based on prefixes *within* the rawMessage
+		parsedLevel, cleanMessage := parseLevelFromMessage(rawMessage)
+		level = parsedLevel    // Update level if prefix found
+		message = cleanMessage // Update message to remove prefix
+
+	} else {
+		// Regex didn't match, try basic prefix check on the whole line (fallback)
+		level, message = parseLevelFromMessage(message) // Use original full message
+	}
+
+	return level, source, message
+}
+
+// parseLevelFromMessage checks for level prefixes within a message string
+func parseLevelFromMessage(msg string) (level string, cleanMsg string) {
+	level = LevelInfo // Default
+	cleanMsg = msg
+
+	// Check common prefixes
+	if strings.HasPrefix(msg, "DEBUG:") {
+		level = LevelDebug
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "DEBUG:"))
+	} else if strings.HasPrefix(msg, "INFO:") {
+		level = LevelInfo
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "INFO:"))
+	} else if strings.HasPrefix(msg, "ERROR:") {
+		level = LevelError
+		cleanMsg = strings.TrimPrefix(msg, "ERROR:")
+	} else if strings.HasPrefix(msg, "WARN:") {
+		level = LevelWarning
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "WARN:"))
+	} else if strings.HasPrefix(msg, "WARNING:") {
+		level = LevelWarning
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "WARNING:"))
+	} else if strings.HasPrefix(msg, "FATAL:") {
+		level = LevelFatal
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "FATAL:"))
+	} else if strings.HasPrefix(msg, "[debug]") {
+		level = LevelDebug
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[debug]"))
+	} else if strings.HasPrefix(msg, "[info]") {
+		level = LevelInfo
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[info]"))
+	} else if strings.HasPrefix(msg, "[warn]") {
+		level = LevelWarning
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[warn]"))
+	} else if strings.HasPrefix(msg, "[warning]") {
+		level = LevelWarning
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[warning]"))
+	} else if strings.HasPrefix(msg, "[error]") {
+		level = LevelError
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[error]"))
+	} else if strings.HasPrefix(msg, "[fatal]") {
+		level = LevelFatal
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[fatal]"))
+	}
+
+	return level, cleanMsg
+}
+
+// GetLogger returns the global logger instance
+func GetLogger() *Logger {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+	return stdLogger
+}
+
+// Debug logs a debug message
+func Debug(format string, v ...interface{}) {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+
+	if stdLogger == nil {
+		// Fall back to standard logger if not initialized
+		log.Printf("[debug] "+format, v...)
+		return
+	}
+
+	log.Printf("[debug] "+format, v...)
+}
+
+// Info logs an info message
+func Info(format string, v ...interface{}) {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+
+	if stdLogger == nil {
+		// Fall back to standard logger if not initialized
+		log.Printf("[info] "+format, v...)
+		return
+	}
+
+	log.Printf("[info] "+format, v...)
+}
+
+// Warn logs a warning message
+func Warn(format string, v ...interface{}) {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+
+	if stdLogger == nil {
+		// Fall back to standard logger if not initialized
+		log.Printf("[warn] "+format, v...)
+		return
+	}
+
+	log.Printf("[warn] "+format, v...)
+}
+
+// Error logs an error message
+func Error(format string, v ...interface{}) {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+
+	if stdLogger == nil {
+		// Fall back to standard logger if not initialized
+		log.Printf("[error] "+format, v...)
+		return
+	}
+
+	log.Printf("[error] "+format, v...)
+}
+
+// Fatal logs a fatal message and exits
+func Fatal(format string, v ...interface{}) {
+	loggerMutex.RLock()
+	defer loggerMutex.RUnlock()
+
+	if stdLogger == nil {
+		// Fall back to standard logger if not initialized
+		log.Fatalf("[fatal] "+format, v...)
+		return
+	}
+
+	log.Fatalf("[fatal] "+format, v...)
+}
diff --git a/internal/rclone_service/rclone_service.go b/internal/rclone_service/rclone_service.go
index ed956ea..516dc0b 100644
--- a/internal/rclone_service/rclone_service.go
+++ b/internal/rclone_service/rclone_service.go
@@ -210,12 +210,12 @@ func TestRcloneConnection(config db.TransferConfig, providerType string, dbInsta
 			createArgs = append(createArgs, "domain", domain)
 		}
 	case "webdav":
-		createArgs = append(createArgs, "url", endpoint, "vendor", "other", "user", user)
+		createArgs = append(createArgs, "url", host, "vendor", "other", "user", user)
 		if pass != "" {
 			createArgs = append(createArgs, "pass", pass)
 		}
 	case "nextcloud":
-		createArgs = append(createArgs, "url", endpoint, "vendor", "nextcloud", "user", user)
+		createArgs = append(createArgs, "url", host, "vendor", "nextcloud", "user", user)
 		if pass != "" {
 			createArgs = append(createArgs, "pass", pass)
 		}
diff --git a/internal/scheduler/logger.go b/internal/scheduler/logger.go
index 9bcca15..562404e 100644
--- a/internal/scheduler/logger.go
+++ b/internal/scheduler/logger.go
@@ -24,6 +24,9 @@ const (
 	LogLevelDebug
 )
 
+// BroadcastFunc is a function type that can be used to broadcast logs
+type BroadcastFunc func(level, message, source string)
+
 // String returns the string representation of a log level
 func (l LogLevel) String() string {
 	switch l {
@@ -54,31 +57,70 @@ func ParseLogLevel(level string) LogLevel {
 
 // Logger handles log output to file and console
 type Logger struct {
-	Info     *log.Logger
-	Error    *log.Logger
-	Debug    *log.Logger
-	file     *lumberjack.Logger
-	logLevel LogLevel
+	Info         *log.Logger
+	Error        *log.Logger
+	Debug        *log.Logger
+	file         *lumberjack.Logger
+	logLevel     LogLevel
+	useBroadcast bool
+	broadcastFn  BroadcastFunc
+}
+
+// SetBroadcastFunc sets the function to use for broadcasting logs
+func (l *Logger) SetBroadcastFunc(fn BroadcastFunc) {
+	l.broadcastFn = fn
+	l.useBroadcast = fn != nil
+
+	// Log the setting of the broadcast function to help with troubleshooting
+	if fn != nil {
+		fmt.Fprintf(os.Stderr, "[SCHEDULER-LOGGER] Broadcast function set successfully, logs will be streamed to WebSocket clients\n")
+	} else {
+		fmt.Fprintf(os.Stderr, "[SCHEDULER-LOGGER] Broadcast function cleared or set to nil\n")
+	}
 }
 
 // LogInfo logs an info message if the log level allows it
 func (l *Logger) LogInfo(format string, v ...interface{}) {
 	if l.logLevel >= LogLevelInfo {
-		l.Info.Printf(format, v...)
+		msg := fmt.Sprintf(format, v...)
+		l.Info.Println(msg)
+
+		// If broadcasting is enabled, call the broadcast function
+		if l.useBroadcast && l.broadcastFn != nil {
+			// Add debug output
+			fmt.Fprintf(os.Stderr, "[SCHEDULER-LOGGER-BROADCAST] INFO: %s\n", msg)
+			l.broadcastFn("info", msg, "scheduler")
+		}
 	}
 }
 
 // LogError logs an error message if the log level allows it
 func (l *Logger) LogError(format string, v ...interface{}) {
 	if l.logLevel >= LogLevelError {
-		l.Error.Printf(format, v...)
+		msg := fmt.Sprintf(format, v...)
+		l.Error.Println(msg)
+
+		// If broadcasting is enabled, call the broadcast function
+		if l.useBroadcast && l.broadcastFn != nil {
+			// Add debug output
+			fmt.Fprintf(os.Stderr, "[SCHEDULER-LOGGER-BROADCAST] ERROR: %s\n", msg)
+			l.broadcastFn("error", msg, "scheduler")
+		}
 	}
 }
 
 // LogDebug logs a debug message if the log level allows it
 func (l *Logger) LogDebug(format string, v ...interface{}) {
 	if l.logLevel >= LogLevelDebug {
-		l.Debug.Printf(format, v...)
+		msg := fmt.Sprintf(format, v...)
+		l.Debug.Println(msg)
+
+		// If broadcasting is enabled, call the broadcast function
+		if l.useBroadcast && l.broadcastFn != nil {
+			// Add debug output
+			fmt.Fprintf(os.Stderr, "[SCHEDULER-LOGGER-BROADCAST] DEBUG: %s\n", msg)
+			l.broadcastFn("debug", msg, "scheduler")
+		}
 	}
 }
 
@@ -133,6 +175,12 @@ func NewLogger() *Logger {
 		logLevel = ParseLogLevel(envLogLevel)
 	}
 
+	// Check if we should enable WebSocket broadcasting
+	useBroadcast := true
+	if envBroadcast := os.Getenv("LOG_BROADCAST"); envBroadcast == "false" {
+		useBroadcast = false
+	}
+
 	// Setup log rotation
 	logFile := &lumberjack.Logger{
 		Filename:   filepath.Join(logsDir, "scheduler.log"),
@@ -147,17 +195,19 @@ func NewLogger() *Logger {
 
 	// Create loggers with different prefixes
 	logger := &Logger{
-		Info:     log.New(consoleAndFile, "INFO: ", log.Ldate|log.Ltime),
-		Error:    log.New(consoleAndFile, "ERROR: ", log.Ldate|log.Ltime),
-		Debug:    log.New(consoleAndFile, "DEBUG: ", log.Ldate|log.Ltime),
-		file:     logFile,
-		logLevel: logLevel,
+		Info:         log.New(consoleAndFile, "INFO: ", log.Ldate|log.Ltime),
+		Error:        log.New(consoleAndFile, "ERROR: ", log.Ldate|log.Ltime),
+		Debug:        log.New(consoleAndFile, "DEBUG: ", log.Ldate|log.Ltime),
+		file:         logFile,
+		logLevel:     logLevel,
+		useBroadcast: useBroadcast,
+		broadcastFn:  nil, // Will be set later
 	}
 
 	// Log rotation settings and log level
 	if logLevel >= LogLevelInfo {
-		logger.Info.Printf("Log rotation configured: file=%s, maxSize=%dMB, maxBackups=%d, maxAge=%d days, compress=%v, logLevel=%s",
-			filepath.Join(logsDir, "scheduler.log"), maxSize, maxBackups, maxAge, compress, logLevel.String())
+		logger.Info.Printf("Log rotation configured: file=%s, maxSize=%dMB, maxBackups=%d, maxAge=%d days, compress=%v, logLevel=%s, useBroadcast=%v",
+			filepath.Join(logsDir, "scheduler.log"), maxSize, maxBackups, maxAge, compress, logLevel.String(), useBroadcast)
 	}
 
 	if logLevel >= LogLevelDebug {
diff --git a/internal/web/handlers.go b/internal/web/handlers.go
index 40bbf54..019f05f 100644
--- a/internal/web/handlers.go
+++ b/internal/web/handlers.go
@@ -1,6 +1,8 @@
 package web
 
 import (
+	"path/filepath"
+
 	"github.com/gin-gonic/gin"
 	"github.com/starfleetcptn/gomft/internal/config"
 	"github.com/starfleetcptn/gomft/internal/db"
@@ -14,13 +16,27 @@ type Handler struct {
 	handlers *handlers.Handlers
 }
 
+// Global handlers instance for access from other packages
+var globalHandlersInstance *handlers.Handlers
+
+// GetHandlersInstance returns the global handlers instance and a boolean indicating if it's initialized
+func GetHandlersInstance() (*handlers.Handlers, bool) {
+	return globalHandlersInstance, globalHandlersInstance != nil
+}
+
 // NewHandler creates a new Handler instance that delegates to the handlers package
 func NewHandler(database *db.DB, scheduler *scheduler.Scheduler, jwtSecret string, dbPath string, backupDir string, cfg *config.Config) (*Handler, error) {
 	// Create email service instance
 	emailService := email.NewService(cfg)
 
+	// Use logs directory from config
+	logsDir := filepath.Join(cfg.DataDir, "logs")
+
 	// Create handlers instance
-	handlersInstance := handlers.NewHandlers(database, scheduler, jwtSecret, dbPath, backupDir, "./logs", emailService)
+	handlersInstance := handlers.NewHandlers(database, scheduler, jwtSecret, dbPath, backupDir, logsDir, emailService)
+
+	// Store the handlers instance globally
+	globalHandlersInstance = handlersInstance
 
 	return &Handler{
 		handlers: handlersInstance,
diff --git a/internal/web/handlers/admin_handlers.go b/internal/web/handlers/admin_handlers.go
index a3f71b5..21a2a37 100644
--- a/internal/web/handlers/admin_handlers.go
+++ b/internal/web/handlers/admin_handlers.go
@@ -1,15 +1,22 @@
 package handlers
 
 import (
+	"bufio"
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
+	"log"
 	"math"
 	"net/http"
+	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
+	"sync"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/gorilla/websocket"
 	"github.com/starfleetcptn/gomft/components"
 	"github.com/starfleetcptn/gomft/internal/db"
 )
@@ -1278,3 +1285,440 @@ func (h *Handlers) HandleDeleteUser(c *gin.Context) {
 	// Always use the partial for HTMX delete requests
 	_ = components.UserManagementContent(data).Render(ctx, c.Writer)
 }
+
+// HandleLogViewer renders the log viewer page
+func (h *Handlers) HandleLogViewer(c *gin.Context) {
+	ctx := components.CreateTemplateContext(c)
+
+	// Create logs data for initial page load
+	logFilePath := filepath.Join(h.LogsDir, "scheduler.log")
+
+	// Log the full path for debugging
+	log.Printf("Log viewer initialized with log file path: %s", logFilePath)
+
+	data := components.LogViewerData{
+		Logs:          []components.LogEntry{},
+		CurrentFilter: "",
+		LogFilePath:   logFilePath,
+	}
+
+	// Render the log viewer component
+	components.AdminLogs(ctx, data).Render(ctx, c.Writer)
+}
+
+// HandleLogStream handles WebSocket connections for real-time log streaming
+func (h *Handlers) HandleLogStream(c *gin.Context) {
+	// Configure upgrader
+	upgrader := websocket.Upgrader{
+		ReadBufferSize:  1024,
+		WriteBufferSize: 1024,
+		CheckOrigin: func(r *http.Request) bool {
+			return true // Allow all origins for now
+		},
+	}
+
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] New WebSocket connection request from %s\n", c.ClientIP())
+
+	ws, err := upgrader.Upgrade(c.Writer, c.Request, nil)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Failed to upgrade WebSocket for %s: %v\n", c.ClientIP(), err)
+		return
+	}
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] WebSocket connection upgraded for %s\n", c.ClientIP())
+
+	// Set ping handler to respond with pong
+	ws.SetPingHandler(func(data string) error {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Received ping from %s, responding with pong\n", ws.RemoteAddr())
+		return ws.WriteControl(websocket.PongMessage, []byte{}, time.Now().Add(5*time.Second))
+	})
+
+	// Ensure connection is closed eventually
+	defer func() {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Closing WebSocket connection for %s\n", ws.RemoteAddr())
+		ws.Close()
+	}()
+
+	// Register the new client and create its mutex
+	WebSocketClientsMutex.Lock()
+	WebSocketClients[ws] = true
+	WebSocketClientWriteMutexes[ws] = &sync.Mutex{}
+	numClients := len(WebSocketClients)
+	WebSocketClientsMutex.Unlock()
+
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] Registered client %s. Total clients: %d\n", ws.RemoteAddr(), numClients)
+
+	// De-register the client when the handler exits
+	defer func() {
+		WebSocketClientsMutex.Lock()
+		delete(WebSocketClients, ws)
+		delete(WebSocketClientWriteMutexes, ws)
+		remainingClients := len(WebSocketClients)
+		WebSocketClientsMutex.Unlock()
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] De-registered client %s. Remaining clients: %d\n", ws.RemoteAddr(), remainingClients)
+	}()
+
+	// Send recent logs immediately after connection
+	h.sendRecentLogs(ws)
+
+	// Start a goroutine to send pings periodically to keep the connection alive
+	stopPinger := make(chan struct{})
+	go func() {
+		ticker := time.NewTicker(30 * time.Second)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-ticker.C:
+				if err := ws.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(10*time.Second)); err != nil {
+					fmt.Fprintf(os.Stderr, "[DEBUG-WS] Failed to send ping to client %s: %v\n", ws.RemoteAddr(), err)
+					return
+				}
+				fmt.Fprintf(os.Stderr, "[DEBUG-WS] Sent ping to client %s\n", ws.RemoteAddr())
+			case <-stopPinger:
+				return
+			}
+		}
+	}()
+
+	// Keep the connection alive by reading messages (and discarding them)
+	// This also detects when the client closes the connection.
+	for {
+		messageType, message, err := ws.ReadMessage()
+		if err != nil {
+			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
+				fmt.Fprintf(os.Stderr, "[DEBUG-WS] WebSocket closed unexpectedly for %s: %v\n", ws.RemoteAddr(), err)
+			} else {
+				fmt.Fprintf(os.Stderr, "[DEBUG-WS] WebSocket closed normally for %s.\n", ws.RemoteAddr())
+			}
+			break // Exit loop on Read error
+		}
+
+		// Handle client messages (like ping)
+		if messageType == websocket.TextMessage && len(message) > 0 {
+			fmt.Fprintf(os.Stderr, "[DEBUG-WS] Received message from client %s: %s\n", ws.RemoteAddr(), message)
+
+			// Try to parse as JSON and check for ping
+			var msgData map[string]interface{}
+			if err := json.Unmarshal(message, &msgData); err == nil {
+				if msgType, ok := msgData["type"].(string); ok && msgType == "ping" {
+					fmt.Fprintf(os.Stderr, "[DEBUG-WS] Received ping from client %s, responding with pong\n", ws.RemoteAddr())
+
+					// Send a pong response
+					pongResp := map[string]interface{}{
+						"type": "pong",
+						"time": time.Now().Unix(),
+					}
+
+					WebSocketClientsMutex.Lock()
+					mutex, exists := WebSocketClientWriteMutexes[ws]
+					WebSocketClientsMutex.Unlock()
+
+					if exists {
+						mutex.Lock()
+						err := ws.WriteJSON(pongResp)
+						mutex.Unlock()
+
+						if err != nil {
+							fmt.Fprintf(os.Stderr, "[DEBUG-WS] Error sending pong to client %s: %v\n", ws.RemoteAddr(), err)
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Stop the ping goroutine
+	close(stopPinger)
+}
+
+// sendRecentLogs sends recent log entries to a new WebSocket client
+func (h *Handlers) sendRecentLogs(ws *websocket.Conn) {
+	// Get the mutex for this client *first*
+	WebSocketClientsMutex.Lock()
+	mutex, exists := WebSocketClientWriteMutexes[ws]
+	if !exists {
+		// This shouldn't happen if HandleLogStream is correct, but handle defensively
+		WebSocketClientsMutex.Unlock()
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Mutex not found for client %v during sendRecentLogs. Aborting recent logs send.\n", ws.RemoteAddr())
+		return
+	}
+	WebSocketClientsMutex.Unlock()
+
+	// Construct the path to the log file
+	logFilePath := filepath.Join(h.LogsDir, "scheduler.log")
+
+	// Check if the log file exists
+	if _, err := os.Stat(logFilePath); os.IsNotExist(err) {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Log file not found at %s for sendRecentLogs. Sending example logs.\n", logFilePath)
+		h.sendExampleLogs(ws) // Send examples if main log file isn't there
+		return
+	}
+
+	// Open the log file
+	file, err := os.Open(logFilePath)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Error opening log file %s: %v. Sending example logs.\n", logFilePath, err)
+		h.sendExampleLogs(ws)
+		return
+	}
+	defer file.Close()
+
+	// Read the last 20 lines
+	lines, err := readLastLines(file, 20)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Error reading log file %s: %v. Sending example logs.\n", logFilePath, err)
+		h.sendExampleLogs(ws)
+		return
+	}
+
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] Read %d lines from %s for client %v.\n", len(lines), logFilePath, ws.RemoteAddr())
+
+	// Parse and send each line as a log entry, protected by the client's mutex
+	for _, line := range lines {
+		level, source, message := parseLogLine(line)
+		timestamp := extractTimestamp(line)
+
+		logEntry := components.LogEntry{
+			Timestamp: timestamp,
+			Level:     level,
+			Message:   message,
+			Source:    source,
+		}
+
+		// Use the specific client's mutex
+		// fmt.Fprintf(os.Stderr, "[DEBUG-WS] Sending recent log %d/%d to client %v\n", i+1, len(lines), ws.RemoteAddr())
+		mutex.Lock()
+		err := ws.WriteJSON(logEntry)
+		mutex.Unlock()
+
+		if err != nil {
+			// fmt.Fprintf(os.Stderr, "[DEBUG-WS] Error sending recent log %d to client %v: %v. Stopping recent logs send.\n", i+1, ws.RemoteAddr(), err)
+			// Don't try to remove the client here, let the main read loop handle it
+			break // Stop sending recent logs on first error
+		}
+	}
+	// fmt.Fprintf(os.Stderr, "[DEBUG-WS] Finished sending %d recent logs to client %v.\n", len(lines), ws.RemoteAddr())
+}
+
+// readLastLines reads the last n lines from a file
+func readLastLines(file *os.File, n int) ([]string, error) {
+	// Implement a simpler version that reads the whole file and keeps the last n lines
+	scanner := bufio.NewScanner(file)
+	var lines []string
+
+	// Read all lines
+	for scanner.Scan() {
+		lines = append(lines, scanner.Text())
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
+	// Return the last n lines (or all if less than n)
+	if len(lines) <= n {
+		return lines, nil
+	}
+
+	return lines[len(lines)-n:], nil
+}
+
+// parseLogLine extracts level, source, and message from a log line
+// This is specific to the format found in the log file being read,
+// NOT the format generated by the standard Go logger directly.
+func parseLogLine(line string) (level, source, message string) {
+	// Default values
+	level = "info"
+	source = "system"
+	originalLine := line // Keep original for prefix check
+
+	// Check for level prefixes first
+	foundPrefix := false
+	if strings.HasPrefix(originalLine, "DEBUG:") { // Check original line for prefix
+		level = "debug"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "DEBUG:"))
+		foundPrefix = true
+	} else if strings.HasPrefix(originalLine, "INFO:") {
+		level = "info"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "INFO:"))
+		foundPrefix = true
+	} else if strings.HasPrefix(originalLine, "ERROR:") {
+		level = "error"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "ERROR:"))
+		foundPrefix = true
+	} else if strings.HasPrefix(originalLine, "WARN:") {
+		level = "warn"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "WARN:"))
+		foundPrefix = true
+	} else if strings.HasPrefix(originalLine, "WARNING:") {
+		level = "warn"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "WARNING:"))
+		foundPrefix = true
+	} else if strings.HasPrefix(originalLine, "FATAL:") {
+		level = "fatal"
+		line = strings.TrimSpace(strings.TrimPrefix(originalLine, "FATAL:"))
+		foundPrefix = true
+	}
+
+	// Now parse the rest (timestamp + message) using the potentially modified 'line'
+	parts := strings.SplitN(line, " ", 3)
+	if len(parts) >= 3 {
+		message = parts[2] // The rest is the message
+
+		// Try to extract source *only if no level prefix was found initially*
+		// Assumes standard log format prefixes message with file:line
+		if !foundPrefix {
+			if fileStart := strings.Index(message, " "); fileStart > 0 {
+				filePath := message[:fileStart]
+				if strings.Contains(filePath, ":") {
+					filePathParts := strings.Split(filePath, "/")
+					if len(filePathParts) > 0 {
+						fileNameWithLine := filePathParts[len(filePathParts)-1]
+						fileName := strings.Split(fileNameWithLine, ":")[0]
+						source = strings.TrimSuffix(fileName, ".go")
+					}
+				}
+				// Update message to remove the file info
+				message = message[fileStart+1:]
+			}
+		}
+
+		// If no prefix was found, attempt level detection from message content (e.g., [info])
+		if !foundPrefix {
+			parsedLevel, cleanMessage := parseLevelFromMessageContent(message)
+			level = parsedLevel
+			message = cleanMessage
+		}
+
+	} else {
+		// Fallback if split doesn't work as expected, use the (potentially prefix-stripped) line
+		message = line
+	}
+
+	return level, source, message
+}
+
+// parseLevelFromMessageContent checks for bracketed level indicators
+func parseLevelFromMessageContent(msg string) (string, string) {
+	level := "info" // Default
+	cleanMsg := msg
+
+	if strings.HasPrefix(msg, "[debug]") {
+		level = "debug"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[debug]"))
+	} else if strings.HasPrefix(msg, "[info]") {
+		level = "info"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[info]"))
+	} else if strings.HasPrefix(msg, "[warn]") {
+		level = "warn"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[warn]"))
+	} else if strings.HasPrefix(msg, "[warning]") {
+		level = "warn"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[warning]"))
+	} else if strings.HasPrefix(msg, "[error]") {
+		level = "error"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[error]"))
+	} else if strings.HasPrefix(msg, "[fatal]") {
+		level = "fatal"
+		cleanMsg = strings.TrimSpace(strings.TrimPrefix(msg, "[fatal]"))
+	}
+	// Optional: Add inference based on keywords like the logger does
+	// else if strings.Contains(strings.ToLower(msg), "error") { level = "error" } ...
+	return level, cleanMsg
+}
+
+// extractTimestamp extracts the timestamp from a log line, handling potential prefixes
+func extractTimestamp(line string) time.Time {
+	now := time.Now() // Default
+	originalLine := line
+
+	// Remove known level prefixes for timestamp parsing
+	prefixes := []string{"DEBUG:", "INFO:", "ERROR:", "WARN:", "WARNING:", "FATAL:"}
+	for _, prefix := range prefixes {
+		if strings.HasPrefix(line, prefix) {
+			line = strings.TrimSpace(strings.TrimPrefix(line, prefix))
+			break
+		}
+	}
+
+	// Try to extract timestamp parts (date and time)
+	parts := strings.SplitN(line, " ", 3)
+	if len(parts) >= 2 {
+		dateStr := parts[0]
+		timeStr := parts[1]
+		timestampStr := dateStr + " " + timeStr
+
+		// List of timestamp formats to try
+		formats := []string{
+			"2006/01/02 15:04:05",        // Standard Go log with slashes
+			"2006/01/02 15:04:05.999",    // With milliseconds
+			"2006/01/02 15:04:05.999999", // With microseconds
+			"2006-01-02 15:04:05",        // Standard Go log with dashes
+			"2006-01-02 15:04:05.999",    // With milliseconds
+			"2006-01-02 15:04:05.999999", // With microseconds
+		}
+
+		for _, format := range formats {
+			timestamp, err := time.Parse(format, timestampStr)
+			if err == nil {
+				return timestamp // Successfully parsed
+			}
+		}
+		// If all formats failed, log the original attempt
+		fmt.Fprintf(os.Stderr, "[DEBUG-TIMESTAMP] Failed to parse timestamp from '%s' (derived from line: %s)\n", timestampStr, originalLine)
+	} else {
+		fmt.Fprintf(os.Stderr, "[DEBUG-TIMESTAMP] Could not split timestamp parts from line: %s\n", originalLine)
+	}
+
+	return now // Return current time if parsing failed
+}
+
+// sendExampleLogs sends example log entries for demonstration
+func (h *Handlers) sendExampleLogs(ws *websocket.Conn) {
+	// Get the mutex for this client *first*
+	WebSocketClientsMutex.Lock()
+	mutex, exists := WebSocketClientWriteMutexes[ws]
+	if !exists {
+		WebSocketClientsMutex.Unlock()
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Mutex not found for client %v during sendExampleLogs. Aborting example logs send.\n", ws.RemoteAddr())
+		return
+	}
+	WebSocketClientsMutex.Unlock()
+
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] Sending example logs to client %v\n", ws.RemoteAddr())
+
+	// Example log entries for demonstration
+	exampleLogs := []components.LogEntry{
+		{
+			Timestamp: time.Now().UTC().Add(-time.Minute * 5),
+			Level:     "info",
+			Message:   "Application started successfully",
+			Source:    "main",
+		},
+		{
+			Timestamp: time.Now().UTC().Add(-time.Minute * 3),
+			Level:     "debug",
+			Message:   "Connected to database",
+			Source:    "database",
+		},
+		{
+			Timestamp: time.Now().UTC().Add(-time.Minute * 2),
+			Level:     "warn",
+			Message:   "High memory usage detected: 85%",
+			Source:    "monitor",
+		},
+	}
+
+	for i, logEntry := range exampleLogs {
+		// Use the specific client's mutex
+		fmt.Fprintf(os.Stderr, "[DEBUG-WS] Sending example log %d/%d to client %v\n", i+1, len(exampleLogs), ws.RemoteAddr())
+		mutex.Lock()
+		err := ws.WriteJSON(logEntry)
+		mutex.Unlock()
+
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "[DEBUG-WS] Error sending example log %d to client %v: %v. Stopping example logs send.\n", i+1, ws.RemoteAddr(), err)
+			break // Stop sending example logs on first error
+		}
+	}
+	fmt.Fprintf(os.Stderr, "[DEBUG-WS] Finished sending example logs to client %v.\n", ws.RemoteAddr())
+}
diff --git a/internal/web/handlers/handler.go b/internal/web/handlers/handler.go
index 2438601..c96db1f 100644
--- a/internal/web/handlers/handler.go
+++ b/internal/web/handlers/handler.go
@@ -1,13 +1,30 @@
 package handlers
 
 import (
+	"fmt"
+	"os"
+	"sync"
 	"time"
 
+	"github.com/gorilla/websocket"
+	"github.com/starfleetcptn/gomft/components"
 	"github.com/starfleetcptn/gomft/internal/db"
 	"github.com/starfleetcptn/gomft/internal/email"
 	"github.com/starfleetcptn/gomft/internal/scheduler"
 )
 
+// WebSocketClients maintains the set of active WebSocket clients
+var WebSocketClients = make(map[*websocket.Conn]bool)
+
+// WebSocketClientsMutex protects the WebSocketClients map
+var WebSocketClientsMutex = &sync.Mutex{}
+
+// WebSocketClientWriteMutexes maintains individual write mutexes for each client
+var WebSocketClientWriteMutexes = make(map[*websocket.Conn]*sync.Mutex)
+
+// LogChannel is used to send log entries to all WebSocket clients
+var LogChannel = make(chan components.LogEntry, 512)
+
 // Handlers contains all the dependencies needed by the handlers
 type Handlers struct {
 	DB        *db.DB
@@ -22,7 +39,7 @@ type Handlers struct {
 
 // NewHandlers creates a new Handlers instance
 func NewHandlers(database *db.DB, scheduler scheduler.SchedulerInterface, jwtSecret string, dbPath string, backupDir string, logsDir string, emailService *email.Service) *Handlers {
-	return &Handlers{
+	h := &Handlers{
 		DB:        database,
 		Scheduler: scheduler,
 		JWTSecret: jwtSecret,
@@ -32,4 +49,112 @@ func NewHandlers(database *db.DB, scheduler scheduler.SchedulerInterface, jwtSec
 		LogsDir:   logsDir,
 		Email:     emailService,
 	}
+
+	// Start the WebSocket log broadcaster
+	StartLogBroadcaster()
+
+	return h
+}
+
+// StartLogBroadcaster starts a goroutine that broadcasts logs to all connected WebSocket clients
+func StartLogBroadcaster() {
+	go func() {
+		fmt.Fprintln(os.Stderr, "[DEBUG-BROADCASTER-V4] Broadcaster goroutine started.")
+		for {
+			logEntry := <-LogChannel // Wait for a log entry
+
+			WebSocketClientsMutex.Lock()
+			clientsToSend := make(map[*websocket.Conn]*sync.Mutex)
+			for client, mutex := range WebSocketClientWriteMutexes {
+				if _, exists := WebSocketClients[client]; exists {
+					clientsToSend[client] = mutex
+				}
+			}
+			WebSocketClientsMutex.Unlock()
+
+			if len(clientsToSend) == 0 {
+				continue // Skip if no clients
+			}
+
+			fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Received log. Broadcasting to %d clients. Level='%s', Src='%s'\n",
+				len(clientsToSend), logEntry.Level, logEntry.Source)
+
+			var wg sync.WaitGroup
+			for client, mutex := range clientsToSend {
+				wg.Add(1)
+				go func(c *websocket.Conn, m *sync.Mutex, entry components.LogEntry) {
+					defer wg.Done()
+
+					fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Attempting send to client %v\n", c.RemoteAddr())
+
+					// Lock only for this specific client's write
+					m.Lock()
+					// Set a deadline for the write operation
+					deadline := time.Now().Add(5 * time.Second) // 5-second deadline
+					err := c.SetWriteDeadline(deadline)
+					if err != nil {
+						fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Error setting write deadline for client %v: %v\n", c.RemoteAddr(), err)
+						// Don't unlock yet, proceed to cleanup
+					} else {
+						err = c.WriteJSON(entry)
+					}
+					m.Unlock() // Unlock after write attempt (or deadline error)
+
+					if err != nil {
+						fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Error writing to client %v: %v. Initiating removal.\n", c.RemoteAddr(), err)
+						WebSocketClientsMutex.Lock()
+						if _, stillExists := WebSocketClients[c]; stillExists {
+							delete(WebSocketClients, c)
+							delete(WebSocketClientWriteMutexes, c)
+							fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Removed client %v from maps.\n", c.RemoteAddr())
+						} else {
+							fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Client %v already removed by another process.\n", c.RemoteAddr())
+						}
+						WebSocketClientsMutex.Unlock()
+						c.Close() // Close the connection outside the lock
+					} else {
+						fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTER-V4] Successfully sent to client %v\n", c.RemoteAddr())
+					}
+				}(client, mutex, logEntry)
+			}
+			wg.Wait() // Wait for all sends in this batch to complete or fail
+		}
+	}()
+}
+
+// BroadcastLog sends a log entry to all connected WebSocket clients
+func (h *Handlers) BroadcastLog(level, message, source string) {
+	// NOTE: Level prefix parsing is now handled in logger.go/parseLogEntry
+
+	// Create log entry with UTC timestamp for consistency
+	logEntry := components.LogEntry{
+		Timestamp: time.Now().UTC(),
+		Level:     level,
+		Message:   message,
+		Source:    source,
+	}
+
+	// Get the current number of clients (avoid logging in case of recursive issues)
+	numClients := 0
+	WebSocketClientsMutex.Lock()
+	numClients = len(WebSocketClients)
+	WebSocketClientsMutex.Unlock()
+
+	// Only attempt to write to channel if there are clients
+	if numClients > 0 {
+		// *** DEBUG: Print channel send attempt ***
+		fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTLOG-V4] Attempting to send to LogChannel: Level='%s', Source='%s'\n", level, source)
+
+		// Try to send the log entry to the channel with a timeout
+		select {
+		case LogChannel <- logEntry:
+			// Successfully sent
+			fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTLOG-V4] Successfully sent to LogChannel.\n")
+		case <-time.After(100 * time.Millisecond):
+			// Channel is full or blocked, log and continue
+			fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTLOG-V4] Log channel timeout, discarding log entry: %s\n", message)
+		}
+	} else {
+		fmt.Fprintf(os.Stderr, "[DEBUG-BROADCASTLOG-V4] No clients connected, skipping send to LogChannel.\n")
+	}
 }
diff --git a/internal/web/handlers/routes.go b/internal/web/handlers/routes.go
index b21f7e6..f98006a 100644
--- a/internal/web/handlers/routes.go
+++ b/internal/web/handlers/routes.go
@@ -132,9 +132,11 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
 		{
 			adminRoles.GET("", h.HandleRoles)
 			adminRoles.GET("/new", h.HandleNewRole)
+			adminRoles.GET("/:id", h.HandleEditRole)
 			adminRoles.GET("/:id/edit", h.HandleRoles)
 			adminRoles.POST("", h.HandleCreateRole)
-			adminRoles.PUT("/:id", h.HandleEditRole)
+			adminRoles.POST("/:id", h.HandleUpdateRole)
+			adminRoles.PUT("/:id", h.HandleUpdateRole)
 			adminRoles.DELETE("/:id", h.HandleDeleteRole)
 		}
 
@@ -146,6 +148,14 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
 			auditGroup.GET("/export", h.PermissionMiddleware("audit.export"), h.HandleExportAuditLogs)
 		}
 
+		// Log viewer routes
+		logsGroup := admin.Group("/logs")
+		logsGroup.Use(h.PermissionMiddleware("logs.view"))
+		{
+			logsGroup.GET("", h.HandleLogViewer)
+			logsGroup.GET("/ws", h.HandleLogStream)
+		}
+
 		// System settings routes
 		settingsGroup := admin.Group("/settings")
 		settingsGroup.Use(h.PermissionMiddleware("system.settings"))
diff --git a/main.go b/main.go
index 078cf18..c5fb77f 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,7 @@ import (
 	"github.com/starfleetcptn/gomft/components"
 	"github.com/starfleetcptn/gomft/internal/config"
 	"github.com/starfleetcptn/gomft/internal/db"
+	"github.com/starfleetcptn/gomft/internal/logging"
 	"github.com/starfleetcptn/gomft/internal/scheduler"
 	"github.com/starfleetcptn/gomft/internal/web"
 	"golang.org/x/crypto/bcrypt"
@@ -65,14 +66,27 @@ func main() {
 	// Set Gin to release mode
 	gin.SetMode(gin.ReleaseMode)
 
-	log.SetFlags(log.LstdFlags | log.Lshortfile)
-	log.Printf("Starting GoMFT server version %s...", components.AppVersion)
-
 	// Initialize configuration
 	cfg, err := config.Load()
 	if err != nil {
-		log.Fatalf("Failed to load configuration: %v", err)
+		fmt.Printf("Failed to load configuration: %v\n", err)
+		os.Exit(1)
 	}
+
+	// Ensure logs directory exists
+	logsDir := filepath.Join(cfg.DataDir, "logs")
+	if err := os.MkdirAll(logsDir, 0755); err != nil {
+		fmt.Printf("Failed to create logs directory: %v\n", err)
+		os.Exit(1)
+	}
+
+	// Initialize logger with file output and WebSocket broadcasting
+	if err := logging.Setup(logsDir, true); err != nil {
+		fmt.Printf("Failed to initialize logger: %v\n", err)
+		os.Exit(1)
+	}
+
+	log.Printf("Starting GoMFT server version %s...", components.AppVersion)
 	log.Printf("Configuration loaded successfully")
 
 	// Ensure required directories exist
@@ -206,6 +220,14 @@ func main() {
 	webHandler.InitializeRoutes(router)
 	log.Printf("Web handlers initialized successfully")
 
+	// Connect scheduler logger to WebSocket broadcast system
+	if handlers, ok := web.GetHandlersInstance(); ok && handlers != nil {
+		schedLogger.SetBroadcastFunc(handlers.BroadcastLog)
+		log.Printf("Scheduler logger connected to WebSocket broadcast system")
+	} else {
+		log.Printf("Warning: Could not connect scheduler logger to WebSocket broadcast system - handlers not ready")
+	}
+
 	// Initialize API routes
 	// Commenting out the API routes initialization to avoid route conflicts
 	// api.InitializeRoutes(router, database, scheduler, cfg.JWTSecret)