diff --git a/templates/index.html b/templates/index.html
index ba2ff00..782f56a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -22,25 +22,45 @@
                         <div class="device-info">
                             <span class="device-name">{{ device.name }}</span>
                             <span class="device-details">{{ device.ip }}</span>
+                            <span class="device-type">{{ device.type }} ({{ device.connection_type }})</span>
+                            {% if device.critical %}
+                            <span class="critical-badge">Critical</span>
+                            {% endif %}
                         </div>
                     </div>
                     {%- endfor %}
                 </div>
             </div>
+            
             <div class="metric-card">
                 <h2>Interface Status</h2>
-                <div id="interface-details" class="diagnostics-content"></div>
+                <div id="interface-details">
+                    {%- for device in devices %}
+                    <div class="interface-group" data-device-name="{{ device.name }}">
+                        <h3>{{ device.name }}</h3>
+                        <div class="interface-list"></div>
+                    </div>
+                    {%- endfor %}
+                </div>
             </div>
+            
             <div class="metric-card">
                 <h2>System Health</h2>
-                <div id="system-metrics"></div>
-            </div>
-            <div class="metric-card">
-                <h2>Power Management</h2>
-                <div id="power-metrics"></div>
+                <div id="system-metrics">
+                    {%- for device in devices %}
+                    <div class="health-metrics" data-device-name="{{ device.name }}">
+                        <h3>{{ device.name }}</h3>
+                        <div class="metrics-list">
+                            <div class="metric-item cpu"></div>
+                            <div class="metric-item memory"></div>
+                            <div class="metric-item temperature"></div>
+                        </div>
+                    </div>
+                    {%- endfor %}
+                </div>
             </div>
         </div>
     </div>
     <script src="{{ url_for('static', filename='app.js') }}"></script>
 </body>
-</html></html>
\ No newline at end of file
+</html>
\ No newline at end of file