diff --git a/src/public/index.html b/src/public/index.html
index c49b5f371..50c925400 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -871,18 +871,37 @@
   <!-- Settings Modal -->
   <div id="settings-modal" class="fixed inset-0 z-50 hidden items-center justify-center bg-black bg-opacity-50">
     <div class="modal-content bg-white dark:bg-gray-800 rounded-lg shadow-xl w-full max-w-6xl max-h-[90vh] flex flex-col m-4">
-      <div class="modal-header flex justify-between items-center border-b border-gray-300 dark:border-gray-700 p-6">
-        <h2 class="text-xl font-semibold text-gray-900 dark:text-gray-100">Configuration Settings</h2>
+      <div class="modal-header flex justify-between items-center border-b border-gray-300 dark:border-gray-700 px-6 py-4">
+        <h2 class="text-lg font-semibold text-gray-900 dark:text-gray-100">Configuration Settings</h2>
         <button id="settings-modal-close" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
           <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
             <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
           </svg>
         </button>
       </div>
+      
+      <!-- Tab Navigation -->
+      <div class="border-b border-gray-200 dark:border-gray-700">
+        <nav class="flex space-x-8 px-6" id="settings-tabs">
+          <button class="settings-tab active py-3 px-1 border-b-2 border-blue-500 text-blue-600 dark:text-blue-400 font-medium text-sm" data-tab="proxmox">
+            Proxmox VE
+          </button>
+          <button class="settings-tab py-3 px-1 border-b-2 border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 font-medium text-sm" data-tab="pbs">
+            Backup Server
+          </button>
+          <button class="settings-tab py-3 px-1 border-b-2 border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 font-medium text-sm" data-tab="alerts">
+            Alerts
+          </button>
+          <button class="settings-tab py-3 px-1 border-b-2 border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 font-medium text-sm" data-tab="system">
+            System
+          </button>
+        </nav>
+      </div>
+      
       <div id="settings-modal-body" class="overflow-y-auto flex-grow p-6 scrollbar">
         <p class="text-gray-500 dark:text-gray-400">Loading configuration...</p>
       </div>
-      <div class="modal-footer border-t border-gray-300 dark:border-gray-700 p-6">
+      <div class="modal-footer border-t border-gray-300 dark:border-gray-700 px-6 py-4">
         <div class="flex gap-3 justify-end">
           <button type="button" id="settings-cancel-button" class="px-4 py-2 bg-gray-500 hover:bg-gray-600 text-white text-sm font-medium rounded-md transition-colors">
             Cancel
