diff --git a/src/meshcore_hub/web/templates/network.html b/src/meshcore_hub/web/templates/network.html
index ec40478..e45e1ee 100644
--- a/src/meshcore_hub/web/templates/network.html
+++ b/src/meshcore_hub/web/templates/network.html
@@ -90,7 +90,6 @@
                     <thead>
                         <tr>
                             <th>Node</th>
-                            <th>Type</th>
                             <th class="text-right">Received</th>
                         </tr>
                     </thead>
@@ -103,7 +102,6 @@
                                 <div class="text-xs opacity-50 font-mono">{{ ad.public_key[:12] }}...</div>
                                 {% endif %}
                             </td>
-                            <td>{{ ad.adv_type or '-' }}</td>
                             <td class="text-right text-sm opacity-70">{{ ad.received_at.split('T')[1][:8] if ad.received_at else '-' }}</td>
                         </tr>
                         {% endfor %}
diff --git a/src/meshcore_hub/web/templates/nodes.html b/src/meshcore_hub/web/templates/nodes.html
index dce408a..11cac2b 100644
--- a/src/meshcore_hub/web/templates/nodes.html
+++ b/src/meshcore_hub/web/templates/nodes.html
@@ -51,10 +51,8 @@
             <tr>
                 <th>Name</th>
                 <th>Public Key</th>
-                <th>Type</th>
                 <th>Last Seen</th>
                 <th>Tags</th>
-                <th></th>
             </tr>
         </thead>
         <tbody>
@@ -66,17 +64,12 @@
                 {% endif %}
             {% endfor %}
             <tr class="hover">
-                <td class="font-medium">{{ ns.friendly_name or node.name or '-' }}</td>
+                <td class="font-medium">
+                    <a href="/nodes/{{ node.public_key }}" class="link link-hover">{{ ns.friendly_name or node.name or '-' }}</a>
+                </td>
                 <td class="font-mono text-xs truncate-cell" title="{{ node.public_key }}">
                     {{ node.public_key[:16] }}...
                 </td>
-                <td>
-                    {% if node.adv_type %}
-                    <span class="badge badge-outline badge-sm">{{ node.adv_type }}</span>
-                    {% else %}
-                    <span class="opacity-50">-</span>
-                    {% endif %}
-                </td>
                 <td class="text-sm">
                     {% if node.last_seen %}
                     {{ node.last_seen[:19].replace('T', ' ') }}
@@ -98,15 +91,10 @@
                     <span class="opacity-50">-</span>
                     {% endif %}
                 </td>
-                <td>
-                    <a href="/nodes/{{ node.public_key }}" class="btn btn-ghost btn-xs">
-                        View
-                    </a>
-                </td>
             </tr>
             {% else %}
             <tr>
-                <td colspan="6" 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>