diff --git a/templates/server_list.html b/templates/server_list.html
index 1b85142..6dbf61e 100644
--- a/templates/server_list.html
+++ b/templates/server_list.html
@@ -8,97 +8,132 @@
     max-width: 300px;
     text-align: left;
   }
-  .badge-status {
-    font-size: 0.73em;
-  }
-  .action-btns a, .action-btns button {
-    margin-right: 4px;
-  }
 </style>
 {% endblock %}
 
 {% block content %}
-<div class="container py-4">
-  <div class="card shadow-sm">
-    <div class="card-header">
-      <h2 class="mb-0">Lista serwerów</h2>
-    </div>
-    <div class="card-body table-responsive">
-      <table class="table table-striped align-middle">
-        <thead>
-          <tr>
-            <th>ID</th>
-            <th>Nazwa serwera</th>
-            <th>Użytkownik</th>
-            <th>Port</th>
-            <th>Typ</th>
-            <th>Uwierzytelnianie</th>
-            <th>Plik /etc/hosts</th>
-            <th>Auto Deploy</th>
-            <th>Auto Backup</th>
-            <th>Wyłącz CIDR</th>
-            <th>Akcje</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for h in hosts %}
-          <tr>
-            <td>{{ h.id }}</td>
-            <td data-bs-toggle="tooltip" title="{{ h.raw_ip }}">
-              {% if h.use_daemon and h.type == 'linux' and h.daemon_url %}
-                {{ h.resolved_daemon }}
-              {% else %}
-                {{ h.resolved_hostname }}
-              {% endif %}
-            </td>
-            <td>{{ '-' if h.use_daemon and h.type == 'linux' else h.username }}</td>
-            <td>{{ '-' if h.use_daemon and h.type == 'linux' else h.port }}</td>
-            <td>
-              <span class="badge bg-secondary">{{ 'Linux (daemon)' if h.use_daemon else h.type.capitalize() }}</span>
-            </td>
-            <td>{{ '- linux daemon -' if h.use_daemon else h.auth_method|capitalize }}</td>
-            <td>{{ h.preferred_hostfile.title if h.preferred_hostfile else '(Default)' }}</td>
-            <td>
-              <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}">
-                <input type="hidden" name="setting" value="auto_deploy">
-                <input type="checkbox" name="enabled" value="1" onchange="this.form.submit()" {% if h.auto_deploy_enabled %}checked{% endif %}>
-              </form>
-            </td>
-            <td>
-              <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}">
-                <input type="hidden" name="setting" value="auto_backup">
-                <input type="checkbox" name="enabled" value="1" onchange="this.form.submit()" {% if h.auto_backup_enabled %}checked{% endif %}>
-              </form>
-            </td>
-            <td>
-              <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}">
-                <input type="hidden" name="setting" value="disable_regex">
-                <input type="checkbox" name="enabled" value="1" onchange="this.form.submit()" {% if h.disable_regex_deploy %}checked{% endif %}>
-              </form>
-            </td>
-            <td class="action-btns">
-              <a href="{{ url_for('edit_server', id=h.id) }}" class="btn btn-sm btn-primary">Edytuj</a>
-              {% if h.use_daemon and h.type == 'linux' %}
-              <button class="btn btn-sm btn-info test-daemon-btn" data-host-id="{{ h.id }}">Testuj</button>
-              {% else %}
-              <a href="{{ url_for('test_server_connection', id=h.id) }}" class="btn btn-sm btn-info">Testuj</a>
-              {% endif %}
-              <a href="{{ url_for('server_backup', host_id=h.id) }}" class="btn btn-sm btn-success">Backup</a>
-              <form method="GET" action="{{ url_for('delete_server', id=h.id) }}" class="d-inline">
-                <button class="btn btn-sm btn-danger">Usuń</button>
-              </form>
-            </td>
-          </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </div>
+<div class="card">
+  <div class="card-header">
+    <h2>Lista serwerów</h2>
   </div>
