diff --git a/templates/devices.html b/templates/devices.html
index c89cca4..5899bfc 100644
--- a/templates/devices.html
+++ b/templates/devices.html
@@ -39,7 +39,7 @@
 </div>
 {% endif %}
 
-<!-- Add Device + Firmware oben -->
+<!-- Neues Tuerschild + Firmware -->
 <div class="row g-3 mb-4">
     <div class="col-md-6">
         <div class="card">
@@ -103,181 +103,169 @@
     </div>
 </div>
 
-<!-- Device Cards -->
-<div class="row g-3 mb-4">
-    {% for device in devices %}
-    <div class="col-md-6 col-lg-4 col-xl-3">
-        <div class="card busylight-card h-100">
-            <div class="card-header bg-white border-0 pb-0">
-                <div class="d-flex justify-content-between align-items-center">
-                    <strong>{{ device.name or device.hostname }}</strong>
-                    {% if device.last_check %}
-                        {% if device.online %}
-                        <span class="status-dot" style="background: #28a745;" title="Online"></span>
-                        {% else %}
-                        <span class="status-dot" style="background: #dc3545;" title="Offline"></span>
-                        {% endif %}
-                    {% else %}
-                    <span class="status-dot" style="background: #999;" title="Nicht geprueft"></span>
-                    {% endif %}
-                </div>
-            </div>
-            <div class="card-body pt-2">
-                <table class="table table-sm table-borderless mb-2" style="font-size: 0.8rem;">
+<!-- Geraete-Tabelle -->
+<div class="card">
+    <div class="card-body p-0">
+        <div class="table-responsive">
+            <table class="table table-hover table-sm mb-0">
+                <thead>
                     <tr>
-                        <td class="text-muted" style="width:70px">Host</td>
-                        <td><code class="small">{{ device.hostname }}</code></td>
+                        <th></th>
+                        <th>Name</th>
+                        <th>Hostname</th>
+                        <th>MAC</th>
+                        <th>Version</th>
+                        <th>LEDs</th>
+                        <th>Segmente</th>
+                        <th>Letzte Aktivitaet</th>
+                        <th>Aktionen</th>
                     </tr>
+                </thead>
+                <tbody>
+                    {% for device in devices %}
                     <tr>
-                        <td class="text-muted">MAC</td>
-                        <td><small class="font-monospace">{{ device.mac if device.mac else '-' }}</small></td>
-                    </tr>
-                    <tr>
-                        <td class="text-muted">Version</td>
-                        <td>{{ device.version if device.version else '-' }}</td>
-                    </tr>
-                    <tr>
-                        <td class="text-muted">LEDs</td>
-                        <td>{{ device.leds if device.leds else '-' }}</td>
-                    </tr>
-                    <tr>
-                        <td class="text-muted">Segmente</td>
-                        <td>{{ device.segment_count }}</td>
-                    </tr>
-                </table>
-
-                <!-- Segment Zuordnungen -->
-                {% if device.segments %}
-                <div class="border-top pt-2">
-                    {% for seg in device.segments %}
-                    <div class="d-flex align-items-center mb-1">
-                        <span class="badge bg-primary me-2" style="font-size:0.65rem">Seg {{ seg.segment }}</span>
-                        <small>{{ seg.display_name }}</small>
-                    </div>
-                    {% endfor %}
-                </div>
-                {% endif %}
-
-                {% if device.last_activity %}
-                <div class="border-top pt-2 mt-2">
-                    <small class="text-muted"><i class="bi bi-clock"></i> {{ device.last_activity }}</small>
-                </div>
-                {% endif %}
-            </div>
-            <div class="card-footer bg-white border-0 pt-0">
-                <div class="d-flex gap-1">
-                    <form method="post" action="/api/devices/{{ device.id }}/check" class="d-inline">
-                        <button type="submit" class="btn btn-sm btn-outline-secondary" title="Jetzt pruefen">
-                            <i class="bi bi-wifi"></i>
-                        </button>
-                    </form>
-                    {% if firmwares and device.version and device.online %}
-                        {% set needs_update = [] %}
-                        {% for fw in firmwares %}
-                            {% if device.version not in fw.name %}
-                                {% if needs_update.append(1) %}{% endif %}
+                        <td>
+                            {% if device.last_check %}
+                                {% if device.online %}
+                                <span class="status-dot" style="background: #28a745;" title="Online"></span>
+                                {% else %}
+                                <span class="status-dot" style="background: #dc3545;" title="Offline"></span>
+                                {% endif %}
+                            {% else %}
+                            <span class="status-dot" style="background: #999;" title="Nicht geprueft"></span>
                             {% endif %}