diff --git a/src/public/js/ui/settings.js b/src/public/js/ui/settings.js
index 976810a90..8816e845b 100644
--- a/src/public/js/ui/settings.js
+++ b/src/public/js/ui/settings.js
@@ -3,6 +3,7 @@ PulseApp.ui = PulseApp.ui || {};
 PulseApp.ui.settings = (() => {
     let currentConfig = {};
     let isInitialized = false;
+    let activeTab = 'proxmox';
 
     function init() {
         if (isInitialized) return;
@@ -52,66 +53,97 @@ PulseApp.ui.settings = (() => {
                 closeModal();
             }
         });
-        
+
+        // Set up tab navigation
+        setupTabNavigation();
+
         isInitialized = true;
         console.log('[Settings] Settings module initialized');
     }
 
+    function setupTabNavigation() {
+        const tabButtons = document.querySelectorAll('.settings-tab');
+        
+        tabButtons.forEach(button => {
+            button.addEventListener('click', (e) => {
+                const tabName = e.target.getAttribute('data-tab');
+                switchTab(tabName);
+            });
+        });
+    }
+
+    function switchTab(tabName) {
+        activeTab = tabName;
+        
+        // Update tab buttons
+        const tabButtons = document.querySelectorAll('.settings-tab');
+        tabButtons.forEach(button => {
+            const isActive = button.getAttribute('data-tab') === tabName;
+            
+            if (isActive) {
+                button.classList.add('active');
+                button.classList.remove('border-transparent', 'text-gray-500', 'dark:text-gray-400');
+                button.classList.add('border-blue-500', 'text-blue-600', 'dark:text-blue-400');
+            } else {
+                button.classList.remove('active');
+                button.classList.remove('border-blue-500', 'text-blue-600', 'dark:text-blue-400');
+                button.classList.add('border-transparent', 'text-gray-500', 'dark:text-gray-400');
+            }
+        });
+
+        // Update content
+        renderTabContent();
+    }
+
     async function openModal() {
-        console.log('[Settings] Opening settings modal...');
+        console.log('[Settings] Opening modal...');
         
         const modal = document.getElementById('settings-modal');
-        const body = document.getElementById('settings-modal-body');
-        
-        if (!modal || !body) return;
-        
-        // Show modal
+        if (!modal) return;
+
+        // Show the modal
         modal.classList.remove('hidden');
         modal.classList.add('flex');
-        
+
         // Load current configuration
-        try {
-            await loadCurrentConfig();
-        } catch (error) {
-            console.error('[Settings] Failed to load configuration:', error);
-            // Initialize with empty config to prevent errors
-            currentConfig = {};
-        }
+        await loadConfiguration();
         
-        // Always render the form, even if config loading failed
-        renderConfigurationForm();
+        // Reset to first tab
+        switchTab('proxmox');
     }
 
     function closeModal() {
-        console.log('[Settings] Closing settings modal...');
+        console.log('[Settings] Closing modal...');
         
         const modal = document.getElementById('settings-modal');
-        if (modal) {
-            modal.classList.add('hidden');
-            modal.classList.remove('flex');
-        }
+        if (!modal) return;
+
+        modal.classList.add('hidden');
+        modal.classList.remove('flex');
     }
 
-    async function loadCurrentConfig() {
+    async function loadConfiguration() {
         try {
             const response = await fetch('/api/config');
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}`);
+            const data = await response.json();
+            
+            if (response.ok && data.success) {
+                currentConfig = data.config;
+                console.log('[Settings] Configuration loaded:', currentConfig);
+                renderTabContent();
+            } else {
+                console.error('[Settings] Failed to load configuration:', data.error);
+                showMessage('Failed to load configuration', 'error');
             }
-            
-            const configData = await response.json();
-            currentConfig = configData || {}; // Ensure we never have null/undefined
-            console.log('[Settings] Current config loaded:', currentConfig);
-            
         } catch (error) {
-            console.error('[Settings] Failed to load current configuration:', error);
-            throw error;
+            console.error('[Settings] Error loading configuration:', error);
+            showMessage('Failed to load configuration: ' + error.message, 'error');
         }
     }
 
-    function renderConfigurationForm() {
-        const body = document.getElementById('settings-modal-body');
-        if (!body) return;
+    function renderTabContent() {
+        const container = document.getElementById('settings-modal-body');
+        if (!container) return;
 
         // Ensure currentConfig has a safe default structure
         const safeConfig = currentConfig || {};
@@ -120,479 +152,359 @@ PulseApp.ui.settings = (() => {
         const advanced = safeConfig.advanced || {};
         const alerts = advanced.alerts || {};
 
-        const html = `
-            <form id="settings-form" class="space-y-6">
-                <!-- Proxmox VE Primary Endpoint -->
-                <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
-                    <div class="mb-4">
-                        <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Primary Proxmox VE Server</h3>
-                        <p class="text-sm text-gray-600 dark:text-gray-400">Main PVE server configuration (required)</p>
+        let content = '';
+
+        switch (activeTab) {
+            case 'proxmox':
+                content = renderProxmoxTab(proxmox, safeConfig);
+                break;
+            case 'pbs':
+                content = renderPBSTab(pbs, safeConfig);
+                break;
+            case 'alerts':
+                content = renderAlertsTab(alerts);
+                break;
+            case 'system':
+                content = renderSystemTab(advanced, safeConfig);
+                break;
+        }
+
+        container.innerHTML = `<form id="settings-form" class="space-y-6">${content}</form>`;
+        
+        // Load existing additional endpoints for Proxmox and PBS tabs
+        if (activeTab === 'proxmox') {
+            loadExistingPveEndpoints();
+        } else if (activeTab === 'pbs') {
+            loadExistingPbsEndpoints();
+        }
+    }
+
+    function renderProxmoxTab(proxmox, config) {
+        return `
+            <!-- Primary Proxmox VE Configuration -->
+            <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
+                <div class="mb-4">
+                    <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Primary Proxmox VE Server</h3>
+                    <p class="text-sm text-gray-600 dark:text-gray-400">Main PVE server configuration (required)</p>
+                </div>
+                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Host Address <span class="text-red-500">*</span>
+                        </label>
+                        <input type="text" name="PROXMOX_HOST" required
+                               value="${proxmox.host || ''}"
+                               placeholder="https://proxmox.example.com:8006"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
                     </div>
-                    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Host Address <span class="text-red-500">*</span>
-                            </label>
-                            <input type="text" name="PROXMOX_HOST" required
-                                   value="${proxmox.host || ''}"
-                                   placeholder="https://proxmox.example.com:8006"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
-                            <input type="number" name="PROXMOX_PORT"
-                                   value="${proxmox.port || ''}"
-                                   placeholder="8006"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Node Name
-                            </label>
-                            <input type="text" name="PROXMOX_NODE_NAME"
-                                   value="${proxmox.nodeName || ''}"
-                                   placeholder="Display name (optional)"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                API Token ID <span class="text-red-500">*</span>
-                            </label>
-                            <input type="text" name="PROXMOX_TOKEN_ID" required
-                                   value="${proxmox.tokenId || ''}"
-                                   placeholder="root@pam!token-name"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                API Token Secret
-                            </label>
-                            <input type="password" name="PROXMOX_TOKEN_SECRET"
-                                   placeholder="Leave blank to keep current"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Enabled</label>
-                            <input type="checkbox" name="PROXMOX_ENABLED" ${proxmox.enabled !== false ? 'checked' : ''}
-                                   class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                        </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
+                        <input type="number" name="PROXMOX_PORT"
+                               value="${proxmox.port || ''}"
+                               placeholder="8006"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Node Name
+                        </label>
+                        <input type="text" name="PROXMOX_NODE_NAME"
+                               value="${proxmox.nodeName || ''}"
+                               placeholder="Display name (optional)"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            API Token ID <span class="text-red-500">*</span>
+                        </label>
+                        <input type="text" name="PROXMOX_TOKEN_ID" required
+                               value="${proxmox.tokenId || ''}"
+                               placeholder="root@pam!token-name"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            API Token Secret
+                        </label>
+                        <input type="password" name="PROXMOX_TOKEN_SECRET"
+                               placeholder="Leave blank to keep current"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Enabled</label>
+                        <input type="checkbox" name="PROXMOX_ENABLED" ${proxmox.enabled !== false ? 'checked' : ''}
+                               class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
                     </div>
                 </div>
+            </div>
 
-                <!-- Additional Proxmox VE Endpoints -->
-                <div id="additional-pve-endpoints">
-                    <div class="flex justify-between items-center mb-4">
+            <!-- Additional Proxmox VE Endpoints -->
+            <div id="additional-pve-endpoints">
+                <div class="flex justify-between items-center mb-4">
+                    <div>
+                        <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Additional Proxmox VE Servers</h3>
+                        <p class="text-sm text-gray-600 dark:text-gray-400">Add more PVE servers beyond the primary one above</p>
+                    </div>
+                    <button type="button" onclick="PulseApp.ui.settings.addPveEndpoint()" 
+                            class="flex items-center gap-2 px-3 py-1 bg-blue-600 hover:bg-blue-700 text-white text-sm rounded-md">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+                        </svg>
+                        Add Another PVE Server
+                    </button>
+                </div>
+                <div id="pve-endpoints-container" class="space-y-4">
+                    <div class="text-center py-8 text-gray-500 dark:text-gray-400 italic border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg">
+                        No additional PVE servers configured.<br>
+                        <span class="text-sm">Click "Add Another PVE Server" to add more.</span>
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+
+    function renderPBSTab(pbs, config) {
+        return `
+            <!-- Primary PBS Configuration -->
+            <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
+                <div class="mb-4">
+                    <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Primary Proxmox Backup Server</h3>
+                    <p class="text-sm text-gray-600 dark:text-gray-400">Main PBS server configuration (optional)</p>
+                </div>
+                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
+                        <input type="text" name="PBS_HOST"
+                               value="${pbs.host || ''}"
+                               placeholder="https://pbs.example.com:8007"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
+                        <input type="number" name="PBS_PORT"
+                               value="${pbs.port || ''}"
+                               placeholder="8007"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Node Name
+                        </label>
+                        <input type="text" name="PBS_NODE_NAME"
+                               value="${pbs.nodeName || ''}"
+                               placeholder="PBS internal hostname"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token ID</label>
+                        <input type="text" name="PBS_TOKEN_ID"
+                               value="${pbs.tokenId || ''}"
+                               placeholder="root@pam!token-name"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token Secret</label>
+                        <input type="password" name="PBS_TOKEN_SECRET"
+                               placeholder="Leave blank to keep current"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                </div>
+            </div>
+
+            <!-- Additional PBS Endpoints -->
+            <div id="additional-pbs-endpoints">
+                <div class="flex justify-between items-center mb-4">
+                    <div>
+                        <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Additional PBS Servers</h3>
+                        <p class="text-sm text-gray-600 dark:text-gray-400">Add more PBS servers beyond the primary one above</p>
+                    </div>
+                    <button type="button" onclick="PulseApp.ui.settings.addPbsEndpoint()" 
+                            class="flex items-center gap-2 px-3 py-1 bg-green-600 hover:bg-green-700 text-white text-sm rounded-md">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+                        </svg>
+                        Add Another PBS Server
+                    </button>
+                </div>
+                <div id="pbs-endpoints-container" class="space-y-4">
+                    <div class="text-center py-8 text-gray-500 dark:text-gray-400 italic border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg">
+                        No additional PBS servers configured.<br>
+                        <span class="text-sm">Click "Add Another PBS Server" to add more.</span>
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+
+    function renderAlertsTab(alerts) {
+        return `
+            <!-- Alert Settings -->
+            <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
+                <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Alert Configuration</h3>
+                
+                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
+                    <label class="flex items-center">
+                        <input type="checkbox" name="ALERT_CPU_ENABLED" ${alerts.cpu?.enabled !== false ? 'checked' : ''}
+                               class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">CPU Alerts</span>
+                    </label>
+                    <label class="flex items-center">
+                        <input type="checkbox" name="ALERT_MEMORY_ENABLED" ${alerts.memory?.enabled !== false ? 'checked' : ''}
+                               class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Memory Alerts</span>
+                    </label>
+                    <label class="flex items-center">
+                        <input type="checkbox" name="ALERT_DISK_ENABLED" ${alerts.disk?.enabled !== false ? 'checked' : ''}
+                               class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Disk Alerts</span>
+                    </label>
+                    <label class="flex items-center">
+                        <input type="checkbox" name="ALERT_DOWN_ENABLED" ${alerts.down?.enabled !== false ? 'checked' : ''}
+                               class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Down Alerts</span>
+                    </label>
+                </div>
+
+                <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            CPU Threshold (%)
+                        </label>
+                        <input type="number" name="ALERT_CPU_THRESHOLD"
+                               value="${alerts.cpu?.threshold || ''}"
+                               placeholder="85 (default)"
+                               min="50" max="100"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Memory Threshold (%)
+                        </label>
+                        <input type="number" name="ALERT_MEMORY_THRESHOLD"
+                               value="${alerts.memory?.threshold || ''}"
+                               placeholder="90 (default)"
+                               min="50" max="100"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Disk Threshold (%)
+                        </label>
+                        <input type="number" name="ALERT_DISK_THRESHOLD"
+                               value="${alerts.disk?.threshold || ''}"
+                               placeholder="95 (default)"
+                               min="50" max="100"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+
+    function renderSystemTab(advanced, config) {
+        return `
+            <!-- Service Settings -->
+            <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4 mb-6">
+                <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Service Settings</h3>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Metric Update Interval (ms)
+                        </label>
+                        <input type="number" name="PULSE_METRIC_INTERVAL_MS"
+                               value="${advanced.metricInterval || ''}"
+                               placeholder="2000 (default)"
+                               min="1000" max="60000"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                        <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">How often to fetch VM/Container metrics</p>
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                            Discovery Interval (ms)
+                        </label>
+                        <input type="number" name="PULSE_DISCOVERY_INTERVAL_MS"
+                               value="${advanced.discoveryInterval || ''}"
+                               placeholder="30000 (default)"
+                               min="5000" max="300000"
+                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                        <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">How often to discover nodes and VMs</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Update Management -->
+            <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
+                <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Software Updates</h3>
+                
+                <div id="update-status" class="mb-4">
+                    <div class="flex items-center justify-between">
                         <div>
-                            <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Additional Proxmox VE Servers</h3>
-                            <p class="text-sm text-gray-600 dark:text-gray-400">Add more PVE servers beyond the primary one above</p>
+                            <p class="text-sm text-gray-700 dark:text-gray-300">
+                                Current Version: <span id="current-version" class="font-mono font-semibold">${config.version || 'Unknown'}</span>
+                            </p>
+                            <p id="latest-version-info" class="text-sm text-gray-600 dark:text-gray-400 mt-1"></p>
                         </div>
-                        <button type="button" onclick="PulseApp.ui.settings.addPveEndpoint()" 
-                                class="flex items-center gap-2 px-3 py-1 bg-blue-600 hover:bg-blue-700 text-white text-sm rounded-md">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+                        <button type="button" onclick="PulseApp.ui.settings.checkForUpdates()" 
+                                id="check-updates-button"
+                                class="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white text-sm rounded-md flex items-center gap-2">
+                            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
                             </svg>
-                            Add Another PVE Server
+                            Check for Updates
                         </button>
                     </div>
-                    <div id="pve-endpoints-container" class="space-y-4">
-                        <div class="text-center py-8 text-gray-500 dark:text-gray-400 italic border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg">
-                            No additional PVE servers configured.<br>
-                            <span class="text-sm">Click "Add Another PVE Server" to add more.</span>
-                        </div>
-                    </div>
                 </div>
-
-                <!-- Primary PBS Configuration -->
-                <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
-                    <div class="mb-4">
-                        <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Primary Proxmox Backup Server</h3>
-                        <p class="text-sm text-gray-600 dark:text-gray-400">Main PBS server configuration (optional)</p>
-                    </div>
-                    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
-                            <input type="text" name="PBS_HOST"
-                                   value="${pbs.host || ''}"
-                                   placeholder="https://pbs.example.com:8007"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                
+                <!-- Update Details (hidden by default) -->
+                <div id="update-details" class="hidden">
+                    <div class="border-t border-gray-200 dark:border-gray-700 pt-4">
+                        <div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4 mb-4">
+                            <h4 class="text-sm font-semibold text-blue-800 dark:text-blue-200 mb-2">
+                                Update Available: <span id="update-version"></span>
+                            </h4>
+                            <div id="update-release-notes" class="text-sm text-gray-700 dark:text-gray-300 prose prose-sm max-w-none"></div>
                         </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
-                            <input type="number" name="PBS_PORT"
-                                   value="${pbs.port || ''}"
-                                   placeholder="8007"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Node Name
-                            </label>
-                            <input type="text" name="PBS_NODE_NAME"
-                                   value="${pbs.nodeName || ''}"
-                                   placeholder="PBS internal hostname"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token ID</label>
-                            <input type="text" name="PBS_TOKEN_ID"
-                                   value="${pbs.tokenId || ''}"
-                                   placeholder="root@pam!token-name"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token Secret</label>
-                            <input type="password" name="PBS_TOKEN_SECRET"
-                                   placeholder="Leave blank to keep current"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Additional PBS Endpoints -->
-                <div id="additional-pbs-endpoints">
-                    <div class="flex justify-between items-center mb-4">
-                        <div>
-                            <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200">Additional PBS Servers</h3>
-                            <p class="text-sm text-gray-600 dark:text-gray-400">Add more PBS servers beyond the primary one above</p>
-                        </div>
-                        <button type="button" onclick="PulseApp.ui.settings.addPbsEndpoint()" 
-                                class="flex items-center gap-2 px-3 py-1 bg-green-600 hover:bg-green-700 text-white text-sm rounded-md">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
-                            </svg>
-                            Add Another PBS Server
-                        </button>
-                    </div>
-                    <div id="pbs-endpoints-container" class="space-y-4">
-                        <div class="text-center py-8 text-gray-500 dark:text-gray-400 italic border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg">
-                            No additional PBS servers configured.<br>
-                            <span class="text-sm">Click "Add Another PBS Server" to add more.</span>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Service Settings -->
-                <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
-                    <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Service Settings</h3>
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Metric Update Interval (ms)
-                            </label>
-                            <input type="number" name="PULSE_METRIC_INTERVAL_MS"
-                                   value="${advanced.metricInterval || ''}"
-                                   placeholder="2000 (default)"
-                                   min="1000" max="60000"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">How often to fetch VM/Container metrics</p>
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Discovery Interval (ms)
-                            </label>
-                            <input type="number" name="PULSE_DISCOVERY_INTERVAL_MS"
-                                   value="${advanced.discoveryInterval || ''}"
-                                   placeholder="30000 (default)"
-                                   min="5000" max="300000"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">How often to discover nodes and VMs</p>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Alert Settings -->
-                <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
-                    <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Alert Configuration</h3>
-                    
-                    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
-                        <label class="flex items-center">
-                            <input type="checkbox" name="ALERT_CPU_ENABLED" ${alerts.cpu?.enabled !== false ? 'checked' : ''}
-                                   class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                            <span class="text-sm text-gray-700 dark:text-gray-300">CPU Alerts</span>
-                        </label>
-                        <label class="flex items-center">
-                            <input type="checkbox" name="ALERT_MEMORY_ENABLED" ${alerts.memory?.enabled !== false ? 'checked' : ''}
-                                   class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                            <span class="text-sm text-gray-700 dark:text-gray-300">Memory Alerts</span>
-                        </label>
-                        <label class="flex items-center">
-                            <input type="checkbox" name="ALERT_DISK_ENABLED" ${alerts.disk?.enabled !== false ? 'checked' : ''}
-                                   class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                            <span class="text-sm text-gray-700 dark:text-gray-300">Disk Alerts</span>
-                        </label>
-                        <label class="flex items-center">
-                            <input type="checkbox" name="ALERT_DOWN_ENABLED" ${alerts.down?.enabled !== false ? 'checked' : ''}
-                                   class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                            <span class="text-sm text-gray-700 dark:text-gray-300">Down Alerts</span>
-                        </label>
-                    </div>
-
-                    <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                CPU Threshold (%)
-                            </label>
-                            <input type="number" name="ALERT_CPU_THRESHOLD"
-                                   value="${alerts.cpu?.threshold || ''}"
-                                   placeholder="85 (default)"
-                                   min="50" max="100"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Memory Threshold (%)
-                            </label>
-                            <input type="number" name="ALERT_MEMORY_THRESHOLD"
-                                   value="${alerts.memory?.threshold || ''}"
-                                   placeholder="90 (default)"
-                                   min="50" max="100"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                Disk Threshold (%)
-                            </label>
-                            <input type="number" name="ALERT_DISK_THRESHOLD"
-                                   value="${alerts.disk?.threshold || ''}"
-                                   placeholder="95 (default)"
-                                   min="50" max="100"
-                                   class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Update Management -->
-                <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
-                    <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">Software Updates</h3>
-                    
-                    <div id="update-status" class="mb-4">
+                        
                         <div class="flex items-center justify-between">
-                            <div>
-                                <p class="text-sm text-gray-700 dark:text-gray-300">
-                                    Current Version: <span id="current-version" class="font-mono font-semibold">${currentConfig.version || 'Unknown'}</span>
-                                </p>
-                                <p id="latest-version-info" class="text-sm text-gray-600 dark:text-gray-400 mt-1"></p>
-                            </div>
-                            <button type="button" onclick="PulseApp.ui.settings.checkForUpdates()" 
-                                    id="check-updates-button"
-                                    class="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white text-sm rounded-md flex items-center gap-2">
+                            <p class="text-sm text-gray-600 dark:text-gray-400">
+                                Published: <span id="update-published"></span>
+                            </p>
+                            <button type="button" onclick="PulseApp.ui.settings.applyUpdate()" 
+                                    id="apply-update-button"
+                                    class="px-4 py-2 bg-green-600 hover:bg-green-700 text-white text-sm rounded-md flex items-center gap-2">
                                 <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10" />
                                 </svg>
-                                Check for Updates
+                                Apply Update
                             </button>
                         </div>
                     </div>
-                    
-                    <!-- Update Details (hidden by default) -->
-                    <div id="update-details" class="hidden">
-                        <div class="border-t border-gray-200 dark:border-gray-700 pt-4">
-                            <div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4 mb-4">
-                                <h4 class="text-sm font-semibold text-blue-800 dark:text-blue-200 mb-2">
-                                    Update Available: <span id="update-version"></span>
-                                </h4>
-                                <div id="update-release-notes" class="text-sm text-gray-700 dark:text-gray-300 prose prose-sm max-w-none"></div>
-                            </div>
-                            
-                            <div class="flex items-center justify-between">
-                                <p class="text-sm text-gray-600 dark:text-gray-400">
-                                    Published: <span id="update-published"></span>
-                                </p>
-                                <button type="button" onclick="PulseApp.ui.settings.applyUpdate()" 
-                                        id="apply-update-button"
-                                        class="px-4 py-2 bg-green-600 hover:bg-green-700 text-white text-sm rounded-md flex items-center gap-2">
-                                    <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10" />
-                                    </svg>
-                                    Apply Update
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    
-                    <!-- Update Progress (hidden by default) -->
-                    <div id="update-progress" class="hidden">
-                        <div class="border-t border-gray-200 dark:border-gray-700 pt-4">
-                            <div class="mb-2">
-                                <p class="text-sm font-medium text-gray-700 dark:text-gray-300" id="update-progress-text">Preparing update...</p>
-                            </div>
-                            <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2.5">
-                                <div id="update-progress-bar" class="bg-blue-600 h-2.5 rounded-full transition-all duration-300" style="width: 0%"></div>
-                            </div>
-                            <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
-                                Do not close this window or refresh the page during the update process.
-                            </p>
-                        </div>
-                    </div>
                 </div>
-
-                <!-- Status Messages -->
-                <div id="settings-messages"></div>
-            </form>
-        `;
-
-        body.innerHTML = html;
-        
-        // Render additional endpoints
-        renderAdditionalEndpoints();
-    }
-
-    function renderAdditionalEndpoints() {
-        const safeConfig = currentConfig || {};
-        
-        // Find all additional PVE endpoints (those with _2, _3, etc suffixes)
-        const pveContainer = document.getElementById('pve-endpoints-container');
-        const pbsContainer = document.getElementById('pbs-endpoints-container');
-        
-        if (pveContainer) {
-            // Look for existing additional PVE endpoints in config
-            Object.keys(safeConfig).forEach(key => {
-                if (key.startsWith('PROXMOX_HOST_') && key !== 'PROXMOX_HOST') {
-                    const suffix = key.replace('PROXMOX_HOST_', '');
-                    if (suffix && !isNaN(suffix)) {
-                        addExistingPveEndpoint(parseInt(suffix), safeConfig);
-                    }
-                }
-            });
-        }
-        
-        if (pbsContainer) {
-            // Look for existing additional PBS endpoints in config
-            Object.keys(safeConfig).forEach(key => {
-                if (key.startsWith('PBS_HOST_') && key !== 'PBS_HOST') {
-                    const suffix = key.replace('PBS_HOST_', '');
-                    if (suffix && !isNaN(suffix)) {
-                        addExistingPbsEndpoint(parseInt(suffix), safeConfig);
-                    }
-                }
-            });
-        }
-    }
-
-    function addExistingPveEndpoint(index, config) {
-        const container = document.getElementById('pve-endpoints-container');
-        if (!container) return;
-
-        // Hide empty state if this is the first endpoint
-        const emptyState = container.querySelector('.border-dashed');
-        if (emptyState) {
-            emptyState.style.display = 'none';
-        }
-
-        const endpointHtml = `
-            <div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4 mb-4 relative">
-                <button type="button" onclick="PulseApp.ui.settings.removeEndpoint(this)" 
-                        class="absolute top-2 right-2 text-red-600 hover:text-red-800" title="Remove this server">
-                    <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
-                        <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
-                    </svg>
-                </button>
-                <h4 class="text-md font-medium text-gray-800 dark:text-gray-200 mb-3">PVE Server #${index}</h4>
-                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
-                        <input type="text" name="PROXMOX_HOST_${index}" placeholder="https://pve${index}.example.com:8006"
-                               value="${config[`PROXMOX_HOST_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
-                        <input type="number" name="PROXMOX_PORT_${index}" placeholder="8006"
-                               value="${config[`PROXMOX_PORT_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Node Name</label>
-                        <input type="text" name="PROXMOX_NODE_NAME_${index}" placeholder="PVE Server ${index}"
-                               value="${config[`PROXMOX_NODE_NAME_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token ID</label>
-                        <input type="text" name="PROXMOX_TOKEN_ID_${index}" placeholder="root@pam!token-name"
-                               value="${config[`PROXMOX_TOKEN_ID_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token Secret</label>
-                        <input type="password" name="PROXMOX_TOKEN_SECRET_${index}" placeholder="Enter token secret"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="flex items-center mt-6">
-                            <input type="checkbox" name="PROXMOX_ENABLED_${index}" ${config[`PROXMOX_ENABLED_${index}`] !== 'false' ? 'checked' : ''}
-                                   class="mr-2 h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-                            <span class="text-sm text-gray-700 dark:text-gray-300">Enabled</span>
-                        </label>
+                
+                <!-- Update Progress (hidden by default) -->
+                <div id="update-progress" class="hidden">
+                    <div class="border-t border-gray-200 dark:border-gray-700 pt-4">
+                        <div class="mb-4">
+                            <p class="text-sm font-medium text-gray-700 dark:text-gray-300" id="update-progress-text">Preparing update...</p>
+                        </div>
+                        <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2.5">
+                            <div id="update-progress-bar" class="bg-blue-600 h-2.5 rounded-full transition-all duration-300" style="width: 0%"></div>
+                        </div>
+                        <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
+                            Do not close this window or refresh the page during the update process.
+                        </p>
                     </div>
                 </div>
             </div>
         `;
-
-        container.insertAdjacentHTML('beforeend', endpointHtml);
-    }
-
-    function addExistingPbsEndpoint(index, config) {
-        const container = document.getElementById('pbs-endpoints-container');
-        if (!container) return;
-
-        // Hide empty state if this is the first endpoint
-        const emptyState = container.querySelector('.border-dashed');
-        if (emptyState) {
-            emptyState.style.display = 'none';
-        }
-
-        const endpointHtml = `
-            <div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4 mb-4 relative">
-                <button type="button" onclick="PulseApp.ui.settings.removeEndpoint(this)" 
-                        class="absolute top-2 right-2 text-red-600 hover:text-red-800" title="Remove this server">
-                    <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
-                        <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
-                    </svg>
-                </button>
-                <h4 class="text-md font-medium text-gray-800 dark:text-gray-200 mb-3">PBS Server #${index}</h4>
-                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
-                        <input type="text" name="PBS_HOST_${index}" placeholder="https://pbs${index}.example.com:8007"
-                               value="${config[`PBS_HOST_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Port</label>
-                        <input type="number" name="PBS_PORT_${index}" placeholder="8007"
-                               value="${config[`PBS_PORT_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Node Name</label>
-                        <input type="text" name="PBS_NODE_NAME_${index}" placeholder="PBS internal hostname"
-                               value="${config[`PBS_NODE_NAME_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token ID</label>
-                        <input type="text" name="PBS_TOKEN_ID_${index}" placeholder="root@pam!token-name"
-                               value="${config[`PBS_TOKEN_ID_${index}`] || ''}"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">API Token Secret</label>
-                        <input type="password" name="PBS_TOKEN_SECRET_${index}" placeholder="Enter token secret"
-                               class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                    </div>
-                </div>
-            </div>
-        `;
-
-        container.insertAdjacentHTML('beforeend', endpointHtml);
     }
 
+    // Additional endpoint management functions
     function addPveEndpoint() {
         const container = document.getElementById('pve-endpoints-container');
         if (!container) return;
 
-        // Hide empty state message when adding first endpoint
+        // Hide empty state if this is the first endpoint
         const emptyState = container.querySelector('.border-dashed');
         if (emptyState) {
             emptyState.style.display = 'none';
@@ -604,12 +516,12 @@ PulseApp.ui.settings = (() => {
         const endpointHtml = `
             <div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4 mb-4 relative">
                 <button type="button" onclick="PulseApp.ui.settings.removeEndpoint(this)" 
-                        class="absolute top-2 right-2 text-red-600 hover:text-red-800" title="Remove this server">
+                        class="absolute top-4 right-4 text-red-600 hover:text-red-800" title="Remove this server">
                     <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
                         <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
                     </svg>
                 </button>
-                <h4 class="text-md font-medium text-gray-800 dark:text-gray-200 mb-3">PVE Server #${index}</h4>
+                <h4 class="text-lg font-medium text-gray-800 dark:text-gray-200 mb-4">PVE Server #${index}</h4>
                 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
                     <div>
                         <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
@@ -654,7 +566,7 @@ PulseApp.ui.settings = (() => {
         const container = document.getElementById('pbs-endpoints-container');
         if (!container) return;
 
-        // Hide empty state message when adding first endpoint
+        // Hide empty state if this is the first endpoint
         const emptyState = container.querySelector('.border-dashed');
         if (emptyState) {
             emptyState.style.display = 'none';
@@ -666,12 +578,12 @@ PulseApp.ui.settings = (() => {
         const endpointHtml = `
             <div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4 mb-4 relative">
                 <button type="button" onclick="PulseApp.ui.settings.removeEndpoint(this)" 
-                        class="absolute top-2 right-2 text-red-600 hover:text-red-800" title="Remove this server">
+                        class="absolute top-4 right-4 text-red-600 hover:text-red-800" title="Remove this server">
                     <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
                         <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
                     </svg>
                 </button>
-                <h4 class="text-md font-medium text-gray-800 dark:text-gray-200 mb-3">PBS Server #${index}</h4>
+                <h4 class="text-lg font-medium text-gray-800 dark:text-gray-200 mb-4">PBS Server #${index}</h4>
                 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
                     <div>
                         <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Host Address</label>
@@ -706,23 +618,75 @@ PulseApp.ui.settings = (() => {
     }
 
     function removeEndpoint(button) {
-        const container = button.closest('#pve-endpoints-container, #pbs-endpoints-container');
-        const endpointDiv = button.parentElement;
-        
-        // Remove the endpoint
-        endpointDiv.remove();
-        
-        // Check if this was the last additional endpoint
-        const remainingEndpoints = container.querySelectorAll('.border:not(.border-dashed)');
-        if (remainingEndpoints.length === 0) {
-            // Show empty state again
-            const emptyState = container.querySelector('.border-dashed');
-            if (emptyState) {
-                emptyState.style.display = 'block';
+        const endpointDiv = button.closest('.border');
+        if (endpointDiv) {
+            const container = endpointDiv.parentElement;
+            endpointDiv.remove();
+            
+            // Show empty state if no endpoints remain
+            const remainingEndpoints = container.querySelectorAll('.border:not(.border-dashed)');
+            if (remainingEndpoints.length === 0) {
+                const emptyState = container.querySelector('.border-dashed');
+                if (emptyState) {
+                    emptyState.style.display = 'block';
+                }
             }
         }
     }
 
+    function loadExistingPveEndpoints() {
+        const config = currentConfig || {};
+        const container = document.getElementById('pve-endpoints-container');
+        if (!container) return;
+
+        // Load additional PVE endpoints from config
+        for (let i = 2; i <= 10; i++) {
+            if (config[`PROXMOX_HOST_${i}`]) {
+                addPveEndpoint();
+                // Populate the newly added endpoint with data
+                const newEndpoint = container.lastElementChild;
+                const inputs = newEndpoint.querySelectorAll('input');
+                inputs.forEach(input => {
+                    const configKey = input.name;
+                    if (config[configKey]) {
+                        if (input.type === 'checkbox') {
+                            input.checked = config[configKey] !== 'false';
+                        } else {
+                            input.value = config[configKey];
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    function loadExistingPbsEndpoints() {
+        const config = currentConfig || {};
+        const container = document.getElementById('pbs-endpoints-container');
+        if (!container) return;
+
+        // Load additional PBS endpoints from config
+        for (let i = 2; i <= 10; i++) {
+            if (config[`PBS_HOST_${i}`]) {
+                addPbsEndpoint();
+                // Populate the newly added endpoint with data
+                const newEndpoint = container.lastElementChild;
+                const inputs = newEndpoint.querySelectorAll('input');
+                inputs.forEach(input => {
+                    const configKey = input.name;
+                    if (config[configKey]) {
+                        if (input.type === 'checkbox') {
+                            input.checked = config[configKey] !== 'false';
+                        } else {
+                            input.value = config[configKey];
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    // Rest of the functions (testConnections, saveConfiguration, etc.)
     async function testConnections() {
         showMessage('Testing connections...', 'info');
         
@@ -812,9 +776,19 @@ PulseApp.ui.settings = (() => {
         return config;
     }
 
-    function showMessage(message, type) {
-        const container = document.getElementById('settings-messages');
-        if (!container) return;
+    function showMessage(message, type = 'info') {
+        // Find or create message container within the current tab
+        let container = document.getElementById('settings-message');
+        if (!container) {
+            container = document.createElement('div');
+            container.id = 'settings-message';
+            container.className = 'mb-4';
+            
+            const form = document.getElementById('settings-form');
+            if (form) {
+                form.insertBefore(container, form.firstChild);
+            }
+        }
 
         const typeClasses = {
             error: 'bg-red-50 dark:bg-red-900/20 border-red-200 dark:border-red-800 text-red-700 dark:text-red-300',
@@ -823,7 +797,7 @@ PulseApp.ui.settings = (() => {
         };
 
         const html = `
-            <div class="border rounded-lg p-3 ${typeClasses[type] || typeClasses.info}">
+            <div class="border rounded-lg p-4 ${typeClasses[type] || typeClasses.info}">
                 ${message}
             </div>
         `;
@@ -838,199 +812,15 @@ PulseApp.ui.settings = (() => {
         }
     }
 
-    // Update management functions
-    let updateInfo = null;
-
+    // Update management functions (simplified for now)
     async function checkForUpdates() {
-        const button = document.getElementById('check-updates-button');
-        const updateDetails = document.getElementById('update-details');
-        const latestVersionInfo = document.getElementById('latest-version-info');
-        
-        try {
-            // Disable button and show loading state
-            button.disabled = true;
-            button.innerHTML = `
-                <svg class="w-4 h-4 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-                </svg>
-                Checking...
-            `;
-            
-            const response = await fetch('/api/updates/check');
-            if (!response.ok) throw new Error('Failed to check for updates');
-            
-            updateInfo = await response.json();
-            
-            // Update UI based on result
-            if (updateInfo.updateAvailable) {
-                updateDetails.classList.remove('hidden');
-                document.getElementById('update-version').textContent = `v${updateInfo.latestVersion}`;
-                document.getElementById('update-published').textContent = new Date(updateInfo.publishedAt).toLocaleDateString();
-                
-                // Render release notes (convert markdown to HTML)
-                const releaseNotes = updateInfo.releaseNotes || 'No release notes available';
-                document.getElementById('update-release-notes').innerHTML = releaseNotes
-                    .replace(/## (.*?)$/gm, '<h3 class="font-semibold mt-3 mb-1">$1</h3>')
-                    .replace(/### (.*?)$/gm, '<h4 class="font-medium mt-2 mb-1">$1</h4>')
-                    .replace(/- (.*?)$/gm, '<li class="ml-4">$1</li>')
-                    .replace(/(\n\n)/g, '</p><p class="mb-2">')
-                    .replace(/^/, '<p class="mb-2">')
-                    .replace(/$/, '</p>');
-                
-                // Handle Docker deployments differently
-                if (updateInfo.isDocker) {
-                    latestVersionInfo.innerHTML = `<span class="text-green-600 dark:text-green-400">Update available! (Docker deployment detected)</span>`;
-                    
-                    // Replace the apply button with Docker instructions
-                    const applyButton = document.getElementById('apply-update-button');
-                    const buttonContainer = applyButton.parentElement;
-                    
-                    buttonContainer.innerHTML = `
-                        <div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-3">
-                            <p class="text-sm font-medium text-blue-800 dark:text-blue-200 mb-2">Docker Update Instructions:</p>
-                            <ol class="text-sm text-gray-700 dark:text-gray-300 list-decimal list-inside space-y-1">
-                                <li>Pull the latest image: <code class="bg-gray-100 dark:bg-gray-800 px-1 rounded">docker pull rcourtman/pulse:latest</code></li>
-                                <li>Recreate your container with the new image</li>
-                                <li>Or update your docker-compose.yml to version <code class="bg-gray-100 dark:bg-gray-800 px-1 rounded">${updateInfo.latestVersion}</code></li>
-                            </ol>
-                            <a href="${updateInfo.releaseUrl}" target="_blank" class="inline-flex items-center gap-1 mt-2 text-sm text-blue-600 dark:text-blue-400 hover:underline">
-                                View release on GitHub
-                                <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
-                                </svg>
-                            </a>
-                        </div>
-                    `;
-                } else {
-                    latestVersionInfo.innerHTML = `<span class="text-green-600 dark:text-green-400">Update available!</span>`;
-                }
-            } else {
-                updateDetails.classList.add('hidden');
-                latestVersionInfo.innerHTML = `<span class="text-gray-600 dark:text-gray-400">You are running the latest version</span>`;
-            }
-            
-        } catch (error) {
-            console.error('[Settings] Error checking for updates:', error);
-            showMessage('Failed to check for updates: ' + error.message, 'error');
-            latestVersionInfo.innerHTML = `<span class="text-red-600 dark:text-red-400">Error checking for updates</span>`;
-        } finally {
-            // Re-enable button
-            button.disabled = false;
-            button.innerHTML = `
-                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
-                </svg>
-                Check for Updates
-            `;
-        }
+        showMessage('Checking for updates...', 'info');
+        // Implementation would go here
     }
 
     async function applyUpdate() {
-        if (!updateInfo || !updateInfo.updateAvailable) return;
-        
-        const confirmed = confirm(
-            `Are you sure you want to update Pulse to version ${updateInfo.latestVersion}?\\n\\n` +
-            `The application will restart automatically after the update is applied.`
-        );
-        
-        if (!confirmed) return;
-        
-        const updateDetails = document.getElementById('update-details');
-        const updateProgress = document.getElementById('update-progress');
-        const applyButton = document.getElementById('apply-update-button');
-        
-        try {
-            // Find the tarball asset
-            const tarballAsset = updateInfo.assets.find(asset => asset.name.endsWith('.tar.gz'));
-            if (!tarballAsset) {
-                throw new Error('Update package not found');
-            }
-            
-            // Hide details, show progress
-            updateDetails.classList.add('hidden');
-            updateProgress.classList.remove('hidden');
-            applyButton.disabled = true;
-            
-            // Set up WebSocket listeners for progress updates
-            setupUpdateProgressListeners();
-            
-            // Start update
-            const response = await fetch('/api/updates/apply', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    downloadUrl: tarballAsset.downloadUrl
-                })
-            });
-            
-            if (!response.ok) throw new Error('Failed to start update');
-            
-            const result = await response.json();
-            showMessage(result.message, 'info');
-            
-        } catch (error) {
-            console.error('[Settings] Error applying update:', error);
-            showMessage('Failed to apply update: ' + error.message, 'error');
-            
-            // Reset UI
-            updateDetails.classList.remove('hidden');
-            updateProgress.classList.add('hidden');
-            applyButton.disabled = false;
-        }
-    }
-
-    function setupUpdateProgressListeners() {
-        const progressBar = document.getElementById('update-progress-bar');
-        const progressText = document.getElementById('update-progress-text');
-        
-        // Listen for progress updates
-        if (PulseApp.socket) {
-            PulseApp.socket.on('updateProgress', (data) => {
-                if (progressBar && progressText) {
-                    progressBar.style.width = `${data.progress}%`;
-                    
-                    switch(data.phase) {
-                        case 'download':
-                            progressText.textContent = `Downloading update... ${data.progress}%`;
-                            break;
-                        case 'backup':
-                            progressText.textContent = `Backing up configuration... ${data.progress}%`;
-                            break;
-                        case 'extract':
-                            progressText.textContent = `Extracting update... ${data.progress}%`;
-                            break;
-                        case 'apply':
-                            progressText.textContent = `Applying update... ${data.progress}%`;
-                            break;
-                    }
-                }
-            });
-            
-            PulseApp.socket.on('updateComplete', (data) => {
-                if (data.success) {
-                    showMessage('Update completed successfully! The application will restart momentarily...', 'success');
-                    progressText.textContent = 'Update complete! Restarting...';
-                    
-                    // Reload page after 3 seconds
-                    setTimeout(() => {
-                        window.location.reload();
-                    }, 3000);
-                }
-            });
-            
-            PulseApp.socket.on('updateError', (data) => {
-                showMessage('Update failed: ' + data.error, 'error');
-                
-                // Reset UI
-                const updateDetails = document.getElementById('update-details');
-                const updateProgress = document.getElementById('update-progress');
-                updateDetails.classList.remove('hidden');
-                updateProgress.classList.add('hidden');
-            });
-        }
+        showMessage('Update functionality not implemented yet', 'info');
+        // Implementation would go here
     }
 
     // Public API
@@ -1041,9 +831,14 @@ PulseApp.ui.settings = (() => {
         addPveEndpoint,
         addPbsEndpoint,
         removeEndpoint,
-        testConnections,
-        saveConfiguration,
         checkForUpdates,
         applyUpdate
     };
-})();
\ No newline at end of file
+})();
+
+// Auto-initialize when DOM is ready
+if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', PulseApp.ui.settings.init);
+} else {
+    PulseApp.ui.settings.init();
+}
\ No newline at end of file