-
-  <div class="text-center mt-4">
-    <a href="{{ url_for('add_server') }}" class="btn btn-primary">Dodaj nowy serwer</a>
-    <a href="{{ url_for('import_servers') }}" class="btn btn-secondary">Importuj z CSV</a>
-    <a href="{{ url_for('export_servers_to_csv') }}" class="btn btn-secondary">Eksportuj do CSV</a>
+  <div class="card-body table-responsive">
+    <table class="table table-striped align-middle">
+      <thead>
+        <tr>
+          <th>ID</th>
+          <th>Nazwa serwera</th>
+          <th>Użytkownik</th>
+          <th>Port</th>
+          <th>Typ</th>
+          <th>Uwierzytelnianie</th>
+          <th>Wybrany plik /etc/hosts</th>
+          <th>Auto Deploy</th>
+          <th>Auto Backup</th>
+          <th>Wyłącz CIDR/regex deploy</th>
+          <th>Akcje</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for h in hosts %}
+        <tr>
+          <td>{{ h.id }}</td>
+          <td data-bs-toggle="tooltip" data-bs-placement="top" title="{{ h.raw_ip }}">
+            {% if h.use_daemon and h.type == 'linux' and h.daemon_url %}
+              {{ h.resolved_daemon }}
+            {% else %}
+              {{ h.resolved_hostname }}
+            {% endif %}
+          </td>
+          
+           
+          <td>
+            {% if h.use_daemon and h.type == 'linux' %}
+              <em>—</em>
+            {% else %}
+              {{ h.username }}
+            {% endif %}
+          </td>
+          <td>
+            {% if h.use_daemon and h.type == 'linux' %}
+              <em>—</em>
+            {% else %}
+              {{ h.port }}
+            {% endif %}
+          </td>
+          <td>
+            {% if h.type == 'linux' %}
+              Linux{% if h.use_daemon %} (Demon){% endif %}
+            {% else %}
+              Mikrotik
+            {% endif %}
+          </td>
+          <td>
+            {% if h.use_daemon and h.type == 'linux' %}
+              <em>- używa Demona -</em>
+            {% else %}
+              {% if h.auth_method == 'password' %}
+                Hasło
+              {% elif h.auth_method == 'ssh_key' %}
+                Klucz SSH
+              {% elif h.auth_method == 'global_key' %}
+                Globalny klucz
+              {% else %}
+                {{ h.auth_method }}
+              {% endif %}
+            {% endif %}
+          </td>
+          <td>
+            {% if h.preferred_hostfile %}
+              {{ h.preferred_hostfile.title }}
+            {% else %}
+              (Default)
+            {% endif %}
+          </td>
+          <td>
+            <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
+              <input type="hidden" name="setting" value="auto_deploy">
+              <input type="checkbox" name="enabled" value="1"
+                     onchange="this.form.submit()" {% if h.auto_deploy_enabled %}checked{% endif %}>
+            </form>
+          </td>
+          <td>
+            <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
+              <input type="hidden" name="setting" value="auto_backup">
+              <input type="checkbox" name="enabled" value="1"
+                     onchange="this.form.submit()" {% if h.auto_backup_enabled %}checked{% endif %}>
+            </form>
+          </td>
+          <td>
+            <form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
+              <input type="hidden" name="setting" value="disable_regex">
+              <input type="checkbox" name="enabled" value="1"
+                     onchange="this.form.submit()" {% if h.disable_regex_deploy %}checked{% endif %}>
+            </form>
+            <td>
+              <div class="d-flex flex-wrap gap-1">
+                <a href="{{ url_for('edit_server', id=h.id) }}" class="btn btn-primary btn-sm">Edytuj</a>
+                
+                {% if h.use_daemon and h.type == 'linux' %}
+                <!-- Serwery z demonem – nowy sposób -->
+                <button class="btn btn-info btn-sm test-daemon-btn" data-host-id="{{ h.id }}">
+                  Testuj
+                </button>
+                {% else %}
+                <!-- Dotychczasowy sposób dla SSH/Mikrotik -->
+                <a href="{{ url_for('test_server_connection', id=h.id) }}" class="btn btn-info btn-sm">Testuj</a>
+                {% endif %}
+            
+                <a href="{{ url_for('server_backup', host_id=h.id) }}" class="btn btn-success btn-sm">Backup</a>
+                <form method="GET" action="{{ url_for('delete_server', id=h.id) }}" style="display:inline;">
+                  <button type="submit" class="btn btn-danger btn-sm">Usuń</button>
+                </form>
+              </div>
+            </td>
+        </tr>
+        {% endfor %}
+      </tbody>
+      
+    </table>
   </div>
 </div>
 
