diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d9ed6db04..da101af7f 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1120,7 +1120,7 @@ class DeviceView(ObjectView):
             orderable=False
         )
         if request.user.has_perm('dcim.change_inventoryitem') or request.user.has_perm('dcim.delete_inventoryitem'):
-            devicebay_table.columns.show('pk')
+            inventoryitem_table.columns.show('pk')
 
         # Services
         services = Service.objects.restrict(request.user, 'view').filter(device=device)
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 82e34c861..5687bc774 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -492,20 +492,18 @@
                             </div>
                             {% include 'responsive_table.html' with table=interface_table %}
                             <div class="panel-footer noprint">
-                                {% if interfaces and perms.dcim.change_interface %}
+                                {% if perms.dcim.change_interface %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_interfaces" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
                                     <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}%23tab_interfaces" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
                                     </button>
-                                {% endif %}
-                                {% if interfaces and perms.dcim.change_interface %}
                                     <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}%23tab_interfaces" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if interfaces and perms.dcim.delete_interface %}
+                                {% if perms.dcim.delete_interface %}
                                     <button type="submit" name="_delete" formaction="{% url 'dcim:interface_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_interfaces" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -536,7 +534,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=frontport_table %}
                             <div class="panel-footer noprint">
-                                {% if frontports and perms.dcim.change_frontport %}
+                                {% if perms.dcim.change_frontport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:frontport_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_frontports" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -547,7 +545,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if frontports and perms.dcim.delete_frontport %}
+                                {% if perms.dcim.delete_frontport %}
                                     <button type="submit" formaction="{% url 'dcim:frontport_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_frontports" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -578,7 +576,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=rearport_table %}
                             <div class="panel-footer noprint">
-                                {% if rearports and perms.dcim.change_rearport %}
+                                {% if perms.dcim.change_rearport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:rearport_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_rearports" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -589,7 +587,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if rearports and perms.dcim.delete_rearport %}
+                                {% if perms.dcim.delete_rearport %}
                                     <button type="submit" formaction="{% url 'dcim:rearport_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_rearports" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -620,7 +618,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=consoleport_table %}
                             <div class="panel-footer noprint">
-                                {% if consoleports and perms.dcim.change_consoleport %}
+                                {% if perms.dcim.change_consoleport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_consoleports" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -631,7 +629,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if consoleports and perms.dcim.delete_consoleport %}
+                                {% if perms.dcim.delete_consoleport %}
                                     <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_consoleports" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -662,7 +660,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=consoleserverport_table %}
                             <div class="panel-footer noprint">
-                                {% if consoleserverports and perms.dcim.change_consoleserverport %}
+                                {% if perms.dcim.change_consoleserverport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_consoleserverports" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -673,7 +671,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if consoleserverports and perms.dcim.delete_consoleserverport %}
+                                {% if perms.dcim.delete_consoleserverport %}
                                     <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_consoleserverports" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -704,7 +702,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=powerport_table %}
                             <div class="panel-footer noprint">
-                                {% if powerports and perms.dcim.change_powerport %}
+                                {% if perms.dcim.change_powerport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_powerports" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -715,7 +713,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if powerports and perms.dcim.delete_powerport %}
+                                {% if perms.dcim.delete_powerport %}
                                     <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_powerports" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -746,7 +744,7 @@
                             </div>
                             {% include 'responsive_table.html' with table=poweroutlet_table %}
                             <div class="panel-footer noprint">
-                                {% if poweroutlets and perms.dcim.change_powerport %}
+                                {% if perms.dcim.change_powerport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_poweroutlets" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -757,7 +755,7 @@
                                         <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if poweroutlets and perms.dcim.delete_poweroutlet %}
+                                {% if perms.dcim.delete_poweroutlet %}
                                     <button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_poweroutlets" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
@@ -788,12 +786,15 @@
                             </div>
                             {% include 'responsive_table.html' with table=devicebay_table %}
                             <div class="panel-footer noprint">
-                                {% if devicebays and perms.dcim.change_devicebay %}
+                                {% if perms.dcim.change_devicebay %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_devicebays" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:devicebay_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}%23tab_devicebays" class="btn btn-warning btn-xs">
+                                        <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+                                    </button>
                                 {% endif %}
-                                {% if devicebays and perms.dcim.delete_devicebay %}
+                                {% if perms.dcim.delete_devicebay %}
                                     <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_devicebays" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete selected
                                     </button>
@@ -824,16 +825,16 @@
                             </div>
                             {% include 'responsive_table.html' with table=inventoryitem_table %}
                             <div class="panel-footer noprint">
-                                {% if inventoryitems and perms.dcim.change_inventoryitem %}
-                                    <button type="submit" name="_rename" formaction="{% url 'dcim:inventoryitem_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                {% if perms.dcim.change_inventoryitem %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:inventoryitem_bulk_rename' %}?return_url={{ device.get_absolute_url }}%23tab_inventoryitems" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                                     </button>
-                                    <button type="submit" name="_edit" formaction="{% url 'dcim:inventoryitem_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:inventoryitem_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}%23tab_inventoryitems" class="btn btn-warning btn-xs">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
                                     </button>
                                 {% endif %}
-                                {% if inventoryitems and perms.dcim.delete_inventoryitem %}
-                                    <button type="submit" name="_delete" formaction="{% url 'dcim:inventoryitem_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                {% if perms.dcim.delete_inventoryitem %}
+                                    <button type="submit" name="_delete" formaction="{% url 'dcim:inventoryitem_bulk_delete' %}?return_url={{ device.get_absolute_url }}%23tab_inventoryitems" class="btn btn-danger btn-xs">
                                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
                                     </button>
                                 {% endif %}