diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html
index 62410da4a..b643aa53f 100644
--- a/netbox/templates/dcim/device_component_add.html
+++ b/netbox/templates/dcim/device_component_add.html
@@ -6,7 +6,7 @@
 {% render_errors form %}
 
 {% block content %}
-<form action="" method="post">
+<form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="row">
         <div class="col-md-8">
diff --git a/netbox/templates/dcim/device_component_edit.html b/netbox/templates/dcim/device_component_edit.html
index e0db4f544..6976a58db 100644
--- a/netbox/templates/dcim/device_component_edit.html
+++ b/netbox/templates/dcim/device_component_edit.html
@@ -3,13 +3,9 @@
 
 {% block form_fields %}
     {% if form.instance.device %}
-        <div class="form-group">
-            <label class="col-md-3 control-label required" for="id_device">Device</label>
-            <div class="col-md-9">
-                <p class="form-control-static">
-                    <a href="{{ form.instance.device.get_absolute_url }}">{{ form.instance.device }}</a>
-                </p>
-            </div>
+        <div class="form-floating mb-3">
+            <input class="form-control" value="{{ form.instance.device }}" disabled />
+            <label>Device</label>
         </div>
     {% endif %}
     {% render_form form %}
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 42957a274..35a5edb5a 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -3,85 +3,76 @@
 
 {% block form %}
 {% render_errors form %}
-
-    <div class="field-group">
-        <h4 >Device</h4>
-        {% render_field form.name %}
-        {% render_field form.device_role %}
-        {% render_field form.tags %}
+<div class="field-group">
+    <h4 >Device</h4>
+    {% render_field form.name %}
+    {% render_field form.device_role %}
+    {% render_field form.tags %}
+</div>
+<div class="field-group">
+    <h4>Hardware</h4>
+    {% render_field form.manufacturer %}
+    {% render_field form.device_type %}
+    {% render_field form.serial %}
+    {% render_field form.asset_tag %}
+</div>
+<div class="field-group">
+    <h4>Location</h4>
+    {% render_field form.region %}
+    {% render_field form.site_group %}
+    {% render_field form.site %}
+    {% render_field form.location %}
+    {% render_field form.rack %}
+    {% if obj.device_type.is_child_device and obj.parent_bay %}
+    <div class="form-floating mb-3">
+        <input class="form-control" value="{{ obj.parent_bay.device }}" disabled />
+        <label>Parent Device</label>
     </div>
-    <div class="field-group">
-        <h4>Hardware</h4>
-        {% render_field form.manufacturer %}
-        {% render_field form.device_type %}
-        {% render_field form.serial %}
-        {% render_field form.asset_tag %}
+    <div class="form-floating mb-3">
+        <div class="input-group">
+            <input class="form-control" value="{{ obj.parent_bay.name }}" disabled />
+            <label>Parent Bay</label>
+            <a href="{% url 'dcim:devicebay_depopulate' pk=obj.parent_bay.pk %}" title="Regenerate Slug" class="btn btn-danger d-inline-flex align-items-center">
+                <i class="mdi mdi-close-thick"></i>&nbsp;Remove
+            </a>
+        </div>  
     </div>