-                        {% endfor %}
-                        {% if needs_update %}
-                    <button class="btn btn-sm btn-outline-warning" title="Firmware Update"
-                            data-bs-toggle="modal" data-bs-target="#ota-{{ device.id }}">
-                        <i class="bi bi-cloud-arrow-up"></i>
-                    </button>
-                        {% endif %}
-                    {% endif %}
-                    <button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal"
-                            data-bs-target="#edit-{{ device.id }}" title="Bearbeiten">
-                        <i class="bi bi-pencil"></i>
-                    </button>
-                    <form method="post" action="/api/devices/{{ device.id }}/delete" class="d-inline"
-                          onsubmit="return confirm('Tuerschild wirklich loeschen?')">
-                        <button type="submit" class="btn btn-sm btn-outline-danger" title="Loeschen">
-                            <i class="bi bi-trash"></i>
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Edit Modal -->
-    <div class="modal fade" id="edit-{{ device.id }}" tabindex="-1">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <form method="post" action="/api/devices/{{ device.id }}/update">
-                    <div class="modal-header">
-                        <h5 class="modal-title">Tuerschild bearbeiten</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Hostname / IP</label>
-                            <input type="text" name="hostname" class="form-control"
-                                   value="{{ device.hostname }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Name</label>
-                            <input type="text" name="name" class="form-control"
-                                   value="{{ device.name }}">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Anzahl Segmente</label>
-                            <input type="number" name="segment_count" class="form-control"
-                                   value="{{ device.segment_count }}" min="1" max="10">
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-                        <button type="submit" class="btn btn-primary">Speichern</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-    <!-- OTA Update Modal -->
-    {% if firmwares %}
-    <div class="modal fade" id="ota-{{ device.id }}" tabindex="-1">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <form method="post" action="/api/firmware/{{ device.id }}/update">
-                    <div class="modal-header">
-                        <h5 class="modal-title">Firmware Update</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>Update fuer <strong>{{ device.name or device.hostname }}</strong></p>
-                        <p><small class="text-muted">Aktuelle Version: {{ device.version or 'unbekannt' }}</small></p>
-                        <div class="mb-3">
-                            <label class="form-label">Firmware waehlen</label>
-                            <select name="firmware_file" class="form-select">
-                                {% for fw in firmwares %}
-                                <option value="{{ fw.name }}">{{ fw.name }} ({{ fw.size }})</option>
+                        </td>
+                        <td><strong>{{ device.name or '-' }}</strong></td>
+                        <td><code class="small">{{ device.hostname }}</code></td>
+                        <td><small class="font-monospace">{{ device.mac if device.mac else '-' }}</small></td>
+                        <td>{{ device.version if device.version else '-' }}</td>
+                        <td>{{ device.leds if device.leds else '-' }}</td>
+                        <td>
+                            {% if device.segments %}
+                                {% for seg in device.segments %}
+                                <div><span class="badge bg-primary" style="font-size:0.6rem">{{ seg.segment }}</span> <small>{{ seg.display_name }}</small></div>
                                 {% endfor %}
