diff --git a/src/meshcore_hub/web/templates/nodes.html b/src/meshcore_hub/web/templates/nodes.html
index e81d09b..1636fca 100644
--- a/src/meshcore_hub/web/templates/nodes.html
+++ b/src/meshcore_hub/web/templates/nodes.html
@@ -49,9 +49,8 @@
     <table class="table table-zebra">
         <thead>
             <tr>
-                <th>Name</th>
+                <th>Node</th>
                 <th>Type</th>
-                <th>Public Key</th>
                 <th>Last Seen</th>
                 <th>Tags</th>
             </tr>
@@ -65,8 +64,15 @@
                 {% endif %}
             {% endfor %}
             <tr class="hover">
-                <td class="font-medium">
-                    <a href="/nodes/{{ node.public_key }}" class="link link-hover">{{ ns.friendly_name or node.name or '-' }}</a>
+                <td>
+                    <a href="/nodes/{{ node.public_key }}" class="link link-hover">
+                        {% if ns.friendly_name or node.name %}
+                        <div class="font-medium">{{ ns.friendly_name or node.name }}</div>
+                        <div class="text-xs font-mono opacity-70">{{ node.public_key[:16] }}...</div>
+                        {% else %}
+                        <span class="font-mono text-sm">{{ node.public_key[:16] }}...</span>
+                        {% endif %}
+                    </a>
                 </td>
                 <td>
                     {% if node.adv_type and node.adv_type|lower == 'chat' %}
@@ -81,10 +87,7 @@
                     <span class="opacity-50">-</span>
                     {% endif %}
                 </td>
-                <td class="font-mono text-xs truncate-cell" title="{{ node.public_key }}">
-                    {{ node.public_key[:16] }}...
-                </td>
-                <td class="text-sm">
+                <td class="text-sm whitespace-nowrap">
                     {% if node.last_seen %}
                     {{ node.last_seen[:19].replace('T', ' ') }}
                     {% else %}
@@ -108,7 +111,7 @@
             </tr>
             {% else %}
             <tr>
-                <td colspan="5" class="text-center py-8 opacity-70">No nodes found.</td>
+                <td colspan="4" class="text-center py-8 opacity-70">No nodes found.</td>
             </tr>
             {% endfor %}
         </tbody>