-    <div class="field-group">
-        <h4>Location</h4>
-        {% render_field form.region %}
-        {% render_field form.site_group %}
-        {% render_field form.site %}
-        {% render_field form.location %}
-        {% render_field form.rack %}
-        {% if obj.device_type.is_child_device and obj.parent_bay %}
-            <div class="form-group">
-                <label class="col-md-3 control-label">Parent Device</label>
-                <div class="col-md-9">
-                    <p class="form-control-static">
-                        <a href="{% url 'dcim:device' pk=obj.parent_bay.device.pk %}">{{ obj.parent_bay.device }}</a>
-                    </p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-3 control-label">Parent Bay</label>
-                <div class="col-md-9">
-                    <p class="form-control-static">
-                        {{ obj.parent_bay.name }}
-                        {% if perms.dcim.change_devicebay %}
-                            <a href="{% url 'dcim:devicebay_depopulate' pk=obj.parent_bay.pk %}" class="btn btn-danger btn-sm">
-                                <i class="mdi mdi-close-thick" aria-hidden="true" title="Remove device"></i> Remove
-                            </a>
-                        {% endif %}
-                    </p>
-                </div>
-            </div>
-        {% else %}
-            {% render_field form.face %}
-            {% render_field form.position %}
-        {% endif %}
-    </div>
-    <div class="field-group">
-        <h4>Management</h4>
-        {% render_field form.status %}
-        {% render_field form.platform %}
-        {% if obj.pk %}
-            {% render_field form.primary_ip4 %}
-            {% render_field form.primary_ip6 %}
-        {% endif %}
-    </div>
-    <div class="field-group">
-        <h4>Virtualization</h4>
-        {% render_field form.cluster_group %}
-        {% render_field form.cluster %}
-    </div>
-    <div class="field-group">
-        <h4>Tenancy</h4>
-        {% render_field form.tenant_group %}
-        {% render_field form.tenant %}
-    </div>
-    {% if form.custom_fields %}
-        <div class="field-group">
-            <h4>Custom Fields</h4>
-            {% render_custom_fields form %}
-        </div>
+    {% else %}
+        {% render_field form.face %}
+        {% render_field form.position %}
     {% endif %}
+</div>
+<div class="field-group">
+    <h4>Management</h4>
+    {% render_field form.status %}
+    {% render_field form.platform %}
+    {% if obj.pk %}
+        {% render_field form.primary_ip4 %}
+        {% render_field form.primary_ip6 %}
+    {% endif %}
+</div>
+<div class="field-group">
+    <h4>Virtualization</h4>
+    {% render_field form.cluster_group %}
+    {% render_field form.cluster %}
+</div>
+<div class="field-group">
+    <h4>Tenancy</h4>
+    {% render_field form.tenant_group %}
+    {% render_field form.tenant %}
+</div>
+{% if form.custom_fields %}
     <div class="field-group">
-        <h4>Local Config Context Data</h4>
-        {% render_field form.local_context_data %}
-    </div>
-    <div class="field-group">
-        <h4>Comments</h4>
-        {% render_field form.comments %}
+        <h4>Custom Fields</h4>
+        {% render_custom_fields form %}
     </div>
+{% endif %}
+<div class="field-group">
+    <h4>Local Config Context Data</h4>
+    {% render_field form.local_context_data %}
+</div>
+<div class="field-group">
+    <h4>Comments</h4>
+    {% render_field form.comments %}
+</div>
 {% endblock %}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index 568bd3f0e..e8f8d5388 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -3,9 +3,8 @@
 {% load plugins %}
 
 {% block breadcrumbs %}
-  {{ block.super }}
-  <li><a href="{% url 'dcim:device_devicebays' pk=object.device.pk %}">Device Bays</a></li>
-  <li>{{ object }}</li>
+  <li class="breadcrumb-item"><a href="{% url 'dcim:device_devicebays' pk=object.device.pk %}">Device Bays</a></li>
+  <li class="breadcrumb-item">{{ object }}</li>
 {% endblock %}
 
 {% block content %}
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index bb04f7999..e424e6e28 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'layout.html' %}
 {% load form_helpers %}
 
 {% render_errors form %}
@@ -6,7 +6,7 @@
 {% block content %}
 <form action="." method="post">
     {% csrf_token %}
-    <div class="row">
+    <div class="row mb-3">
         <div class="col-md-6 col-md-offset-3">
             <div class="card">
                 <div class="card-header">{% block title %}Populate {{ device_bay }}{% endblock %}</div>
@@ -22,12 +22,12 @@
                     {% render_form form %}
                 </div>
             </div>
-		    <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <a href="{{ return_url }}" class="btn btn-outline-dark">Cancel</a>
-                    <button type="submit" name="_update" class="btn btn-primary">Save</button>
-                </div>
-		    </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-6 text-end">
+            <a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
+            <button type="submit" name="_update" class="btn btn-primary">Save</button>
         </div>
     </div>
 </form>