-                            </select>
-                        </div>
-                        <div class="alert alert-info mb-0">
-                            <small><i class="bi bi-info-circle"></i> Config wird vor dem Update automatisch gesichert.</small>
+                            {% else %}
+                                <small class="text-muted">{{ device.segment_count }}x (leer)</small>
+                            {% endif %}
+                        </td>
+                        <td><small>{{ device.last_activity or '-' }}</small></td>
+                        <td>
+                            <form method="post" action="/api/devices/{{ device.id }}/check" class="d-inline">
+                                <button type="submit" class="btn btn-sm btn-outline-secondary py-0" title="Jetzt pruefen">
+                                    <i class="bi bi-wifi"></i>
+                                </button>
+                            </form>
+                            {% if firmwares and device.version and device.online %}
+                                {% set needs_update = [] %}
+                                {% for fw in firmwares %}
+                                    {% if device.version not in fw.name %}
+                                        {% if needs_update.append(1) %}{% endif %}
+                                    {% endif %}
+                                {% endfor %}
+                                {% if needs_update %}
+                            <button class="btn btn-sm btn-outline-warning py-0" title="Firmware Update"
+                                    data-bs-toggle="modal" data-bs-target="#ota-{{ device.id }}">
+                                <i class="bi bi-cloud-arrow-up"></i>
+                            </button>
+                                {% endif %}
+                            {% endif %}
+                            <button class="btn btn-sm btn-outline-primary py-0" data-bs-toggle="modal"
+                                    data-bs-target="#edit-{{ device.id }}" title="Bearbeiten">
+                                <i class="bi bi-pencil"></i>
+                            </button>
+                            <form method="post" action="/api/devices/{{ device.id }}/delete" class="d-inline"
+                                  onsubmit="return confirm('Tuerschild wirklich loeschen?')">
+                                <button type="submit" class="btn btn-sm btn-outline-danger py-0" title="Loeschen">
+                                    <i class="bi bi-trash"></i>
+                                </button>
+                            </form>
+                        </td>
+                    </tr>
+
+                    <!-- Edit Modal -->
+                    <div class="modal fade" id="edit-{{ device.id }}" tabindex="-1">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <form method="post" action="/api/devices/{{ device.id }}/update">
+                                    <div class="modal-header">
+                                        <h5 class="modal-title">Tuerschild bearbeiten</h5>
+                                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <div class="mb-3">
+                                            <label class="form-label">Hostname / IP</label>
+                                            <input type="text" name="hostname" class="form-control"
+                                                   value="{{ device.hostname }}" required>
+                                        </div>
+                                        <div class="mb-3">
+                                            <label class="form-label">Name</label>
+                                            <input type="text" name="name" class="form-control"
+                                                   value="{{ device.name }}">
+                                        </div>
+                                        <div class="mb-3">
+                                            <label class="form-label">Anzahl Segmente</label>
+                                            <input type="number" name="segment_count" class="form-control"
+                                                   value="{{ device.segment_count }}" min="1" max="10">
+                                        </div>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+                                        <button type="submit" class="btn btn-primary">Speichern</button>
+                                    </div>
+                                </form>
+                            </div>
                         </div>
                     </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-                        <button type="submit" class="btn btn-warning"><i class="bi bi-cloud-arrow-up"></i> Update starten</button>
+                    <!-- OTA Update Modal -->
+                    {% if firmwares %}
+                    <div class="modal fade" id="ota-{{ device.id }}" tabindex="-1">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <form method="post" action="/api/firmware/{{ device.id }}/update">
+                                    <div class="modal-header">
+                                        <h5 class="modal-title">Firmware Update</h5>
+                                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <p>Update fuer <strong>{{ device.name or device.hostname }}</strong></p>
+                                        <p><small class="text-muted">Aktuelle Version: {{ device.version or 'unbekannt' }}</small></p>
+                                        <div class="mb-3">
+                                            <label class="form-label">Firmware waehlen</label>
+                                            <select name="firmware_file" class="form-select">
+                                                {% for fw in firmwares %}
+                                                <option value="{{ fw.name }}">{{ fw.name }} ({{ fw.size }})</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                        <div class="alert alert-info mb-0">
+                                            <small><i class="bi bi-info-circle"></i> Config wird vor dem Update automatisch gesichert.</small>
+                                        </div>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+                                        <button type="submit" class="btn btn-warning"><i class="bi bi-cloud-arrow-up"></i> Update starten</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
                     </div>
-                </form>
-            </div>
+                    {% endif %}
+                    {% endfor %}
+
+                    {% if not devices %}
+                    <tr>
+                        <td colspan="9" class="text-center text-muted py-4">
+                            Noch keine Tuerschilder vorhanden.
+                        </td>
+                    </tr>
+                    {% endif %}
+                </tbody>
+            </table>
         </div>
     </div>
-    {% endif %}
-    {% endfor %}
-
-    {% if not devices %}
-    <div class="col-12">
-        <div class="text-center text-muted py-4">Noch keine Tuerschilder vorhanden.</div>
-    </div>
-    {% endif %}
 </div>
-
-<div class="text-muted">
+<div class="mt-2 text-muted">
     <small>{{ devices|length }} Tuerschilder | Status wird alle 4 Minuten automatisch geprueft</small>
 </div>
 {% endblock %}