@@ -111,19 +146,23 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
       </div>
       <div class="modal-body">
-        <p><strong>Serwer:</strong> <span id="modal-hostname"></span></p>
+        <p><strong>Host:</strong> <span id="modal-hostname"></span></p>
+        
         <label><strong>CPU:</strong></label>
-        <div class="progress mb-2">
+        <div class="progress mb-3">
           <div id="modal-cpu" class="progress-bar" role="progressbar"></div>
         </div>
+
         <label><strong>Pamięć:</strong></label>
-        <div class="progress mb-2">
+        <div class="progress mb-3">
           <div id="modal-mem" class="progress-bar bg-warning" role="progressbar"></div>
         </div>
+
         <label><strong>Dysk:</strong></label>
-        <div class="progress mb-2">
+        <div class="progress mb-3">
           <div id="modal-disk" class="progress-bar bg-success" role="progressbar"></div>
         </div>
+
         <p><strong>Czas działania:</strong> <span id="modal-uptime"></span></p>
       </div>
       <div class="modal-footer">
@@ -133,37 +172,56 @@
   </div>
 </div>
 
-{% endblock %}
 
+<div class="mt-3 text-center">
+  <a href="{{ url_for('add_server') }}" class="btn btn-secondary">Dodaj nowy serwer</a>
+  <a href="{{ url_for('import_servers') }}" class="btn btn-secondary">Importuj z CSV</a>
+  <a href="{{ url_for('export_servers_to_csv') }}" class="btn btn-secondary">Eksportuj do CSV</a>
+</div>
+{% endblock %}
 {% block extra_js %}
 <script>
   function secondsToDhms(seconds) {
-    const d = Math.floor(seconds / (3600*24));
-    const h = Math.floor(seconds % (3600*24) / 3600);
-    const m = Math.floor(seconds % 3600 / 60);
-    const s = Math.floor(seconds % 60);
-    return `${d} dni, ${h} godz, ${m} min, ${s} sek`;
+      seconds = Number(seconds);
+      const d = Math.floor(seconds / (3600*24));
+      const h = Math.floor(seconds % (3600*24) / 3600);
+      const m = Math.floor(seconds % 3600 / 60);
+      const s = Math.floor(seconds % 60);
+      return `${d} dni, ${h} godz, ${m} min, ${s} sek`;
   }
-
+  
   document.querySelectorAll('.test-daemon-btn').forEach(btn => {
     btn.addEventListener('click', function() {
-      fetch(`/server-info/${this.dataset.hostId}`)
+      const hostId = this.dataset.hostId;
+      fetch(`/server-info/${hostId}`)
         .then(res => res.json())
         .then(data => {
-          if (data.error) return alert(`Błąd: ${data.error}`);
+          if (data.error) {
+            alert(`Błąd: ${data.error}`);
+            return;
+          }
           document.querySelector('#modal-hostname').textContent = data.hostname;
           document.querySelector('#modal-ip').textContent = data.ip;
-          document.querySelector('#modal-cpu').style.width = data.cpu + '%';
-          document.querySelector('#modal-cpu').textContent = data.cpu + '%';
-          document.querySelector('#modal-mem').style.width = data.mem + '%';
-          document.querySelector('#modal-mem').textContent = data.mem + '%';
-          document.querySelector('#modal-disk').style.width = data.disk + '%';
-          document.querySelector('#modal-disk').textContent = data.disk + '%';
+          
+          const cpu = document.querySelector('#modal-cpu');
+          cpu.style.width = `${data.cpu}%`;
+          cpu.textContent = `${data.cpu}%`;
+  
+          const mem = document.querySelector('#modal-mem');
+          mem.style.width = `${data.mem}%`;
+          mem.textContent = `${data.mem}%`;
+  
+          const disk = document.querySelector('#modal-disk');
+          disk.style.width = `${data.disk}%`;
+          disk.textContent = `${data.disk}%`;
+  
           document.querySelector('#modal-uptime').textContent = secondsToDhms(data.uptime_seconds);
+  
           new bootstrap.Modal(document.getElementById('serverInfoModal')).show();
         })
         .catch(() => alert('Błąd podczas pobierania danych.'));
     });
   });
-</script>
+  </script>
+  
 {% endblock %}
\ No newline at end of file