diff --git a/templates/server_list.html b/templates/server_list.html
index df52930..6605dc0 100644
--- a/templates/server_list.html
+++ b/templates/server_list.html
@@ -11,9 +11,8 @@
   .badge-status {
     font-size: 0.85em;
   }
-  .action-btns a,
-  .action-btns button {
-    margin-right: 3px;
+  .action-btns a, .action-btns button {
+    margin-right: 4px;
   }
 </style>
 {% endblock %}
@@ -45,7 +44,7 @@
           {% for h in hosts %}
           <tr>
             <td>{{ h.id }}</td>
-            <td data-bs-toggle="tooltip" data-bs-placement="top" title="{{ h.raw_ip }}">
+            <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 %}
@@ -55,48 +54,38 @@
             <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 badge-status bg-secondary">{{ 'Linux (Demon)' if h.use_daemon else h.type.capitalize() }}</span>
+              <span class="badge bg-secondary">{{ 'Linux (Demon)' if h.use_daemon else h.type.capitalize() }}</span>
             </td>
             <td>{{ '- używa Demona -' 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) }}" style="display:inline;">
+              <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) }}" style="display:inline;">
+              <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) }}" style="display:inline;">
+              <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-outline-primary" title="Edytuj">
-                <i class="fa fa-edit"></i>
-              </a>
+              <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-outline-info test-daemon-btn" data-host-id="{{ h.id }}" title="Testuj">
-                  <i class="fa fa-server"></i>
-                </button>
+              <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-outline-info" title="Testuj">
-                  <i class="fa fa-server"></i>
-                </a>
+              <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-outline-success" title="Backup">
-                <i class="fa fa-download"></i>
-              </a>
+              <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-outline-danger" title="Usuń">
-                  <i class="fa fa-trash"></i>
-                </button>
+                <button class="btn btn-sm btn-danger">Usuń</button>
               </form>
             </td>
           </tr>
@@ -106,15 +95,43 @@
     </div>
   </div>
 
-  <div class="text-center my-4">
+  <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-outline-secondary">Importuj z CSV</a>
-    <a href="{{ url_for('export_servers_to_csv') }}" class="btn btn-outline-secondary">Eksportuj do CSV</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>
 </div>
 
-<!-- Modal pozostaje bez zmian -->
-{% include 'server_info_modal.html' %}
+<!-- Modal z informacjami -->
+<div class="modal fade" id="serverInfoModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Informacje o serwerze</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <div class="modal-body">
+        <p><strong>Host:</strong> <span id="modal-hostname"></span> (<span id="modal-ip"></span>)</p>
+        <label><strong>CPU:</strong></label>
+        <div class="progress mb-2">
+          <div id="modal-cpu" class="progress-bar" role="progressbar"></div>
+        </div>
+        <label><strong>Pamięć:</strong></label>
+        <div class="progress mb-2">
+          <div id="modal-mem" class="progress-bar bg-warning" role="progressbar"></div>
+        </div>
+        <label><strong>Dysk:</strong></label>
+        <div class="progress mb-2">
+          <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">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Zamknij</button>
+      </div>
+    </div>
+  </div>
+</div>
 
 {% endblock %}