diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index a4ac2f1..4a2e19e 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -8,15 +8,10 @@
     </span>
 </h2>
 <div class="row g-3">
-    {% set current_group = None %}
-    {% for d in devices %}
-        {% set group = d[1][0] %}
-        {% if group != current_group %}
-            {% if not loop.first %}</div>{% endif %}  <!-- alte Reihe schließen -->
-            <h5 class="mt-3">{{ group }}</h5>
-            <div class="row g-3">
-            {% set current_group = group %}
-        {% endif %}
+    {% for letter, group in grouped_devices.items() %}
+    <h3>{{ letter }}</h3>
+    <div class="row g-3">
+        {% for d in group %}
         <div class="col-6 col-md-4 col-lg-3 col-xl-2">
             <div class="card text-center p-2"
                 {% if last_seen.get(d[0]) %}
@@ -40,7 +35,8 @@
                 </div>
             </div>
         </div>
-        {% if loop.last %}</div>{% endif %}  <!-- letzte Reihe schließen -->
+        {% endfor %}
+    </div>
     {% endfor %}
 </div>
 <script>