diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index c47afcb323..1148a30e30 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -38,7 +38,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% if object.installed_device %}
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index d9e170af3c..e01c92cdfe 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -18,7 +18,7 @@
{% block content %}
-
+
@@ -49,7 +49,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 08e2f8d636..909b5276e7 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -6,7 +6,7 @@
{% block content %}
-
+
@@ -96,7 +96,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/comments.html' %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index b57c5835d1..163ccbc8ec 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -64,7 +64,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 510780dd95..134c4e364f 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -22,7 +22,7 @@
{% block content %}
-
+
@@ -122,7 +122,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panel_table.html' with table=vdc_table heading="Virtual Device Contexts" %}
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index fd8ea42eb1..d389abe8e0 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -70,7 +70,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/inventoryitemrole.html b/netbox/templates/dcim/inventoryitemrole.html
index 4cc3c5864d..13c16ddd6d 100644
--- a/netbox/templates/dcim/inventoryitemrole.html
+++ b/netbox/templates/dcim/inventoryitemrole.html
@@ -10,7 +10,7 @@
{% block content %}
-
+
@@ -39,7 +39,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 97dcc20f05..8004027a70 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -21,7 +21,7 @@
{% block content %}
-
+
@@ -64,7 +64,7 @@
{% include 'inc/panels/custom_fields.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/macaddress.html b/netbox/templates/dcim/macaddress.html
index 6d7532e6d2..489d55c081 100644
--- a/netbox/templates/dcim/macaddress.html
+++ b/netbox/templates/dcim/macaddress.html
@@ -6,7 +6,7 @@
{% block content %}
-
+
@@ -42,7 +42,7 @@
{% include 'inc/panels/custom_fields.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 13c4b17641..cb6251f63e 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -28,7 +28,7 @@
{% block content %}
-
+
@@ -45,7 +45,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html
index f702c6608d..2a40629441 100644
--- a/netbox/templates/dcim/module.html
+++ b/netbox/templates/dcim/module.html
@@ -49,7 +49,7 @@
{% block content %}
-
+
@@ -87,7 +87,7 @@
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/modulebay.html b/netbox/templates/dcim/modulebay.html
index 5ef17cad81..054a13b1c5 100644
--- a/netbox/templates/dcim/modulebay.html
+++ b/netbox/templates/dcim/modulebay.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -47,7 +47,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/custom_fields.html' %}
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html
index b3d53e09b3..e5ee7cb641 100644
--- a/netbox/templates/dcim/moduletype.html
+++ b/netbox/templates/dcim/moduletype.html
@@ -19,7 +19,7 @@
{% block content %}
-
+
@@ -59,7 +59,7 @@
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/image_attachments.html' %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 76b50fcbb7..bed496625b 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -21,7 +21,7 @@
{% block content %}
-
+
@@ -46,7 +46,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index fb36099652..d95cb13b39 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -16,7 +16,7 @@
{% block content %}
-
+
@@ -105,7 +105,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 146f6d5804..8fc1359348 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -64,7 +64,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index c712bbd1f8..a685789f57 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -14,7 +14,7 @@
{% block content %}
-
+
@@ -36,7 +36,7 @@
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
-
+
{% include 'inc/panels/related_objects.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/image_attachments.html' %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 7c25b2b5ba..be05fdae25 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -12,7 +12,7 @@
{% block content %}
-
+
@@ -54,7 +54,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+
{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 5c1ec5e071..87341d90e0 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -14,7 +14,7 @@
{% block content %}
-
+
@@ -37,7 +37,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-