diff --git a/orthos2/frontend/static/frontend/custom.css b/orthos2/frontend/static/frontend/custom.css
index d7e7c158..39731e6d 100644
--- a/orthos2/frontend/static/frontend/custom.css
+++ b/orthos2/frontend/static/frontend/custom.css
@@ -1,9 +1,34 @@
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  /* Bound the whole page to the viewport height instead of letting the
+     document scroll: the header (a flex-shrink:0 sibling of #app-shell)
+     then never scrolls out of view, and #app-shell's own children get a
+     real height to scroll independently within (see #sidenav/
+     #page-content-wrapper below). */
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  margin: 0;
+}
+
+.navbar {
+  flex-shrink: 0;
 }
 
 #app-shell {
-  min-height: 100vh;
+  flex: 1 1 auto;
+  /* Without this, a flex item won't shrink below its content's intrinsic
+     height, so overflow-y: auto on its children would never actually
+     kick in - #app-shell would just grow past the viewport instead. */
+  min-height: 0;
+}
+
+#sidenav {
+  overflow-y: auto;
+}
+
+#page-content-wrapper {
+  overflow-y: auto;
 }
 
 /* .offcanvas-lg resets background/width to transparent/auto above the lg
diff --git a/orthos2/frontend/templates/frontend/architectures/architecture.html b/orthos2/frontend/templates/frontend/architectures/architecture.html
index 748d44f1..0e6a5893 100644
--- a/orthos2/frontend/templates/frontend/architectures/architecture.html
+++ b/orthos2/frontend/templates/frontend/architectures/architecture.html
@@ -29,10 +29,6 @@
           >API:
           <a href="{% url 'api:architecture' %}?name={{ architecture.name }}"
             >{% url 'api:architecture' %}?name={{ architecture.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_architecture' architecture.id %}"
-            >{% url 'frontend:edit_architecture' architecture.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/dailytasks/dailytask.html b/orthos2/frontend/templates/frontend/dailytasks/dailytask.html
index 46bc1f85..e63d192f 100644
--- a/orthos2/frontend/templates/frontend/dailytasks/dailytask.html
+++ b/orthos2/frontend/templates/frontend/dailytasks/dailytask.html
@@ -29,10 +29,6 @@
           >API:
           <a href="{% url 'api:dailytask' %}?id={{ dailytask.pk }}"
             >{% url 'api:dailytask' %}?id={{ dailytask.pk }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_dailytask' dailytask.id %}"
-            >{% url 'frontend:edit_dailytask' dailytask.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/devicetypes/detail/actions.html b/orthos2/frontend/templates/frontend/devicetypes/detail/actions.html
index 3ec47a26..b23fc304 100644
--- a/orthos2/frontend/templates/frontend/devicetypes/detail/actions.html
+++ b/orthos2/frontend/templates/frontend/devicetypes/detail/actions.html
@@ -13,12 +13,22 @@ <h5>Actions</h5>
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
-  <a
-    class="btn btn-secondary btn-sm"
-    href="{% url 'frontend:devicetype_netbox_fetch' devicetype.pk %}"
-    role="button"
-    >Fetch Netbox</a
-  >
+  {% if devicetype.netbox_id %}
+    <a
+      class="btn btn-secondary btn-sm"
+      href="{% url 'frontend:devicetype_netbox_fetch' devicetype.pk %}"
+      role="button"
+      >Fetch Netbox</a
+    >
+  {% else %}
+    <a
+      class="btn btn-secondary btn-sm disabled"
+      href="#"
+      role="button"
+      title="Not linked to NetBox"
+      >Fetch Netbox</a
+    >
+  {% endif %}
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
diff --git a/orthos2/frontend/templates/frontend/devicetypes/detail/netbox_comparison.html b/orthos2/frontend/templates/frontend/devicetypes/detail/netbox_comparison.html
index 6e4146ec..86314d55 100644
--- a/orthos2/frontend/templates/frontend/devicetypes/detail/netbox_comparison.html
+++ b/orthos2/frontend/templates/frontend/devicetypes/detail/netbox_comparison.html
@@ -4,12 +4,22 @@
 {% block tabcontent %}
   <div style="display: table; width: 100%;">
     <div style="display: table-row;" class="float-end">
-      <a
-        class="text-end btn btn-secondary btn-sm"
-        href="{% url 'frontend:devicetype_netbox_compare' devicetype.id %}"
-        role="button"
-        >Preview and Compare data with NetBox</a
-      >
+      {% if devicetype.netbox_id %}
+        <a
+          class="text-end btn btn-secondary btn-sm"
+          href="{% url 'frontend:devicetype_netbox_compare' devicetype.id %}"
+          role="button"
+          >Preview and Compare data with NetBox</a
+        >
+      {% else %}
+        <a
+          class="text-end btn btn-secondary btn-sm disabled"
+          href="#"
+          role="button"
+          title="Not linked to NetBox"
+          >Preview and Compare data with NetBox</a
+        >
+      {% endif %}
     </div>
   </div>
 
diff --git a/orthos2/frontend/templates/frontend/devicetypes/devicetype.html b/orthos2/frontend/templates/frontend/devicetypes/devicetype.html
index 8d53ef74..47fea7ef 100644
--- a/orthos2/frontend/templates/frontend/devicetypes/devicetype.html
+++ b/orthos2/frontend/templates/frontend/devicetypes/devicetype.html
@@ -36,10 +36,6 @@
           >API:
           <a href="{% url 'api:devicetype' %}?name={{ devicetype.name }}"
             >{% url 'api:devicetype' %}?name={{ devicetype.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_devicetype' devicetype.id %}"
-            >{% url 'frontend:edit_devicetype' devicetype.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/domains/detail/overview.html b/orthos2/frontend/templates/frontend/domains/detail/overview.html
index 0a2a5d79..f36107bb 100644
--- a/orthos2/frontend/templates/frontend/domains/detail/overview.html
+++ b/orthos2/frontend/templates/frontend/domains/detail/overview.html
@@ -26,7 +26,13 @@ <h5>{{ domain.name }}</h5>
             </tr>
             <tr>
               <td class="th fw-bold">TFTP Server</td>
-              <td>{{ domain.tftp_server|default_if_none:"-" }}</td>
+              <td>
+                {% if domain.tftp_server %}
+                <a href="{% url 'frontend:detail' domain.tftp_server.id %}">{{ domain.tftp_server }}</a>
+                {% else %}
+                -
+                {% endif %}
+              </td>
             </tr>
             <tr>
               <td class="th fw-bold">CScreen Server</td>
diff --git a/orthos2/frontend/templates/frontend/domains/domain.html b/orthos2/frontend/templates/frontend/domains/domain.html
index 29f41af1..964b0124 100644
--- a/orthos2/frontend/templates/frontend/domains/domain.html
+++ b/orthos2/frontend/templates/frontend/domains/domain.html
@@ -33,9 +33,9 @@
           {% endblock %}
         </div>
         <span style="font-size: 0.7em; font-family: Monospace;"
-          >Edit:
-          <a href="{% url 'frontend:edit_domain' domain.id %}"
-            >{% url 'frontend:edit_domain' domain.id %}</a
+          >API:
+          <a href="{% url 'api:domain' %}?name={{ domain.name }}"
+            >{% url 'api:domain' %}?name={{ domain.name }}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/enclosures/detail/actions.html b/orthos2/frontend/templates/frontend/enclosures/detail/actions.html
index aee33c07..0ff0e32f 100644
--- a/orthos2/frontend/templates/frontend/enclosures/detail/actions.html
+++ b/orthos2/frontend/templates/frontend/enclosures/detail/actions.html
@@ -13,12 +13,22 @@ <h5>Actions</h5>
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
-  <a
-    class="btn btn-secondary btn-sm"
-    href="{% url 'frontend:enclosure_netbox_fetch' enclosure.pk %}"
-    role="button"
-    >Fetch Netbox</a
-  >
+  {% if enclosure.netbox_id %}
+    <a
+      class="btn btn-secondary btn-sm"
+      href="{% url 'frontend:enclosure_netbox_fetch' enclosure.pk %}"
+      role="button"
+      >Fetch Netbox</a
+    >
+  {% else %}
+    <a
+      class="btn btn-secondary btn-sm disabled"
+      href="#"
+      role="button"
+      title="Not linked to NetBox"
+      >Fetch Netbox</a
+    >
+  {% endif %}
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
diff --git a/orthos2/frontend/templates/frontend/enclosures/detail/netbox_comparison.html b/orthos2/frontend/templates/frontend/enclosures/detail/netbox_comparison.html
index 9452682a..72aaacdf 100644
--- a/orthos2/frontend/templates/frontend/enclosures/detail/netbox_comparison.html
+++ b/orthos2/frontend/templates/frontend/enclosures/detail/netbox_comparison.html
@@ -4,7 +4,11 @@
 {% block tabcontent %}
 <div style="display: table; width: 100%;">
 <div style="display: table-row;" class="float-end">
-  <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:enclosure_netbox_compare' enclosure.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% if enclosure.netbox_id %}
+    <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:enclosure_netbox_compare' enclosure.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% else %}
+    <a class="text-end btn btn-secondary btn-sm disabled" href="#" role="button" title="Not linked to NetBox">Preview and Compare data with NetBox</a>
+  {% endif %}
 </div>
 </div>
 
diff --git a/orthos2/frontend/templates/frontend/enclosures/enclosure.html b/orthos2/frontend/templates/frontend/enclosures/enclosure.html
index b6b076e1..67dddc2b 100644
--- a/orthos2/frontend/templates/frontend/enclosures/enclosure.html
+++ b/orthos2/frontend/templates/frontend/enclosures/enclosure.html
@@ -39,10 +39,6 @@
           >API:
           <a href="{% url 'api:enclosure' %}?name={{ enclosure.name }}"
             >{% url 'api:enclosure' %}?name={{ enclosure.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_enclosure' enclosure.id %}"
-            >{% url 'frontend:edit_enclosure' enclosure.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/enclosures/enclosures_filterbar.html b/orthos2/frontend/templates/frontend/enclosures/enclosures_filterbar.html
index ba1f5d1c..eff138ef 100644
--- a/orthos2/frontend/templates/frontend/enclosures/enclosures_filterbar.html
+++ b/orthos2/frontend/templates/frontend/enclosures/enclosures_filterbar.html
@@ -20,6 +20,15 @@
 
       <span class="ms-2"></span>
 
+      <span class="hint" style="margin-right: 0.5rem;">NetBox Synchronized</span>
+      <div class="btn-group" role="group" style="margin-right: 0.5rem;">
+        <a class="btn btn-secondary btn-sm {% active request '1' %}" href="?{% url_replace request 'has_netbox' '1' %}" role="button">Yes</a>
+        <a class="btn btn-secondary btn-sm {% active request '0' %}" href="?{% url_replace request 'has_netbox' '0' %}" role="button">No</a>
+        <a class="btn btn-secondary btn-sm" href="?{% url_replace request 'has_netbox' '' True %}" role="button">&#215;</a>
+      </div>
+
+      <span class="ms-2"></span>
+
       {% include 'frontend/snippet.search.html' with search_hint='Name' %}
 
       <span class="ms-2"></span>
diff --git a/orthos2/frontend/templates/frontend/groups/detail/overview.html b/orthos2/frontend/templates/frontend/groups/detail/overview.html
index fc817eeb..12b27607 100644
--- a/orthos2/frontend/templates/frontend/groups/detail/overview.html
+++ b/orthos2/frontend/templates/frontend/groups/detail/overview.html
@@ -56,12 +56,5 @@ <h5>Actions</h5>
         </div>
       </div>
     </div>
-
-    <span style="font-size: 0.7em; font-family: Monospace;"
-      >Edit:
-      <a href="{% url 'frontend:edit_group' group.id %}"
-        >{% url 'frontend:edit_group' group.id %}</a
-      ></span
-    >
   </div>
 {% endblock %}
diff --git a/orthos2/frontend/templates/frontend/machines/detail/edit_machine.html b/orthos2/frontend/templates/frontend/machines/detail/edit_machine.html
index cb9a59e4..0ef95229 100644
--- a/orthos2/frontend/templates/frontend/machines/detail/edit_machine.html
+++ b/orthos2/frontend/templates/frontend/machines/detail/edit_machine.html
@@ -43,6 +43,11 @@ <h5>VIRTUALIZATION SERVER</h5>
                   >
                 </div>
               </div>
+            {% else %}
+              {# Field isn't relevant for this system, but it's still a
+                 required part of the form - submit its unchanged value as
+                 hidden so unrelated edits don't fail validation. #}
+              {{ field.as_hidden }}
             {% endif %}
           {% elif field.name == "hypervisor" %}
             {% if object.system.virtual %}
@@ -61,6 +66,8 @@ <h5>VIRTUALIZATION CLIENT</h5>
                   >
                 </div>
               </div>
+            {% else %}
+              {{ field.as_hidden }}
             {% endif %}
           {% else %}
             {{ field.errors }}
diff --git a/orthos2/frontend/templates/frontend/machines/detail/netboxcomparison.html b/orthos2/frontend/templates/frontend/machines/detail/netboxcomparison.html
index 406ffd22..8aee25f7 100644
--- a/orthos2/frontend/templates/frontend/machines/detail/netboxcomparison.html
+++ b/orthos2/frontend/templates/frontend/machines/detail/netboxcomparison.html
@@ -4,7 +4,11 @@
 {% block tabcontent %}
 <div style="display: table; width: 100%;">
 <div style="display: table-row;" class="float-end">
-  <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:netbox_compare' machine.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% if machine.netbox_id %}
+    <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:netbox_compare' machine.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% else %}
+    <a class="text-end btn btn-secondary btn-sm disabled" href="#" role="button" title="Not linked to NetBox">Preview and Compare data with NetBox</a>
+  {% endif %}
 </div>
 </div>
 
diff --git a/orthos2/frontend/templates/frontend/machines/detail/remotepower.html b/orthos2/frontend/templates/frontend/machines/detail/remotepower.html
index 1a3c4f25..0785c508 100644
--- a/orthos2/frontend/templates/frontend/machines/detail/remotepower.html
+++ b/orthos2/frontend/templates/frontend/machines/detail/remotepower.html
@@ -2,60 +2,71 @@
 {% load filters %}
 
 {% block tabcontent %}
-  <div class="title d-flex align-items-center">
-    <h5>Remote Power</h5>
-    {% if request.user.is_superuser and not machine.has_remotepower %}
-      <a
-        class="btn btn-success btn-sm ms-auto"
-        href="{% url 'frontend:new_remotepower' machine.pk %}"
-        >+</a
-      >
-    {% endif %}
-  </div>
-
   {% if machine.has_remotepower %}
-    <table class="table table-bordered small">
-      <tbody class="thead-default">
-        <tr>
-          <td class="th fw-bold" width="200px">Fence Agent</td>
-          <td>{{ machine.remotepower.get_remotepower_fence.name }}</td>
-        </tr>
-        <tr>
-          <td class="th fw-bold">Remote Power Device</td>
-          <td>{{ machine.remotepower.remote_power_device }}</td>
-        </tr>
-        <tr>
-          <td class="th fw-bold">Port</td>
-          <td>{{ machine.remotepower.port }}</td>
-        </tr>
-        <tr>
-          <td class="th fw-bold">Comment</td>
-          <td>{{ machine.remotepower.comment }}</td>
-        </tr>
-        <tr>
-          <td class="th fw-bold">Options</td>
-          <td>{{ machine.remotepower.options }}</td>
-        </tr>
-      </tbody>
-    </table>
-    {% if request.user.is_superuser %}
-      <div class="btn-group-vertical d-flex" style="max-width: 200px;">
-        <a
-          class="btn btn-warning btn-sm"
-          href="{% url 'frontend:edit_remotepower' machine.pk %}"
-          >Edit Remote Power</a
-        >
+    <div class="row">
+      <div class="col-10">
+        <div class="title">
+          <h5>Remote Power</h5>
+        </div>
+        <table class="table table-bordered small">
+          <tbody class="thead-default">
+            <tr>
+              <td class="th fw-bold" width="200px">Fence Agent</td>
+              <td>{{ machine.remotepower.get_remotepower_fence.name }}</td>
+            </tr>
+            <tr>
+              <td class="th fw-bold">Remote Power Device</td>
+              <td>{{ machine.remotepower.remote_power_device }}</td>
+            </tr>
+            <tr>
+              <td class="th fw-bold">Port</td>
+              <td>{{ machine.remotepower.port }}</td>
+            </tr>
+            <tr>
+              <td class="th fw-bold">Comment</td>
+              <td>{{ machine.remotepower.comment }}</td>
+            </tr>
+            <tr>
+              <td class="th fw-bold">Options</td>
+              <td>{{ machine.remotepower.options }}</td>
+            </tr>
+          </tbody>
+        </table>
       </div>
-      <br />
-      <div class="btn-group-vertical d-flex" style="max-width: 200px;">
+      {% if request.user.is_superuser %}
+        <div class="col-2">
+          <div class="title">
+            <h5>Actions</h5>
+          </div>
+          <div class="btn-group-vertical d-flex">
+            <a
+              class="btn btn-warning btn-sm"
+              href="{% url 'frontend:edit_remotepower' machine.pk %}"
+              >Edit Remote Power</a
+            >
+          </div>
+          <br />
+          <div class="btn-group-vertical d-flex">
+            <a
+              class="btn btn-danger btn-sm"
+              href="{% url 'frontend:delete_remotepower' machine.pk %}"
+              >Delete Remote Power</a
+            >
+          </div>
+        </div>
+      {% endif %}
+    </div>
+  {% else %}
+    <div class="title d-flex align-items-center">
+      <h5>Remote Power</h5>
+      {% if request.user.is_superuser %}
         <a
-          class="btn btn-danger btn-sm"
-          href="{% url 'frontend:delete_remotepower' machine.pk %}"
-          >Delete Remote Power</a
+          class="btn btn-success btn-sm ms-auto"
+          href="{% url 'frontend:new_remotepower' machine.pk %}"
+          >+</a
         >
-      </div>
-    {% endif %}
-  {% else %}
+      {% endif %}
+    </div>
     <div class="alert alert-info">
       No remote power configured for this machine!
     </div>
diff --git a/orthos2/frontend/templates/frontend/machines/detail/serialconsole.html b/orthos2/frontend/templates/frontend/machines/detail/serialconsole.html
index e275a156..55cbdda6 100644
--- a/orthos2/frontend/templates/frontend/machines/detail/serialconsole.html
+++ b/orthos2/frontend/templates/frontend/machines/detail/serialconsole.html
@@ -2,60 +2,71 @@
 {% load filters %}
 
 {% block tabcontent %}
-<div class="title d-flex align-items-center">
-  <h5>Serial Console</h5>
-  {% if request.user.is_superuser and not machine.has_serialconsole %}
-  <a class="btn btn-success btn-sm ms-auto" href="{% url 'frontend:new_serialconsole' machine.pk %}">+</a>
-  {% endif %}
-</div>
-
 {% if machine.has_serialconsole %}
-  <table class="table table-bordered small">
-    <tbody class="thead-default">
-      <tr>
-        <td class="th fw-bold" width="200px">Type</td>
-        <td>{{ machine.serialconsole.stype.name }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Console Server</td>
-        <td>{{ machine.serialconsole.console_server }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Port</td>
-        <td>{{ machine.serialconsole.port }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Command</td>
-        <td>{{ machine.serialconsole.command }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Comment</td>
-        <td>{{ machine.serialconsole.comment }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Baud Rate</td>
-        <td>{{ machine.serialconsole.baud_rate }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Kernel Device</td>
-        <td>{{ machine.serialconsole.kernel_device }}{{ machine.serialconsole.kernel_device_num }}</td>
-      </tr>
-      <tr>
-        <td class="th fw-bold">Rendered Command</td>
-        <td>{{ machine.serialconsole.rendered_command }}</td>
-      </tr>
-    </tbody>
-  </table>
-  {% if request.user.is_superuser %}
-  <div class="btn-group-vertical d-flex" style="max-width: 200px;">
-    <a class="btn btn-warning btn-sm" href="{% url 'frontend:edit_serialconsole' machine.pk %}">Edit Serial Console</a>
-  </div>
-  <br/>
-  <div class="btn-group-vertical d-flex" style="max-width: 200px;">
-    <a class="btn btn-danger btn-sm" href="{% url 'frontend:delete_serialconsole' machine.pk %}">Delete Serial Console</a>
+  <div class="row">
+    <div class="col-10">
+      <div class="title">
+        <h5>Serial Console</h5>
+      </div>
+      <table class="table table-bordered small">
+        <tbody class="thead-default">
+          <tr>
+            <td class="th fw-bold" width="200px">Type</td>
+            <td>{{ machine.serialconsole.stype.name }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Console Server</td>
+            <td>{{ machine.serialconsole.console_server }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Port</td>
+            <td>{{ machine.serialconsole.port }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Command</td>
+            <td>{{ machine.serialconsole.command }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Comment</td>
+            <td>{{ machine.serialconsole.comment }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Baud Rate</td>
+            <td>{{ machine.serialconsole.baud_rate }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Kernel Device</td>
+            <td>{{ machine.serialconsole.kernel_device }}{{ machine.serialconsole.kernel_device_num }}</td>
+          </tr>
+          <tr>
+            <td class="th fw-bold">Rendered Command</td>
+            <td>{{ machine.serialconsole.rendered_command }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    {% if request.user.is_superuser %}
+      <div class="col-2">
+        <div class="title">
+          <h5>Actions</h5>
+        </div>
+        <div class="btn-group-vertical d-flex">
+          <a class="btn btn-warning btn-sm" href="{% url 'frontend:edit_serialconsole' machine.pk %}">Edit Serial Console</a>
+        </div>
+        <br/>
+        <div class="btn-group-vertical d-flex">
+          <a class="btn btn-danger btn-sm" href="{% url 'frontend:delete_serialconsole' machine.pk %}">Delete Serial Console</a>
+        </div>
+      </div>
+    {% endif %}
   </div>
-  {% endif %}
 {% else %}
+  <div class="title d-flex align-items-center">
+    <h5>Serial Console</h5>
+    {% if request.user.is_superuser %}
+      <a class="btn btn-success btn-sm ms-auto" href="{% url 'frontend:new_serialconsole' machine.pk %}">+</a>
+    {% endif %}
+  </div>
   <div class="alert alert-info">No serial console configured for this machine!</div>
 {% endif %}
 {% endblock %}
diff --git a/orthos2/frontend/templates/frontend/machines/detail/snippets/sidebar.html b/orthos2/frontend/templates/frontend/machines/detail/snippets/sidebar.html
index cc6c5f6a..13dd4cf0 100644
--- a/orthos2/frontend/templates/frontend/machines/detail/snippets/sidebar.html
+++ b/orthos2/frontend/templates/frontend/machines/detail/snippets/sidebar.html
@@ -3,6 +3,13 @@
   <h5>Actions</h5>
 </div>
 
+{% if user.is_superuser %}
+<div class="btn-group-vertical d-flex">
+  <a class="btn btn-warning btn-sm" href="{% url 'frontend:edit_machine' machine.id %}" role="button">Edit Machine</a>
+</div>
+<br/>
+{% endif %}
+
 <div class="btn-group-vertical d-flex">
   {% if machine.reserved_by and user.username == machine.reserved_by.username %}
   <a class="btn btn-secondary btn-sm" href="{% url 'frontend:reserve_machine' machine.id %}" role="button">Extend Reservation</a>
@@ -58,7 +65,11 @@ <h5>Actions</h5>
 
 <br/>
 <div class="btn-group-vertical d-flex">
+  {% if machine.netbox_id %}
     <a class="btn btn-secondary btn-sm" href="{% url 'frontend:netbox_fetch' machine.id %}" role="button">Fetch Netbox</a>
+  {% else %}
+    <a class="btn btn-secondary btn-sm disabled" href="#" role="button" title="Not linked to NetBox">Fetch Netbox</a>
+  {% endif %}
 </div>
 
 <br/>
diff --git a/orthos2/frontend/templates/frontend/machines/machine.html b/orthos2/frontend/templates/frontend/machines/machine.html
index b6b4ea6a..51656373 100644
--- a/orthos2/frontend/templates/frontend/machines/machine.html
+++ b/orthos2/frontend/templates/frontend/machines/machine.html
@@ -134,10 +134,6 @@
           >API:
           <a href="{% url 'api:machine' %}?fqdn={{ machine.fqdn }}"
             >{% url 'api:machine' %}?fqdn={{ machine.fqdn }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_machine' machine.id %}"
-            >{% url 'frontend:edit_machine' machine.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/machines/statistics.html b/orthos2/frontend/templates/frontend/machines/statistics.html
index 9c79d83d..01b552ee 100644
--- a/orthos2/frontend/templates/frontend/machines/statistics.html
+++ b/orthos2/frontend/templates/frontend/machines/statistics.html
@@ -142,15 +142,6 @@ <h5>Machine Status</h5>{{ data.total }} Machines
 
 {% block javascript %}
 <script>
-function getRandomColor() {
-  var letters = '789ABCD'.split('');
-  var color = '#';
-  for (var i = 0; i < 6; i++ ) {
-    color += letters[Math.round(Math.random() * 6)];
-  }
-  return color;
-}
-
 new Chart(document.getElementById("statusChart"),{
   type:"bar",
   data: {
@@ -204,8 +195,8 @@ <h5>Machine Status</h5>{{ data.total }} Machines
       {
         data: [{{ data.domains.values|join:", " }}],
         backgroundColor: [
-        {% for label in data.domains.labels %}
-          getRandomColor(),
+        {% for color in data.domains.colors %}
+          "{{ color }}",
         {% endfor %}
         ]
       }
diff --git a/orthos2/frontend/templates/frontend/manufacturers/detail/actions.html b/orthos2/frontend/templates/frontend/manufacturers/detail/actions.html
index d5e8288b..8fc70c17 100644
--- a/orthos2/frontend/templates/frontend/manufacturers/detail/actions.html
+++ b/orthos2/frontend/templates/frontend/manufacturers/detail/actions.html
@@ -13,12 +13,22 @@ <h5>Actions</h5>
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
-  <a
-    class="btn btn-secondary btn-sm"
-    href="{% url 'frontend:manufacturer_netbox_fetch' manufacturer.pk %}"
-    role="button"
-    >Fetch Netbox</a
-  >
+  {% if manufacturer.netbox_id %}
+    <a
+      class="btn btn-secondary btn-sm"
+      href="{% url 'frontend:manufacturer_netbox_fetch' manufacturer.pk %}"
+      role="button"
+      >Fetch Netbox</a
+    >
+  {% else %}
+    <a
+      class="btn btn-secondary btn-sm disabled"
+      href="#"
+      role="button"
+      title="Not linked to NetBox"
+      >Fetch Netbox</a
+    >
+  {% endif %}
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
diff --git a/orthos2/frontend/templates/frontend/manufacturers/detail/netbox_comparison.html b/orthos2/frontend/templates/frontend/manufacturers/detail/netbox_comparison.html
index cdc2c536..df5ebc78 100644
--- a/orthos2/frontend/templates/frontend/manufacturers/detail/netbox_comparison.html
+++ b/orthos2/frontend/templates/frontend/manufacturers/detail/netbox_comparison.html
@@ -4,12 +4,22 @@
 {% block tabcontent %}
   <div style="display: table; width: 100%;">
     <div style="display: table-row;" class="float-end">
-      <a
-        class="text-end btn btn-secondary btn-sm"
-        href="{% url 'frontend:manufacturer_netbox_compare' manufacturer.id %}"
-        role="button"
-        >Preview and Compare data with NetBox</a
-      >
+      {% if manufacturer.netbox_id %}
+        <a
+          class="text-end btn btn-secondary btn-sm"
+          href="{% url 'frontend:manufacturer_netbox_compare' manufacturer.id %}"
+          role="button"
+          >Preview and Compare data with NetBox</a
+        >
+      {% else %}
+        <a
+          class="text-end btn btn-secondary btn-sm disabled"
+          href="#"
+          role="button"
+          title="Not linked to NetBox"
+          >Preview and Compare data with NetBox</a
+        >
+      {% endif %}
     </div>
   </div>
 
diff --git a/orthos2/frontend/templates/frontend/manufacturers/manufacturer.html b/orthos2/frontend/templates/frontend/manufacturers/manufacturer.html
index 4f52fff1..bd74d08f 100644
--- a/orthos2/frontend/templates/frontend/manufacturers/manufacturer.html
+++ b/orthos2/frontend/templates/frontend/manufacturers/manufacturer.html
@@ -43,10 +43,6 @@
           >API:
           <a href="{% url 'api:manufacturer' %}?name={{ manufacturer.name }}"
             >{% url 'api:manufacturer' %}?name={{ manufacturer.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_manufacturer' manufacturer.id %}"
-            >{% url 'frontend:edit_manufacturer' manufacturer.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/remotepowerdevices/detail/actions.html b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/actions.html
index e5114726..eecac87e 100644
--- a/orthos2/frontend/templates/frontend/remotepowerdevices/detail/actions.html
+++ b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/actions.html
@@ -13,12 +13,22 @@ <h5>Actions</h5>
 </div>
 <br />
 <div class="btn-group-vertical d-flex">
-  <a
-    class="btn btn-secondary btn-sm"
-    href="{% url 'frontend:remotepowerdevice_netbox_fetch' remotepowerdevice.pk %}"
-    role="button"
-    >Fetch Netbox</a
-  >
+  {% if remotepowerdevice.netbox_id %}
+    <a
+      class="btn btn-secondary btn-sm"
+      href="{% url 'frontend:remotepowerdevice_netbox_fetch' remotepowerdevice.pk %}"
+      role="button"
+      >Fetch Netbox</a
+    >
+  {% else %}
+    <a
+      class="btn btn-secondary btn-sm disabled"
+      href="#"
+      role="button"
+      title="Not linked to NetBox"
+      >Fetch Netbox</a
+    >
+  {% endif %}
   {% if perms.data.change_remotepowerdevice %}
   <a class="btn btn-secondary btn-sm regenerate-remotepowerdevice-cobbler" href="javascript:void(0);" onclick="regenerate_remotepowerdevice_cobbler()" role="button">Regenerate Cobbler Record</a>
   {% endif %}
diff --git a/orthos2/frontend/templates/frontend/remotepowerdevices/detail/machines.html b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/machines.html
new file mode 100644
index 00000000..2ae859c0
--- /dev/null
+++ b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/machines.html
@@ -0,0 +1,44 @@
+{% extends 'frontend/remotepowerdevices/remotepowerdevice.html' %}
+
+{% block tabcontent %}
+  <div class="row">
+    <div class="col-10">
+      <div class="container-fluid">
+        <div class="title">
+          <h5>Machines using {{ remotepowerdevice.fqdn }}</h5>
+        </div>
+
+        {% if remotepowers %}
+          <table class="table table-striped table-bordered table-fixed small">
+            <thead class="thead-default">
+              <tr style="border: 1px solid #ddd;">
+                <th>Machine</th>
+              </tr>
+            </thead>
+
+            <tbody>
+              {% for remotepower in remotepowers %}
+                <tr>
+                  <td>
+                    <a
+                      href="{% url 'frontend:detail' remotepower.machine.pk %}"
+                      class="text-muted"
+                      >{{ remotepower.machine.fqdn }}</a
+                    >
+                  </td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        {% else %}
+          <div class="alert alert-info">
+            No machines use this remote power device.
+          </div>
+        {% endif %}
+      </div>
+    </div>
+    <div class="col-2">
+      {% include 'frontend/remotepowerdevices/detail/actions.html' %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/orthos2/frontend/templates/frontend/remotepowerdevices/detail/netbox_comparison.html b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/netbox_comparison.html
index 8fdb67f4..f5020981 100644
--- a/orthos2/frontend/templates/frontend/remotepowerdevices/detail/netbox_comparison.html
+++ b/orthos2/frontend/templates/frontend/remotepowerdevices/detail/netbox_comparison.html
@@ -4,7 +4,11 @@
 {% block tabcontent %}
 <div style="display: table; width: 100%;">
 <div style="display: table-row;" class="float-end">
-  <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:remotepowerdevice_netbox_compare' remotepowerdevice.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% if remotepowerdevice.netbox_id %}
+    <a class="text-end btn btn-secondary btn-sm" href="{% url 'frontend:remotepowerdevice_netbox_compare' remotepowerdevice.id %}" role="button">Preview and Compare data with NetBox</a>
+  {% else %}
+    <a class="text-end btn btn-secondary btn-sm disabled" href="#" role="button" title="Not linked to NetBox">Preview and Compare data with NetBox</a>
+  {% endif %}
 </div>
 </div>
 
diff --git a/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevice.html b/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevice.html
index 1a39f9cf..72d85067 100644
--- a/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevice.html
+++ b/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevice.html
@@ -15,6 +15,13 @@
               >Overview</a
             >
           </li>
+          <li class="nav-item">
+            <a
+              class="nav-link {% active_view request 'remotepowerdevice_machines' %}"
+              href="{% url 'frontend:remotepowerdevice_machines' remotepowerdevice.pk %}"
+              >Machines</a
+            >
+          </li>
           <li class="nav-item">
             <a
               class="nav-link {% active_view request 'remotepowerdevice_netbox_comparisons' %}"
@@ -33,11 +40,6 @@
           <a
             href="{% url 'api:remotepowerdevice' %}?fqdn={{ remotepowerdevice.fqdn }}"
             >{% url 'api:remotepowerdevice' %}?fqdn={{ remotepowerdevice.fqdn }}</a
-          >
-          | Edit:
-          <a
-            href="{% url 'frontend:edit_remotepowerdevice' remotepowerdevice.id %}"
-            >{% url 'frontend:edit_remotepowerdevice' remotepowerdevice.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevices.html b/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevices.html
index 45f50865..202bb5c8 100644
--- a/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevices.html
+++ b/orthos2/frontend/templates/frontend/remotepowerdevices/remotepowerdevices.html
@@ -13,6 +13,7 @@
           <tr style="border: 1px solid #ddd;">
             <th>FQDN {% order_list request 'fqdn' %}</th>
             <th>NetBox ID {% order_list request 'netbox_id' %}</th>
+            <th>Machines</th>
             <th width="80px">&nbsp;</th>
           </tr>
         </thead>
@@ -28,6 +29,13 @@
                 >
               </td>
               <td>{{ remotepowerdevice.netbox_id }}</td>
+              <td>
+                <a
+                  href="{% url 'frontend:remotepowerdevice_machines' remotepowerdevice.pk %}"
+                  class="text-muted"
+                  >{{ remotepowerdevice.machine_count }}</a
+                >
+              </td>
               <td>
                 <a
                   href="{% url 'frontend:delete_remotepowerdevice' remotepowerdevice.pk %}"
diff --git a/orthos2/frontend/templates/frontend/remotepowertypes/detail/devices.html b/orthos2/frontend/templates/frontend/remotepowertypes/detail/devices.html
index 7256806f..50085b4d 100644
--- a/orthos2/frontend/templates/frontend/remotepowertypes/detail/devices.html
+++ b/orthos2/frontend/templates/frontend/remotepowertypes/detail/devices.html
@@ -8,33 +8,29 @@
           <h5>Devices using {{ remotepowertype.name }}</h5>
         </div>
 
-        {% if remotepowerdevices %}
+        {% if devices %}
           <table class="table table-striped table-bordered table-fixed small">
             <thead class="thead-default">
               <tr style="border: 1px solid #ddd;">
-                <th>FQDN</th>
+                <th>{% if remotepowertype.device == 'rpowerdevice' %}FQDN{% else %}Machine{% endif %}</th>
                 <th>NetBox ID</th>
               </tr>
             </thead>
 
             <tbody>
-              {% for remotepowerdevice in remotepowerdevices %}
+              {% for device in devices %}
                 <tr>
                   <td>
-                    <a
-                      href="{% url 'frontend:remotepowerdevice_detail' remotepowerdevice.pk %}"
-                      class="text-muted"
-                      >{{ remotepowerdevice.fqdn }}</a
-                    >
+                    <a href="{{ device.url }}" class="text-muted">{{ device.label }}</a>
                   </td>
-                  <td>{{ remotepowerdevice.netbox_id }}</td>
+                  <td>{{ device.netbox_id }}</td>
                 </tr>
               {% endfor %}
             </tbody>
           </table>
         {% else %}
           <div class="alert alert-info">
-            No remote power devices use this remote power type.
+            No devices use this remote power type.
           </div>
         {% endif %}
       </div>
diff --git a/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertype.html b/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertype.html
index 0dbb4fd8..d7349010 100644
--- a/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertype.html
+++ b/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertype.html
@@ -36,10 +36,6 @@
           >API:
           <a href="{% url 'api:remotepowertype' %}?name={{ remotepowertype.name }}"
             >{% url 'api:remotepowertype' %}?name={{ remotepowertype.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_remotepowertype' remotepowertype.id %}"
-            >{% url 'frontend:edit_remotepowertype' remotepowertype.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertypes_filterbar.html b/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertypes_filterbar.html
index e3b0e80a..cd5b0539 100644
--- a/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertypes_filterbar.html
+++ b/orthos2/frontend/templates/frontend/remotepowertypes/remotepowertypes_filterbar.html
@@ -4,8 +4,38 @@
   <div class="row">
     <div class="col-12 d-flex align-items-center">
 
-      <div style="display: inline-block">
-          <span class="hint">Found {{ paginator.count }} Remote Power Type(s)</span>
+      <div class="d-flex align-items-center flex-wrap">
+        <span class="hint" style="margin-right: 0.5rem;">Device Category</span>
+        <div class="btn-group" role="group" style="margin-right: 1rem;">
+          <a
+            class="btn btn-secondary btn-sm {% active request 'bmc' %}"
+            href="?{% url_replace request 'device' 'bmc' %}"
+            role="button"
+            >BMC</a
+          >
+          <a
+            class="btn btn-secondary btn-sm {% active request 'rpowerdevice' %}"
+            href="?{% url_replace request 'device' 'rpowerdevice' %}"
+            role="button"
+            >Remote Power Device</a
+          >
+          <a
+            class="btn btn-secondary btn-sm {% active request 'hypervisor' %}"
+            href="?{% url_replace request 'device' 'hypervisor' %}"
+            role="button"
+            >Hypervisor</a
+          >
+          <a
+            class="btn btn-secondary btn-sm"
+            href="?{% url_replace request 'device' '' True %}"
+            role="button"
+            >&#215;</a
+          >
+        </div>
+
+        <div style="display: inline-block">
+            <span class="hint">Found {{ paginator.count }} Remote Power Type(s)</span>
+        </div>
       </div>
 
       <a class="nav-link ms-auto" href="{% url 'frontend:new_remotepowertype' %}">
diff --git a/orthos2/frontend/templates/frontend/serialconsoletypes/serialconsoletype.html b/orthos2/frontend/templates/frontend/serialconsoletypes/serialconsoletype.html
index 50a24496..d356ac17 100644
--- a/orthos2/frontend/templates/frontend/serialconsoletypes/serialconsoletype.html
+++ b/orthos2/frontend/templates/frontend/serialconsoletypes/serialconsoletype.html
@@ -30,10 +30,6 @@
           <a
             href="{% url 'api:serialconsoletype' %}?name={{ serialconsoletype.name }}"
             >{% url 'api:serialconsoletype' %}?name={{ serialconsoletype.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_serialconsoletype' serialconsoletype.id %}"
-            >{% url 'frontend:edit_serialconsoletype' serialconsoletype.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/serverconfigs/serverconfig.html b/orthos2/frontend/templates/frontend/serverconfigs/serverconfig.html
index 8a760795..4a0a40ef 100644
--- a/orthos2/frontend/templates/frontend/serverconfigs/serverconfig.html
+++ b/orthos2/frontend/templates/frontend/serverconfigs/serverconfig.html
@@ -25,12 +25,6 @@
           {% block tabcontent %}
           {% endblock %}
         </div>
-        <span style="font-size: 0.7em; font-family: Monospace;"
-          >Edit:
-          <a href="{% url 'frontend:edit_serverconfig' serverconfig.id %}"
-            >{% url 'frontend:edit_serverconfig' serverconfig.id %}</a
-          ></span
-        >
       </main>
     </div>
   </div>
diff --git a/orthos2/frontend/templates/frontend/singletasks/singletask.html b/orthos2/frontend/templates/frontend/singletasks/singletask.html
index 229553c0..48d2f41a 100644
--- a/orthos2/frontend/templates/frontend/singletasks/singletask.html
+++ b/orthos2/frontend/templates/frontend/singletasks/singletask.html
@@ -29,10 +29,6 @@
           >API:
           <a href="{% url 'api:singletask' %}?id={{ singletask.pk }}"
             >{% url 'api:singletask' %}?id={{ singletask.pk }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_singletask' singletask.id %}"
-            >{% url 'frontend:edit_singletask' singletask.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/snippet.filterbar.html b/orthos2/frontend/templates/frontend/snippet.filterbar.html
index 7fe84656..9920a84c 100644
--- a/orthos2/frontend/templates/frontend/snippet.filterbar.html
+++ b/orthos2/frontend/templates/frontend/snippet.filterbar.html
@@ -44,6 +44,15 @@
 
       <span class="ms-2"/>
 
+      <span class="hint" style="margin-right: 0.5rem;">NetBox Synchronized</span>
+      <div class="btn-group" role="group" style="margin-right: 0.5rem;">
+        <a class="btn btn-secondary btn-sm {% active request '1' %}" href="?{% url_replace request 'has_netbox' '1' %}" role="button">Yes</a>
+        <a class="btn btn-secondary btn-sm {% active request '0' %}" href="?{% url_replace request 'has_netbox' '0' %}" role="button">No</a>
+        <a class="btn btn-secondary btn-sm" href="?{% url_replace request 'has_netbox' '' True %}" role="button">&#215;</a>
+      </div>
+
+      <span class="ms-2"/>
+
       {% include 'frontend/snippet.search.html' %}
 
       <span class="ms-2"/>
diff --git a/orthos2/frontend/templates/frontend/snippet.navlinks.html b/orthos2/frontend/templates/frontend/snippet.navlinks.html
index 6a983bea..93fac797 100644
--- a/orthos2/frontend/templates/frontend/snippet.navlinks.html
+++ b/orthos2/frontend/templates/frontend/snippet.navlinks.html
@@ -22,6 +22,15 @@
       >Virtual Machines</a
     >
   </li>
+  {% if request.user.is_superuser %}
+  <li
+    class="nav-item position-relative {% active_view request 'administrative_machines' %}"
+  >
+    <a class="nav-link" href="{% url 'frontend:administrative_machines' %}"
+      >Administrative Machines</a
+    >
+  </li>
+  {% endif %}
   <li
     class="nav-item position-relative {% active_view request 'advanced_search' %}"
   >
diff --git a/orthos2/frontend/templates/frontend/systems/system.html b/orthos2/frontend/templates/frontend/systems/system.html
index 460d8213..dc3deb9a 100644
--- a/orthos2/frontend/templates/frontend/systems/system.html
+++ b/orthos2/frontend/templates/frontend/systems/system.html
@@ -29,10 +29,6 @@
           >API:
           <a href="{% url 'api:system' %}?name={{ system.name }}"
             >{% url 'api:system' %}?name={{ system.name }}</a
-          >
-          | Edit:
-          <a href="{% url 'frontend:edit_system' system.id %}"
-            >{% url 'frontend:edit_system' system.id %}</a
           ></span
         >
       </main>
diff --git a/orthos2/frontend/templates/frontend/users/user.html b/orthos2/frontend/templates/frontend/users/user.html
index 79bcd134..5f565292 100644
--- a/orthos2/frontend/templates/frontend/users/user.html
+++ b/orthos2/frontend/templates/frontend/users/user.html
@@ -34,13 +34,6 @@
           {% block tabcontent %}
           {% endblock %}
         </div>
-
-        <span style="font-size: 0.7em; font-family: Monospace;"
-          >Edit:
-          <a href="{% url 'frontend:edit_user' user_obj.id %}"
-            >{% url 'frontend:edit_user' user_obj.id %}</a
-          ></span
-        >
       </main>
     </div>
   </div>
diff --git a/orthos2/frontend/tests/admin/test_devicetype_views.py b/orthos2/frontend/tests/admin/test_devicetype_views.py
index 06a76298..e6a20c4a 100644
--- a/orthos2/frontend/tests/admin/test_devicetype_views.py
+++ b/orthos2/frontend/tests/admin/test_devicetype_views.py
@@ -8,6 +8,7 @@
 
 from orthos2.data.models import DeviceType, Manufacturer
 from orthos2.data.models.netboxorthoscomparision import NetboxOrthosComparisionRun
+from orthos2.taskmanager.models import SingleTask
 
 
 class DeviceTypeListViewTest(TestCase):
@@ -319,6 +320,17 @@ def test_superuser_queues_fetch_task(self) -> None:
         response = self.client.get(url)
         assert response.status_code == 302
 
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        manufacturer = Manufacturer.objects.create(name="OtherCorp")
+        unsynced = DeviceType.objects.create(
+            name="UnsyncedDeviceType", manufacturer=manufacturer
+        )
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:devicetype_netbox_fetch", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxFetchFullDeviceType").exists()
+
 
 class DeviceTypeCompareNetboxViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
@@ -353,6 +365,17 @@ def test_superuser_queues_compare_task(self) -> None:
         response = self.client.get(url)
         assert response.status_code == 302
 
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        manufacturer = Manufacturer.objects.create(name="OtherCorp")
+        unsynced = DeviceType.objects.create(
+            name="UnsyncedDeviceType", manufacturer=manufacturer
+        )
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:devicetype_netbox_compare", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxCompareDeviceType").exists()
+
 
 class DeviceTypeNetboxComparisonViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
diff --git a/orthos2/frontend/tests/admin/test_domain_views.py b/orthos2/frontend/tests/admin/test_domain_views.py
index 94998e1c..b7adccb8 100644
--- a/orthos2/frontend/tests/admin/test_domain_views.py
+++ b/orthos2/frontend/tests/admin/test_domain_views.py
@@ -120,6 +120,38 @@ def test_superuser_get_shows_cobbler_and_cscreen_server_links(self) -> None:
             in response.content
         )
 
+    def test_superuser_get_shows_tftp_server_link(self) -> None:
+        tftp_server = Machine.objects.create(
+            fqdn="tftp.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        self.domain.tftp_server = tftp_server
+        self.domain.save()
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:domain_detail", kwargs={"id": self.domain.pk})
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert (
+            reverse("frontend:detail", kwargs={"id": tftp_server.pk}).encode()
+            in response.content
+        )
+
+    def test_superuser_get_shows_footer_api_and_edit_links(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:domain_detail", kwargs={"id": self.domain.pk})
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert (
+            f"{reverse('api:domain')}?name={self.domain.name}".encode()
+            in response.content
+        )
+        assert (
+            reverse("frontend:edit_domain", kwargs={"pk": self.domain.pk}).encode()
+            in response.content
+        )
+
 
 class NewDomainViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
diff --git a/orthos2/frontend/tests/admin/test_enclosure_views.py b/orthos2/frontend/tests/admin/test_enclosure_views.py
index c3066ca0..348676b6 100644
--- a/orthos2/frontend/tests/admin/test_enclosure_views.py
+++ b/orthos2/frontend/tests/admin/test_enclosure_views.py
@@ -5,6 +5,7 @@
 from django.urls import reverse
 
 from orthos2.data.models import Enclosure
+from orthos2.taskmanager.models import SingleTask
 
 
 class EnclosureListViewTest(TestCase):
@@ -32,6 +33,22 @@ def test_superuser_get_lists_enclosures(self) -> None:
         assert response.status_code == 200
         assert b"AcmeEnclosure" in response.content
 
+    def test_filter_has_netbox_yes(self) -> None:
+        Enclosure.objects.create(name="SyncedEnclosure", netbox_id=42)
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:enclosures")
+        response = self.client.get(url, {"has_netbox": "1"})
+        assert b"SyncedEnclosure" in response.content
+        assert b"AcmeEnclosure" not in response.content
+
+    def test_filter_has_netbox_no(self) -> None:
+        Enclosure.objects.create(name="SyncedEnclosure", netbox_id=42)
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:enclosures")
+        response = self.client.get(url, {"has_netbox": "0"})
+        assert b"AcmeEnclosure" in response.content
+        assert b"SyncedEnclosure" not in response.content
+
 
 class EnclosureDetailViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
@@ -239,3 +256,51 @@ def test_regular_user_post_does_not_delete_enclosure(self) -> None:
         response = self.client.post(url)
         assert response.status_code == 403
         assert Enclosure.objects.filter(pk=self.enclosure.pk).exists()
+
+
+class EnclosureFetchNetboxViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        self.enclosure = Enclosure.objects.create(name="AcmeEnclosure", netbox_id=42)
+
+    def test_superuser_queues_fetch_task(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:enclosure_netbox_fetch", kwargs={"id": self.enclosure.pk}
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxFetchFullEnclosure").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Enclosure.objects.create(name="UnsyncedEnclosure")
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:enclosure_netbox_fetch", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxFetchFullEnclosure").exists()
+
+
+class EnclosureCompareNetboxViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        self.enclosure = Enclosure.objects.create(name="AcmeEnclosure", netbox_id=42)
+
+    def test_superuser_queues_compare_task(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:enclosure_netbox_compare", kwargs={"id": self.enclosure.pk}
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxCompareEnclosure").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Enclosure.objects.create(name="UnsyncedEnclosure")
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:enclosure_netbox_compare", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxCompareEnclosure").exists()
diff --git a/orthos2/frontend/tests/admin/test_machine_fetch_netbox.py b/orthos2/frontend/tests/admin/test_machine_fetch_netbox.py
new file mode 100644
index 00000000..3ce93ab8
--- /dev/null
+++ b/orthos2/frontend/tests/admin/test_machine_fetch_netbox.py
@@ -0,0 +1,94 @@
+"""Tests for the Machine "Fetch Netbox" action guard."""
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+
+from orthos2.data.models import Architecture, Domain, Machine, ServerConfig, System
+from orthos2.taskmanager.models import SingleTask
+
+
+class MachineFetchNetboxViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        self.system = System.objects.get(name="BareMetal")
+        self.architecture = Architecture.objects.get(name="x86_64")
+        self.machine = Machine.objects.create(
+            fqdn="synced.orthos2.test",
+            system=self.system,
+            architecture=self.architecture,
+            netbox_id=42,
+        )
+
+    def test_superuser_queues_fetch_task(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:netbox_fetch", kwargs={"id": self.machine.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxFetchFullMachine").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Machine.objects.create(
+            fqdn="unsynced.orthos2.test",
+            system=self.system,
+            architecture=self.architecture,
+        )
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:netbox_fetch", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxFetchFullMachine").exists()
+
+
+class MachineCompareNetboxViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        self.system = System.objects.get(name="BareMetal")
+        self.architecture = Architecture.objects.get(name="x86_64")
+        self.machine = Machine.objects.create(
+            fqdn="synced.orthos2.test",
+            system=self.system,
+            architecture=self.architecture,
+            netbox_id=42,
+        )
+
+    def test_superuser_queues_compare_task(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:netbox_compare", kwargs={"id": self.machine.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxCompareFullMachine").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Machine.objects.create(
+            fqdn="unsynced.orthos2.test",
+            system=self.system,
+            architecture=self.architecture,
+        )
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:netbox_compare", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxCompareFullMachine").exists()
diff --git a/orthos2/frontend/tests/admin/test_machine_views.py b/orthos2/frontend/tests/admin/test_machine_views.py
index 3b4aefce..2c8642de 100644
--- a/orthos2/frontend/tests/admin/test_machine_views.py
+++ b/orthos2/frontend/tests/admin/test_machine_views.py
@@ -133,6 +133,34 @@ def test_virtualization_server_hidden_for_non_hypervisor_capable_systems(
         self.assertContains(page, "VIRTUALIZATION CLIENT")  # type: ignore
         self.assertNotContains(page, "VIRTUALIZATION SERVER")  # type: ignore
 
+    def test_editing_machine_on_non_hypervisor_capable_system_persists(self) -> None:
+        """Regression test: submitting the edit form for a machine whose
+        system cannot host VMs must still persist unrelated field changes,
+        even though the form hides the hypervisor-only fields (vm_max, ...)
+        for such systems."""
+        non_hypervisor_system = System.objects.create(name="Non-Hypervisor Test")
+        m3 = Machine()
+        m3.pk = 3
+        m3.system = non_hypervisor_system
+        m3.fqdn = "machine3.foo.bar.de"
+        m3.architecture_id = (
+            Architecture.get_architecture_manager().get_by_natural_key("x86_64").id
+        )
+        m3.save()
+
+        page = self.app.get(  # type: ignore
+            reverse("frontend:edit_machine", args=["3"]), user="superuser"
+        )
+
+        form = page.forms[1]  # type: ignore
+        form["administrative"] = True  # type: ignore
+        response = form.submit()  # type: ignore
+
+        assert response.status_code == 302  # type: ignore
+
+        m3.refresh_from_db()
+        assert m3.administrative is True
+
     def test_deactivate_sol_button_visible_for_ipmi_console(self) -> None:
         """The machine detail page should expose the SOL deactivate action for IPMI consoles."""
 
diff --git a/orthos2/frontend/tests/admin/test_machines_list_administrative_tab.py b/orthos2/frontend/tests/admin/test_machines_list_administrative_tab.py
new file mode 100644
index 00000000..66ef62d3
--- /dev/null
+++ b/orthos2/frontend/tests/admin/test_machines_list_administrative_tab.py
@@ -0,0 +1,58 @@
+"""Tests for the "Administrative Machines" tab on the Machine list."""
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+
+from orthos2.data.models import Architecture, Domain, Machine, ServerConfig, System
+
+
+class AdministrativeMachineListViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        system = System.objects.get(name="BareMetal")
+        architecture = Architecture.objects.get(name="x86_64")
+        self.administrative_machine = Machine.objects.create(
+            fqdn="administrative-machine.orthos2.test",
+            system=system,
+            architecture=architecture,
+            administrative=True,
+        )
+        self.plain_machine = Machine.objects.create(
+            fqdn="plain-machine.orthos2.test",
+            system=system,
+            architecture=architecture,
+        )
+
+    def test_superuser_sees_only_administrative_machines(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        response = self.client.get(reverse("frontend:administrative_machines"))
+        assert b"administrative-machine.orthos2.test" in response.content
+        assert b"plain-machine.orthos2.test" not in response.content
+
+    def test_regular_user_sees_no_administrative_machines(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        response = self.client.get(reverse("frontend:administrative_machines"))
+        assert b"administrative-machine.orthos2.test" not in response.content
+        assert b"plain-machine.orthos2.test" not in response.content
+
+    def test_superuser_sees_administrative_machines_nav_link(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        response = self.client.get(reverse("frontend:machines"))
+        assert b"Administrative Machines" in response.content
+
+    def test_regular_user_does_not_see_administrative_machines_nav_link(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        response = self.client.get(reverse("frontend:machines"))
+        assert b"Administrative Machines" not in response.content
diff --git a/orthos2/frontend/tests/admin/test_machines_list_netbox_filter.py b/orthos2/frontend/tests/admin/test_machines_list_netbox_filter.py
new file mode 100644
index 00000000..808139f3
--- /dev/null
+++ b/orthos2/frontend/tests/admin/test_machines_list_netbox_filter.py
@@ -0,0 +1,52 @@
+"""Tests for the "NetBox Synchronized" filter on the Machine list."""
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+
+from orthos2.data.models import Architecture, Domain, Machine, ServerConfig, System
+
+
+class MachineListHasNetboxFilterTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        system = System.objects.get(name="BareMetal")
+        architecture = Architecture.objects.get(name="x86_64")
+        self.synced_machine = Machine.objects.create(
+            fqdn="synced-machine.orthos2.test",
+            system=system,
+            architecture=architecture,
+            netbox_id=42,
+        )
+        self.unsynced_machine = Machine.objects.create(
+            fqdn="plain-machine.orthos2.test", system=system, architecture=architecture
+        )
+
+    def test_no_filter_shows_both(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        response = self.client.get(reverse("frontend:machines"))
+        assert b"synced-machine.orthos2.test" in response.content
+        assert b"plain-machine.orthos2.test" in response.content
+
+    def test_filter_has_netbox_yes(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        response = self.client.get(reverse("frontend:machines"), {"has_netbox": "1"})
+        assert b"synced-machine.orthos2.test" in response.content
+        assert b"plain-machine.orthos2.test" not in response.content
+
+    def test_filter_has_netbox_no(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        response = self.client.get(reverse("frontend:machines"), {"has_netbox": "0"})
+        assert b"plain-machine.orthos2.test" in response.content
+        assert b"synced-machine.orthos2.test" not in response.content
diff --git a/orthos2/frontend/tests/admin/test_manufacturer_views.py b/orthos2/frontend/tests/admin/test_manufacturer_views.py
index 2f060157..b0a6bab2 100644
--- a/orthos2/frontend/tests/admin/test_manufacturer_views.py
+++ b/orthos2/frontend/tests/admin/test_manufacturer_views.py
@@ -8,6 +8,7 @@
 
 from orthos2.data.models import Manufacturer
 from orthos2.data.models.netboxorthoscomparision import NetboxOrthosComparisionRun
+from orthos2.taskmanager.models import SingleTask
 
 
 class ManufacturerListViewTest(TestCase):
@@ -255,6 +256,16 @@ def test_superuser_queues_fetch_task(self) -> None:
         response = self.client.get(url)
         assert response.status_code == 302
 
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Manufacturer.objects.create(name="UnsyncedCorp")
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:manufacturer_netbox_fetch", kwargs={"id": unsynced.pk})
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(
+            name="NetboxFetchFullManufacturer"
+        ).exists()
+
 
 class ManufacturerCompareNetboxViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
@@ -286,6 +297,16 @@ def test_superuser_queues_compare_task(self) -> None:
         response = self.client.get(url)
         assert response.status_code == 302
 
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        unsynced = Manufacturer.objects.create(name="UnsyncedCorp")
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:manufacturer_netbox_compare", kwargs={"id": unsynced.pk}
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(name="NetboxCompareManufacturer").exists()
+
 
 class ManufacturerNetboxComparisonViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
diff --git a/orthos2/frontend/tests/admin/test_remotepowerdevice_views.py b/orthos2/frontend/tests/admin/test_remotepowerdevice_views.py
index 3ed457c2..69e02c80 100644
--- a/orthos2/frontend/tests/admin/test_remotepowerdevice_views.py
+++ b/orthos2/frontend/tests/admin/test_remotepowerdevice_views.py
@@ -7,10 +7,14 @@
 from orthos2.data.models import (
     Architecture,
     Domain,
+    Machine,
+    RemotePower,
     RemotePowerDevice,
     RemotePowerType,
     ServerConfig,
+    System,
 )
+from orthos2.taskmanager.models import SingleTask
 
 
 class RemotePowerDeviceViewTestCase(TestCase):
@@ -60,6 +64,33 @@ def test_superuser_get_lists_remotepowerdevices(self) -> None:
         assert response.status_code == 200
         assert b"rpower.orthos2.test" in response.content
 
+    def test_superuser_get_shows_machine_count(self) -> None:
+        other_device = RemotePowerDevice.objects.create(
+            fqdn="other-rpower.orthos2.test",
+            mac="AA:BB:CC:DD:EE:00",
+            fence_agent=self.fence_agent,
+            architecture=self.architecture,
+            domain=self.domain,
+        )
+        machine = Machine.objects.create(
+            fqdn="powered-machine.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=self.architecture,
+        )
+        RemotePower.objects.create(
+            machine=machine, remote_power_device=self.remotepowerdevice
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowerdevices")
+        response = self.client.get(url)
+        listed = {
+            remotepowerdevice.pk: remotepowerdevice
+            for remotepowerdevice in response.context["object_list"]
+        }
+        assert listed[self.remotepowerdevice.pk].machine_count == 1
+        assert listed[other_device.pk].machine_count == 0
+
 
 class RemotePowerDeviceDetailViewTest(RemotePowerDeviceViewTestCase):
     def test_unauthenticated_get_redirects_to_login(self) -> None:
@@ -101,6 +132,54 @@ def test_nonexistent_remotepowerdevice_returns_404(self) -> None:
         assert response.status_code == 404
 
 
+class RemotePowerDeviceMachinesViewTest(RemotePowerDeviceViewTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.machine = Machine.objects.create(
+            fqdn="powered-machine.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=self.architecture,
+        )
+        RemotePower.objects.create(
+            machine=self.machine, remote_power_device=self.remotepowerdevice
+        )
+
+    def test_unauthenticated_get_redirects_to_login(self) -> None:
+        url = reverse(
+            "frontend:remotepowerdevice_machines",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert "login" in response.url.lower()  # type: ignore[attr-defined]
+
+    def test_regular_user_get_redirects_to_login(self) -> None:
+        self.client.force_login(User.objects.get(username="user"))
+        url = reverse(
+            "frontend:remotepowerdevice_machines",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert "login" in response.url.lower()  # type: ignore[attr-defined]
+
+    def test_superuser_get_lists_machines_using_this_device(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowerdevice_machines",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert b"powered-machine.orthos2.test" in response.content
+
+    def test_nonexistent_remotepowerdevice_returns_404(self) -> None:
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowerdevice_machines", kwargs={"id": 99999})
+        response = self.client.get(url)
+        assert response.status_code == 404
+
+
 class NewRemotePowerDeviceViewTest(RemotePowerDeviceViewTestCase):
     def test_unauthenticated_get_redirects_to_login(self) -> None:
         url = reverse("frontend:new_remotepowerdevice")
@@ -259,3 +338,57 @@ def test_superuser_get_shows_comparison_page(self) -> None:
         )
         response = self.client.get(url)
         assert response.status_code == 200
+
+
+class RemotePowerDeviceFetchNetboxViewTest(RemotePowerDeviceViewTestCase):
+    def test_superuser_queues_fetch_task(self) -> None:
+        self.remotepowerdevice.netbox_id = 42
+        self.remotepowerdevice.save()
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowerdevice_netbox_fetch",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxFetchRemotePowerDevice").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        assert self.remotepowerdevice.netbox_id == 0
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowerdevice_netbox_fetch",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(
+            name="NetboxFetchRemotePowerDevice"
+        ).exists()
+
+
+class RemotePowerDeviceCompareNetboxViewTest(RemotePowerDeviceViewTestCase):
+    def test_superuser_queues_compare_task(self) -> None:
+        self.remotepowerdevice.netbox_id = 42
+        self.remotepowerdevice.save()
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowerdevice_netbox_compare",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert SingleTask.objects.filter(name="NetboxCompareRemotePowerDevice").exists()
+
+    def test_superuser_get_when_not_synced_does_not_queue_task(self) -> None:
+        assert self.remotepowerdevice.netbox_id == 0
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowerdevice_netbox_compare",
+            kwargs={"id": self.remotepowerdevice.pk},
+        )
+        response = self.client.get(url)
+        assert response.status_code == 302
+        assert not SingleTask.objects.filter(
+            name="NetboxCompareRemotePowerDevice"
+        ).exists()
diff --git a/orthos2/frontend/tests/admin/test_remotepowertype_views.py b/orthos2/frontend/tests/admin/test_remotepowertype_views.py
index 24a83a85..b49691f5 100644
--- a/orthos2/frontend/tests/admin/test_remotepowertype_views.py
+++ b/orthos2/frontend/tests/admin/test_remotepowertype_views.py
@@ -5,11 +5,15 @@
 from django.urls import reverse
 
 from orthos2.data.models import (
+    BMC,
     Architecture,
     Domain,
+    Machine,
+    RemotePower,
     RemotePowerDevice,
     RemotePowerType,
     ServerConfig,
+    System,
 )
 
 
@@ -72,6 +76,249 @@ def test_superuser_get_shows_device_count(self) -> None:
         }
         assert listed[self.remotepowertype.pk].device_count == 1
 
+    def test_rpowerdevice_backed_machine_is_not_double_counted(self) -> None:
+        """
+        RemotePower.save() mirrors remote_power_device.fence_agent onto its own
+        fence_agent field for "rpowerdevice"-category types, so a machine whose
+        RemotePower references a RemotePowerDevice must not be counted twice
+        (once via RemotePowerDevice.fence_agent, once via RemotePower.fence_agent).
+        """
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        domain = Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        architecture = Architecture.objects.get(name="x86_64")
+        remotepowerdevice = RemotePowerDevice.objects.create(
+            fqdn="rpower.orthos2.test",
+            mac="AA:BB:CC:DD:EE:FF",
+            fence_agent=self.remotepowertype,
+            architecture=architecture,
+            domain=domain,
+        )
+        machine = Machine.objects.create(
+            fqdn="rpowered-machine.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=architecture,
+        )
+        RemotePower.objects.create(
+            machine=machine, remote_power_device=remotepowerdevice
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[self.remotepowertype.pk].device_count == 1
+
+    def test_bmc_backed_machine_with_remotepower_row_is_not_double_counted(
+        self,
+    ) -> None:
+        """
+        RemotePower.save() mirrors machine.bmc.fence_agent onto its own
+        fence_agent field for "bmc"-category types, so a machine with both a
+        BMC and a RemotePower row must not be counted twice.
+        """
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+        machine = Machine.objects.create(
+            fqdn="bmc-host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        BMC.objects.create(
+            machine=machine,
+            fqdn="bmc.orthos2.test",
+            mac="AA:BB:CC:DD:EE:01",
+            fence_agent=bmc_type,
+        )
+        RemotePower.objects.create(machine=machine)
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[bmc_type.pk].device_count == 1
+
+    def test_bmc_backed_device_is_counted(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        _ = Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+        machine = Machine.objects.create(
+            fqdn="bmc-host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        BMC.objects.create(
+            machine=machine,
+            fqdn="bmc.orthos2.test",
+            mac="AA:BB:CC:DD:EE:01",
+            fence_agent=bmc_type,
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[bmc_type.pk].device_count == 1
+
+    def test_hypervisor_backed_device_is_counted(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        hypervisor_type = RemotePowerType.objects.create(
+            name="AcmeHypervisorType", device="hypervisor"
+        )
+        host = Machine.objects.create(
+            fqdn="host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        vm = Machine.objects.create(
+            fqdn="vm.orthos2.test",
+            system=System.objects.get(name="VM KVM"),
+            architecture=Architecture.objects.get(name="x86_64"),
+            hypervisor=host,
+        )
+        RemotePower.objects.create(machine=vm, fence_agent=hypervisor_type)
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[hypervisor_type.pk].device_count == 1
+
+    def test_filter_by_device_category(self) -> None:
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url, {"device": "bmc"})
+        listed_names = {rpt.name for rpt in response.context["object_list"]}
+        assert bmc_type.name in listed_names
+        assert self.remotepowertype.name not in listed_names
+
+    def test_device_count_correct_when_architectures_and_systems_restricted(
+        self,
+    ) -> None:
+        """
+        `architectures`/`systems` are unrelated M2M relations ("Supported
+        Architectures"/"Supported Systems") - restricting a RemotePowerType to
+        specific ones must not, via extra JOINs in the same annotate() query,
+        inflate the unrelated device_count annotation.
+        """
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        domain = Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        architecture = Architecture.objects.get(name="x86_64")
+        self.remotepowertype.architectures.add(
+            architecture, Architecture.objects.get(name="aarch64")
+        )
+        self.remotepowertype.systems.add(
+            System.objects.get(name="BareMetal"), System.objects.get(name="VM KVM")
+        )
+        RemotePowerDevice.objects.create(
+            fqdn="restricted-rpower.orthos2.test",
+            mac="AA:BB:CC:DD:EE:10",
+            fence_agent=self.remotepowertype,
+            architecture=architecture,
+            domain=domain,
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[self.remotepowertype.pk].device_count == 1
+
+    def test_bmc_device_count_correct_when_architectures_and_systems_restricted(
+        self,
+    ) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+        bmc_type.architectures.add(Architecture.objects.get(name="x86_64"))
+        bmc_type.systems.add(System.objects.get(name="BareMetal"))
+        machine = Machine.objects.create(
+            fqdn="restricted-bmc-host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        BMC.objects.create(
+            machine=machine,
+            fqdn="restricted-bmc.orthos2.test",
+            mac="AA:BB:CC:DD:EE:11",
+            fence_agent=bmc_type,
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertypes")
+        response = self.client.get(url)
+        listed = {
+            remotepowertype.pk: remotepowertype
+            for remotepowertype in response.context["object_list"]
+        }
+        assert listed[bmc_type.pk].device_count == 1
+
 
 class RemotePowerTypeDetailViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
@@ -188,6 +435,91 @@ def test_nonexistent_remotepowertype_returns_404(self) -> None:
         assert response.status_code == 404
 
 
+class RemotePowerTypeDevicesBmcHypervisorViewTest(TestCase):
+    fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
+
+    def setUp(self) -> None:
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+
+    def test_bmc_category_lists_machine_via_bmc(self) -> None:
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+        machine = Machine.objects.create(
+            fqdn="bmc-host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        BMC.objects.create(
+            machine=machine,
+            fqdn="bmc.orthos2.test",
+            mac="AA:BB:CC:DD:EE:02",
+            fence_agent=bmc_type,
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertype_devices", kwargs={"id": bmc_type.pk})
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert b"bmc-host.orthos2.test" in response.content
+
+    def test_hypervisor_category_lists_machine_via_remotepower(self) -> None:
+        hypervisor_type = RemotePowerType.objects.create(
+            name="AcmeHypervisorType", device="hypervisor"
+        )
+        host = Machine.objects.create(
+            fqdn="host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        vm = Machine.objects.create(
+            fqdn="vm.orthos2.test",
+            system=System.objects.get(name="VM KVM"),
+            architecture=Architecture.objects.get(name="x86_64"),
+            hypervisor=host,
+        )
+        RemotePower.objects.create(machine=vm, fence_agent=hypervisor_type)
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse(
+            "frontend:remotepowertype_devices", kwargs={"id": hypervisor_type.pk}
+        )
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert b"vm.orthos2.test" in response.content
+
+    def test_bmc_category_devices_list_correct_when_architectures_and_systems_restricted(
+        self,
+    ) -> None:
+        bmc_type = RemotePowerType.objects.create(name="AcmeBMCType", device="bmc")
+        bmc_type.architectures.add(Architecture.objects.get(name="x86_64"))
+        bmc_type.systems.add(System.objects.get(name="BareMetal"))
+        machine = Machine.objects.create(
+            fqdn="restricted-bmc-host.orthos2.test",
+            system=System.objects.get(name="BareMetal"),
+            architecture=Architecture.objects.get(name="x86_64"),
+        )
+        BMC.objects.create(
+            machine=machine,
+            fqdn="restricted-bmc.orthos2.test",
+            mac="AA:BB:CC:DD:EE:12",
+            fence_agent=bmc_type,
+        )
+
+        self.client.force_login(User.objects.get(username="superuser"))
+        url = reverse("frontend:remotepowertype_devices", kwargs={"id": bmc_type.pk})
+        response = self.client.get(url)
+        assert response.status_code == 200
+        assert b"restricted-bmc-host.orthos2.test" in response.content
+
+
 class NewRemotePowerTypeViewTest(TestCase):
     fixtures = ["orthos2/frontend/tests/user/fixtures/users.json"]
 
diff --git a/orthos2/frontend/tests/user/test_statistics.py b/orthos2/frontend/tests/user/test_statistics.py
index ff721135..4464c980 100644
--- a/orthos2/frontend/tests/user/test_statistics.py
+++ b/orthos2/frontend/tests/user/test_statistics.py
@@ -1,6 +1,10 @@
 from django.urls import reverse  # type: ignore
 from django_webtest import WebTest  # type: ignore
 
+from orthos2.data.models import Domain
+from orthos2.data.models.serverconfig import ServerConfig
+from orthos2.frontend.views.statistics import _domain_color
+
 
 class Statistics(WebTest):
 
@@ -17,3 +21,39 @@ def test_statistics_view(self) -> None:
         page = page.click("Statistics").maybe_follow()  # type: ignore
 
         self.assertContains(page, "Numbers")  # type: ignore
+
+    def test_domains_have_deterministic_colors_across_requests(self) -> None:
+        """The color assigned to a domain must not change between requests."""
+        ServerConfig.objects.create(key="domain.validendings", value="orthos2.test")
+        Domain.objects.create(
+            name="statistics-color-test.orthos2.test",
+            ip_v4="127.0.0.1",
+            ip_v6="::1",
+            dynamic_range_v4_start="127.0.0.1",
+            dynamic_range_v4_end="127.0.0.1",
+            dynamic_range_v6_start="::1",
+            dynamic_range_v6_end="::1",
+        )
+
+        first = self.app.get(reverse("frontend:statistics"), user="user").context["data"]  # type: ignore
+        second = self.app.get(reverse("frontend:statistics"), user="user").context["data"]  # type: ignore
+
+        self.assertEqual(first["domains"]["colors"], second["domains"]["colors"])
+
+
+class DomainColorTests(WebTest):
+
+    fixtures = []  # type: ignore
+
+    def test_same_domain_name_always_gets_same_color(self) -> None:
+        self.assertEqual(
+            _domain_color("example.orthos2.test"), _domain_color("example.orthos2.test")
+        )
+
+    def test_different_domain_names_get_different_colors(self) -> None:
+        self.assertNotEqual(
+            _domain_color("a.orthos2.test"), _domain_color("b.orthos2.test")
+        )
+
+    def test_color_is_a_hex_triplet(self) -> None:
+        self.assertRegex(_domain_color("example.orthos2.test"), r"^#[0-9A-Fa-f]{6}$")
diff --git a/orthos2/frontend/urls.py b/orthos2/frontend/urls.py
index 89db78d0..4d0ff2dc 100644
--- a/orthos2/frontend/urls.py
+++ b/orthos2/frontend/urls.py
@@ -53,6 +53,11 @@
         views.remotepowerdevice_detail,
         name="remotepowerdevice_detail",
     ),
+    re_path(
+        r"^remote-power-devices/(?P<id>[0-9]+)/machines$",
+        views.remotepowerdevice_machines,
+        name="remotepowerdevice_machines",
+    ),
     re_path(
         r"^remote-power-devices/(?P<id>[0-9]+)/netboxcomparison$",
         views.remotepowerdevice_netboxcomparison,
@@ -101,6 +106,11 @@
         views.VirtualMachineListView.as_view(),
         name="virtual_machines",
     ),
+    re_path(
+        r"^machines/administrative$",
+        views.AdministrativeMachineListView.as_view(),
+        name="administrative_machines",
+    ),
     re_path(r"^machines/search", views.machine_search, name="advanced_search"),
     path("machine/add", views.machine_add, name="machine_add"),
     re_path(r"^machine/(?P<id>[0-9]+)/$", views.machine, name="detail"),
diff --git a/orthos2/frontend/views/__init__.py b/orthos2/frontend/views/__init__.py
index 0da81cbf..a65ce343 100644
--- a/orthos2/frontend/views/__init__.py
+++ b/orthos2/frontend/views/__init__.py
@@ -107,6 +107,7 @@
     virtualization_add,
 )
 from .machines import (
+    AdministrativeMachineListView,
     AllMachineListView,
     FreeMachineListView,
     MachineListView,
@@ -142,6 +143,7 @@
     remotepowerdevice_compare_netbox,
     remotepowerdevice_detail,
     remotepowerdevice_fetch_netbox,
+    remotepowerdevice_machines,
     remotepowerdevice_netboxcomparison,
 )
 from .remotepowertype import (
@@ -253,6 +255,7 @@
     "MyMachineListView",
     "FreeMachineListView",
     "VirtualMachineListView",
+    "AdministrativeMachineListView",
     "machine_search",
     "enclosure_machines",
     "enclosure_detail",
@@ -296,6 +299,7 @@
     "DeleteRemotePowerDevice",
     "remotepowerdevice_detail",
     "remotepowerdevice_fetch_netbox",
+    "remotepowerdevice_machines",
     "remotepowerdevice_netboxcomparison",
     "remotepowerdevice_compare_netbox",
     "ManufacturerListView",
diff --git a/orthos2/frontend/views/devicetype.py b/orthos2/frontend/views/devicetype.py
index b5573d2a..eb12fc3a 100644
--- a/orthos2/frontend/views/devicetype.py
+++ b/orthos2/frontend/views/devicetype.py
@@ -134,6 +134,10 @@ def devicetype_fetch_netbox(request: HttpRequest, id: int) -> HttpResponseRedire
         messages.error(request, "Device Type does not exist!")
         return redirect("frontend:devicetypes")
 
+    if requested_devicetype.netbox_id == 0:
+        messages.error(request, "Device Type is not linked to NetBox!")
+        return redirect("frontend:devicetype_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxFetchFullDeviceType(requested_devicetype.pk))
         messages.info(
@@ -182,6 +186,10 @@ def devicetype_compare_netbox(request: HttpRequest, id: int) -> HttpResponseRedi
         messages.error(request, "Device Type does not exist!")
         return redirect("frontend:devicetypes")
 
+    if requested_devicetype.netbox_id == 0:
+        messages.error(request, "Device Type is not linked to NetBox!")
+        return redirect("frontend:devicetype_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxCompareDeviceType(requested_devicetype.pk))
         messages.info(
diff --git a/orthos2/frontend/views/enclosures.py b/orthos2/frontend/views/enclosures.py
index 215fce4d..141c82ee 100644
--- a/orthos2/frontend/views/enclosures.py
+++ b/orthos2/frontend/views/enclosures.py
@@ -52,6 +52,12 @@ def get_queryset(self) -> QuerySet["Enclosure"]:
         if self.request.GET.get("device_type"):
             filters.append(Q(device_type__name=self.request.GET.get("device_type")))
 
+        has_netbox = self.request.GET.get("has_netbox")
+        if has_netbox == "1":
+            filters.append(Q(netbox_id__gt=0))
+        elif has_netbox == "0":
+            filters.append(Q(netbox_id=0))
+
         enclosures = super().get_queryset().filter(*filters)  # type: ignore
 
         return enclosures
@@ -179,6 +185,10 @@ def enclosure_fetch_netbox(request: HttpRequest, id: int) -> HttpResponseRedirec
         messages.error(request, "Enclosure does not exist!")
         return redirect("frontend:enclosures")
 
+    if requested_enclosure.netbox_id == 0:
+        messages.error(request, "Enclosure is not linked to NetBox!")
+        return redirect("frontend:enclosure_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxFetchFullEnclosure(requested_enclosure.pk))
         messages.info(
@@ -234,6 +244,10 @@ def enclosure_compare_netbox(request: HttpRequest, id: int) -> HttpResponseRedir
         messages.error(request, "Enclosure does not exist!")
         return redirect("frontend:enclosures")
 
+    if requested_enclosure.netbox_id == 0:
+        messages.error(request, "Enclosure is not linked to NetBox!")
+        return redirect("frontend:enclosure_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxCompareEnclosure(requested_enclosure.pk))
         messages.info(
diff --git a/orthos2/frontend/views/machine.py b/orthos2/frontend/views/machine.py
index dcfd4046..5aa53ac1 100644
--- a/orthos2/frontend/views/machine.py
+++ b/orthos2/frontend/views/machine.py
@@ -564,6 +564,10 @@ def fetch_netbox(request: HttpRequest, id: int) -> HttpResponseRedirect:
         messages.error(request, "Machine does not exist!")
         return redirect("frontend:machines")
 
+    if requested_machine.netbox_id == 0:
+        messages.error(request, "Machine is not linked to NetBox!")
+        return redirect("frontend:detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxFetchFullMachine(requested_machine.pk))
         messages.info(
@@ -585,6 +589,10 @@ def compare_netbox(request: HttpRequest, id: int) -> HttpResponseRedirect:
         messages.error(request, "Machine does not exist!")
         return redirect("frontend:machines")
 
+    if requested_machine.netbox_id == 0:
+        messages.error(request, "Machine is not linked to NetBox!")
+        return redirect("frontend:detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxCompareFullMachine(requested_machine.pk))
         messages.info(
diff --git a/orthos2/frontend/views/machines.py b/orthos2/frontend/views/machines.py
index 1244d3d0..214a5bec 100644
--- a/orthos2/frontend/views/machines.py
+++ b/orthos2/frontend/views/machines.py
@@ -47,6 +47,12 @@ def get_queryset(self) -> QuerySet[Machine]:
         if self.request.GET.get("domain"):
             filters.append(Q(fqdn_domain__name=self.request.GET.get("domain")))
 
+        has_netbox = self.request.GET.get("has_netbox")
+        if has_netbox == "1":
+            filters.append(Q(netbox_id__gt=0))
+        elif has_netbox == "0":
+            filters.append(Q(netbox_id=0))
+
         status = self.request.GET.get("status")
         if status and status == "ping":
             filters.append(
@@ -159,6 +165,26 @@ def render_to_response(
         )
 
 
+class AdministrativeMachineListView(MachineListView):
+    """`Administrative Machines` list view."""
+
+    def get_queryset(self) -> QuerySet["Machine"]:
+        """Filter machines which are administrative themselves or belong to an administrative system."""
+        machines = super(AdministrativeMachineListView, self).get_queryset()
+        return machines.filter(Q(administrative=True) | Q(system__administrative=True))
+
+    def render_to_response(
+        self,
+        context: Dict[str, Any],
+        **response_kwargs: Dict[str, Any],
+    ) -> HttpResponse:
+        context["title"] = "Administrative Machines"
+        context["view"] = "administrative"
+        return super(AdministrativeMachineListView, self).render_to_response(
+            context, **response_kwargs
+        )
+
+
 class VirtualMachineListView(MachineListView):
     """`Virtual Machines` list view."""
 
diff --git a/orthos2/frontend/views/manufacturer.py b/orthos2/frontend/views/manufacturer.py
index 4c250aaf..436da64e 100644
--- a/orthos2/frontend/views/manufacturer.py
+++ b/orthos2/frontend/views/manufacturer.py
@@ -156,6 +156,10 @@ def manufacturer_fetch_netbox(request: HttpRequest, id: int) -> HttpResponseRedi
         messages.error(request, "Manufacturer does not exist!")
         return redirect("frontend:manufacturers")
 
+    if requested_manufacturer.netbox_id == 0:
+        messages.error(request, "Manufacturer is not linked to NetBox!")
+        return redirect("frontend:manufacturer_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxFetchFullManufacturer(requested_manufacturer.pk))
         messages.info(
@@ -204,6 +208,10 @@ def manufacturer_compare_netbox(request: HttpRequest, id: int) -> HttpResponseRe
         messages.error(request, "Manufacturer does not exist!")
         return redirect("frontend:manufacturers")
 
+    if requested_manufacturer.netbox_id == 0:
+        messages.error(request, "Manufacturer is not linked to NetBox!")
+        return redirect("frontend:manufacturer_detail", id=id)
+
     try:
         TaskManager.add(tasks.NetboxCompareManufacturer(requested_manufacturer.pk))
         messages.info(
diff --git a/orthos2/frontend/views/remotepowerdevice.py b/orthos2/frontend/views/remotepowerdevice.py
index 906e72c9..97e9d177 100644
--- a/orthos2/frontend/views/remotepowerdevice.py
+++ b/orthos2/frontend/views/remotepowerdevice.py
@@ -8,6 +8,8 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.db.models import Count, OuterRef, QuerySet, Subquery
+from django.db.models.functions import Coalesce
 from django.http import (
     Http404,
     HttpRequest,
@@ -20,7 +22,13 @@
 from django.utils.decorators import method_decorator
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView
 
-from orthos2.data.models import Architecture, Domain, RemotePowerDevice, RemotePowerType
+from orthos2.data.models import (
+    Architecture,
+    Domain,
+    RemotePower,
+    RemotePowerDevice,
+    RemotePowerType,
+)
 from orthos2.taskmanager import tasks
 from orthos2.taskmanager.models import TaskManager
 from orthos2.utils.misc import get_domain
@@ -59,6 +67,23 @@ def get_ordering(self) -> str:
             return ordering
         return "fqdn"
 
+    def get_queryset(self) -> QuerySet["RemotePowerDevice"]:
+        # RemotePower.remote_power_device uses related_name="+", so there's no
+        # reverse relation to Count() through directly - use a correlated
+        # subquery instead.
+        machine_count_subquery = (
+            RemotePower.objects.filter(remote_power_device=OuterRef("pk"))
+            .order_by()
+            .values("remote_power_device")
+            .annotate(count=Count("machine"))
+            .values("count")
+        )
+        return (
+            super()
+            .get_queryset()  # type: ignore[attr-defined]
+            .annotate(machine_count=Coalesce(Subquery(machine_count_subquery), 0))
+        )
+
     def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
         context = super().get_context_data(**kwargs)
         context["title"] = "Remote Power Devices"
@@ -247,6 +272,29 @@ def remotepowerdevice_detail(request: HttpRequest, id: int) -> HttpResponse:
         raise Http404("Remote Power Device does not exist")
 
 
+@login_required
+@permission_required("data.change_remotepowerdevice")
+def remotepowerdevice_machines(request: HttpRequest, id: int) -> HttpResponse:
+    try:
+        remotepowerdevice = RemotePowerDevice.objects.get(pk=id)
+    except RemotePowerDevice.DoesNotExist:
+        raise Http404("Remote Power Device does not exist")
+
+    return render(
+        request,
+        "frontend/remotepowerdevices/detail/machines.html",
+        {
+            "remotepowerdevice": remotepowerdevice,
+            "remotepowers": RemotePower.objects.filter(
+                remote_power_device=remotepowerdevice
+            )
+            .select_related("machine")
+            .order_by("machine__fqdn"),
+            "title": f"Remote Power Device {remotepowerdevice.fqdn} Machines",
+        },
+    )
+
+
 @login_required
 def remotepowerdevice_fetch_netbox(
     request: HttpRequest, id: int
@@ -257,6 +305,10 @@ def remotepowerdevice_fetch_netbox(
         messages.error(request, "Remote Power Device does not exist!")
         return redirect("frontend:remotepowerdevices")
 
+    if requested_remotepowerdevice.netbox_id == 0:
+        messages.error(request, "Remote Power Device is not linked to NetBox!")
+        return redirect("frontend:remotepowerdevice_detail", id=id)
+
     try:
         TaskManager.add(
             tasks.NetboxFetchRemotePowerDevice(requested_remotepowerdevice.pk)
@@ -316,6 +368,10 @@ def remotepowerdevice_compare_netbox(
         messages.error(request, "Remote Power Device does not exist!")
         return redirect("frontend:remotepowerdevices")
 
+    if requested_remotepowerdevice.netbox_id == 0:
+        messages.error(request, "Remote Power Device is not linked to NetBox!")
+        return redirect("frontend:remotepowerdevice_detail", id=id)
+
     try:
         TaskManager.add(
             tasks.NetboxCompareRemotePowerDevice(requested_remotepowerdevice.pk)
diff --git a/orthos2/frontend/views/remotepowertype.py b/orthos2/frontend/views/remotepowertype.py
index e9ce8956..2062f978 100644
--- a/orthos2/frontend/views/remotepowertype.py
+++ b/orthos2/frontend/views/remotepowertype.py
@@ -2,17 +2,17 @@
 All views that are under "/remotepowertypes".
 """
 
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
-from django.db.models import Count, QuerySet
+from django.db.models import Case, Count, IntegerField, QuerySet, Value, When
 from django.http import Http404, HttpRequest, HttpResponse
 from django.shortcuts import render
-from django.urls import reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView
 
-from orthos2.data.models import RemotePowerDevice, RemotePowerType
+from orthos2.data.models import BMC, RemotePower, RemotePowerDevice, RemotePowerType
 from orthos2.frontend.mixins import SuperuserRequiredMixin
 
 FIELDS = [
@@ -34,7 +34,38 @@ class RemotePowerTypeListView(SuperuserRequiredMixin, ListView):
     paginate_by = 50
 
     def get_queryset(self) -> QuerySet["RemotePowerType"]:
-        return super().get_queryset().annotate(device_count=Count("remotepowerdevice"))  # type: ignore
+        # RemotePowerType is used by three reverse relations (RemotePowerDevice,
+        # BMC, RemotePower) depending on `device`, but they aren't independent:
+        # RemotePower.save() mirrors remote_power_device.fence_agent (for
+        # "rpowerdevice") or machine.bmc.fence_agent (for "bmc") onto its own
+        # fence_agent field, so summing all three would double-count any machine
+        # that has both a RemotePowerDevice/BMC and an explicit RemotePower row.
+        # Only "hypervisor" has no other model backing it, so RemotePower.fence_agent
+        # is the ground truth there. Pick the one relevant count per row instead.
+        queryset = (
+            super()
+            .get_queryset()  # type: ignore[attr-defined]
+            .annotate(
+                rpowerdevice_count=Count("remotepowerdevice", distinct=True),
+                bmc_count=Count("bmc", distinct=True),
+                remotepower_count=Count("remotepower", distinct=True),
+            )
+            .annotate(
+                device_count=Case(
+                    When(device="rpowerdevice", then="rpowerdevice_count"),
+                    When(device="bmc", then="bmc_count"),
+                    When(device="hypervisor", then="remotepower_count"),
+                    default=Value(0),
+                    output_field=IntegerField(),
+                )
+            )
+        )
+
+        device_filter = self.request.GET.get("device")
+        if device_filter in ("bmc", "rpowerdevice", "hypervisor"):
+            queryset = queryset.filter(device=device_filter)
+
+        return queryset
 
     def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
         context = super().get_context_data(**kwargs)
@@ -109,14 +140,56 @@ def remotepowertype_devices(request: HttpRequest, id: int) -> HttpResponse:
     except RemotePowerType.DoesNotExist:
         raise Http404("Remote power type does not exist")
 
+    # Which reverse relation holds the "devices" using this fence agent depends
+    # on its category - only one of RemotePowerDevice/BMC/RemotePower ever
+    # applies (mirrors RemotePowerTypeListView.get_queryset()'s device_count).
+    devices: List[Dict[str, Any]] = []
+    if remotepowertype.device == "bmc":
+        for bmc in (
+            BMC.objects.filter(fence_agent=remotepowertype)
+            .select_related("machine")
+            .order_by("machine__fqdn")
+        ):
+            devices.append(
+                {
+                    "label": bmc.machine.fqdn,
+                    "url": reverse("frontend:detail", args=[bmc.machine.pk]),
+                    "netbox_id": bmc.machine.netbox_id,
+                }
+            )
+    elif remotepowertype.device == "hypervisor":
+        for remotepower in (
+            RemotePower.objects.filter(fence_agent=remotepowertype)
+            .select_related("machine")
+            .order_by("machine__fqdn")
+        ):
+            devices.append(
+                {
+                    "label": remotepower.machine.fqdn,
+                    "url": reverse("frontend:detail", args=[remotepower.machine.pk]),
+                    "netbox_id": remotepower.machine.netbox_id,
+                }
+            )
+    else:
+        for remotepowerdevice in RemotePowerDevice.objects.filter(
+            fence_agent=remotepowertype
+        ).order_by("fqdn"):
+            devices.append(
+                {
+                    "label": remotepowerdevice.fqdn,
+                    "url": reverse(
+                        "frontend:remotepowerdevice_detail", args=[remotepowerdevice.pk]
+                    ),
+                    "netbox_id": remotepowerdevice.netbox_id,
+                }
+            )
+
     return render(
         request,
         "frontend/remotepowertypes/detail/devices.html",
         {
             "remotepowertype": remotepowertype,
-            "remotepowerdevices": RemotePowerDevice.objects.filter(
-                fence_agent=remotepowertype
-            ).order_by("fqdn"),
+            "devices": devices,
             "title": "Remote Power Type {}".format(remotepowertype.name),
         },
     )
diff --git a/orthos2/frontend/views/statistics.py b/orthos2/frontend/views/statistics.py
index 09f0602a..1c24c216 100644
--- a/orthos2/frontend/views/statistics.py
+++ b/orthos2/frontend/views/statistics.py
@@ -3,6 +3,7 @@
 """
 
 import datetime
+import hashlib
 from typing import List
 
 from django.contrib.auth.decorators import login_required
@@ -13,6 +14,17 @@
 
 from orthos2.data.models import Architecture, Domain, Machine, ReservationHistory
 
+# Restricting to these hex digits keeps colors mid-brightness (matches the
+# previous getRandomColor()'s '789ABCD' palette) instead of ranging into
+# near-black/near-white, which would be hard to tell apart on the chart.
+_COLOR_DIGITS = "789ABCD"
+
+
+def _domain_color(name: str) -> str:
+    """Deterministic per-domain chart color, stable across requests/reloads."""
+    digest = hashlib.md5(name.encode()).digest()
+    return "#" + "".join(_COLOR_DIGITS[b % len(_COLOR_DIGITS)] for b in digest[:6])
+
 
 @login_required
 def statistics(request: HttpRequest) -> HttpResponse:
@@ -86,6 +98,10 @@ def statistics(request: HttpRequest) -> HttpResponse:
         "domains": {
             "labels": list(Domain.objects.all().values_list("name", flat=True)),
             "values": [domain.machine_set.count() for domain in Domain.objects.all()],
+            "colors": [
+                _domain_color(name)
+                for name in Domain.objects.all().values_list("name", flat=True)
+            ],
         },
         "released_reservations": released_reservations,
         "reserved_machines": reserved_machines,