diff --git a/files/app/main/status/e/neighbor-device.ut b/files/app/main/status/e/neighbor-device.ut
index 60c2a736..7a176805 100755
--- a/files/app/main/status/e/neighbor-device.ut
+++ b/files/app/main/status/e/neighbor-device.ut
@@ -102,9 +102,13 @@ if (tracker) {
 }
 %}
 <div class="dialog">
-    {{_R("dialog-header", "Neighborhood Device")}}
+    {% if (tracker && tracker.type === "DtD" && tracker.distance < 50) { %}
+    {{_R("dialog-header", "Local Node")}}
+    {% } else { %}
+    {{_R("dialog-header", "Neighborhood Node")}}
+    {% } %}
     <div>
-        {{_H("Provides more detailed information about the state of a link from this node to a neighbor. The current blocked
+        {{_H("Provides more detailed information about the state of a link from this node to another. The current blocked
         state is show in the top/right corner. This can be changed to either <b>always block</b> or <b>never block</b> to override
         the automatic management of the link's use.")}}
         {%
diff --git a/files/app/partial/local-and-neighbor-devices.ut b/files/app/partial/local-and-neighbor-devices.ut
index 0c42ad73..864c0016 100755
--- a/files/app/partial/local-and-neighbor-devices.ut
+++ b/files/app/partial/local-and-neighbor-devices.ut
@@ -76,7 +76,7 @@
         return "-";
     }
 %}
-<div class="noctrl">
+<div class="noctrl" hx-target="#ctrl-modal">
     <div class="section-title">Local Nodes</div>
     <div class="section" style="line-height:18px;margin-top:-16px">
         <div class="cols">
@@ -106,7 +106,7 @@
                 for (let i = 0; i < length(llist); i++) {
                     const tracker = trackers[llist[i].mac];
                     const status = calcColor(tracker);
-                    print("<div class='cols " + status + "'>");
+                    print(`<div class="ctrl cols status ${status}" hx-get="status/e/neighbor-device?m=${tracker.mac}">`);
                     const link = links[tracker.ip] || {};
                     const lq = link.lossMultiplier ? (min(100, int(100 * link.linkQuality * 65536 / link.lossMultiplier) + "%")) : "-";
                     const nlq = link.lossMultiplier ? (min(100, int(100 * link.neighborLinkQuality * 65536 / link.lossMultiplier)) + "%") : "-";