diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 76ef4a5d2..9ba41216d 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -5,7 +5,7 @@
 {% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %}
 
 {% block form %}
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Circuit Termination</h5>
     </div>
@@ -53,9 +53,8 @@
       </div>
     {% endwith %}
   </div>
-  <hr />
 
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Termination Details</h5>
     </div>
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html
index 83891bc21..03dcaa2e4 100644
--- a/netbox/templates/dcim/cable_connect.html
+++ b/netbox/templates/dcim/cable_connect.html
@@ -17,9 +17,7 @@
       <div class="row my-3">
           <div class="col col-md-5">
               <div class="card h-100">
-                  <h5 class="card-header">
-                      A Side
-                  </h5>
+                  <h5 class="card-header offset-sm-3">A Side</h5>
                   <div class="card-body">
                       {% if termination_a.device %}
                           {# Device component #}
@@ -100,9 +98,7 @@
           </div>
           <div class="col col-md-5">
               <div class="card h-100">
-                  <h5 class="card-header">
-                      B Side
-                  </h5>
+                  <h5 class="card-header offset-sm-3">B Side</h5>
                   <div class="card-body">
                       {% if tabs %}
                           <ul class="nav nav-tabs">
@@ -154,7 +150,7 @@
       <div class="row my-3 justify-content-center">
         <div class="col col-md-8">
           <div class="card">
-            <h5 class="card-header">Cable</h5>
+            <h5 class="card-header offset-sm-3">Cable</h5>
             <div class="card-body">
               {% include 'dcim/inc/cable_form.html' %}
             </div>
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index ab754a74f..fbafa197d 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -4,111 +4,104 @@
 {% block form %}
     {% render_errors form %}
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Device</h5>
-        </div>
-        {% render_field form.name %}
-        {% render_field form.device_role %}
-        {% render_field form.tags %}
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Device</h5>
+      </div>
+      {% render_field form.name %}
+      {% render_field form.device_role %}
+      {% render_field form.tags %}
     </div>
-    <hr />
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Hardware</h5>
-        </div>
-        {% render_field form.manufacturer %}
-        {% render_field form.device_type %}
-        {% render_field form.serial %}
-        {% render_field form.asset_tag %}
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Hardware</h5>
+      </div>
+      {% render_field form.manufacturer %}
+      {% render_field form.device_type %}
+      {% render_field form.serial %}
+      {% render_field form.asset_tag %}
     </div>
-    <hr />
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Location</h5>
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Location</h5>
+      </div>
+      {% 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="row mb-3">
+          <label class="col-sm-3 col-form-label">Parent Device</label>
+          <div class="col">
+            <input class="form-control" value="{{ obj.parent_bay.device }}" disabled />
+          </div>
         </div>
-        {% 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="row mb-3">
-                <label class="col-sm-3 col-form-label">Parent Device</label>
-                <div class="col">
-                    <input class="form-control" value="{{ obj.parent_bay.device }}" disabled />
-                </div>
+        <div class="row mb-3">
+          <label class="col-sm-3 col-form-label">Parent Bay</label>
+          <div class="col">
+            <div class="input-group">
+              <input class="form-control" value="{{ obj.parent_bay.name }}" disabled />
+              <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 class="row mb-3">
-                <label class="col-sm-3 col-form-label">Parent Bay</label>
-                <div class="col">
-                    <div class="input-group">
-                        <input class="form-control" value="{{ obj.parent_bay.name }}" disabled />
-                        <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>
-        {% else %}
-            {% render_field form.face %}
-            {% render_field form.position %}
-        {% endif %}
+          </div>
+      {% else %}
+        {% render_field form.face %}
+        {% render_field form.position %}
+      {% endif %}
     </div>
-    <hr />
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Management</h5>
-        </div>
-        {% render_field form.status %}
-        {% render_field form.platform %}
-        {% if obj.pk %}
-            {% render_field form.primary_ip4 %}
-            {% render_field form.primary_ip6 %}
-        {% endif %}
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Management</h5>
+      </div>
+      {% render_field form.status %}
+      {% render_field form.platform %}
+      {% if obj.pk %}
+        {% render_field form.primary_ip4 %}
+        {% render_field form.primary_ip6 %}
+      {% endif %}
     </div>
-    <hr />
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Virtualization</h5>
-        </div>
-        {% render_field form.cluster_group %}
-        {% render_field form.cluster %}
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Virtualization</h5>
+      </div>
+      {% render_field form.cluster_group %}
+      {% render_field form.cluster %}
     </div>
-    <hr />
     
-    <div class="field-group my-4">
-        <div class="row mb-2">
-          <h5 class="offset-sm-3">Tenancy</h5>
-        </div>
-        {% render_field form.tenant_group %}
-        {% render_field form.tenant %}
+    <div class="field-group my-5">
+      <div class="row mb-2">
+        <h5 class="offset-sm-3">Tenancy</h5>
+      </div>
+      {% render_field form.tenant_group %}
+      {% render_field form.tenant %}
     </div>
-    <hr />
 
     {% if form.custom_fields %}
-      <div class="field-group my-4">
+      <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Custom Fields</h5>
         </div>
         {% render_custom_fields form %}
       </div>
-      <hr />
     {% endif %}
 
-    <div class="field-group my-4">
-        <h5 class="text-center">Local Config Context Data</h5>
-        {% render_field form.local_context_data %}
+    <div class="field-group my-5">
+      <h5 class="text-center">Local Config Context Data</h5>
+      {% render_field form.local_context_data %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
-        {% render_field form.comments label='Comments' %}
+    <div class="field-group mb-5">
+      <h5 class="text-center">Comments</h5>
+      {% render_field form.comments %}
     </div>
 
 {% endblock %}
diff --git a/netbox/templates/dcim/inc/cable_form.html b/netbox/templates/dcim/inc/cable_form.html
index f1baeb756..05929821c 100644
--- a/netbox/templates/dcim/inc/cable_form.html
+++ b/netbox/templates/dcim/inc/cable_form.html
@@ -16,7 +16,6 @@
 </div>
 {% render_field form.tags %}
 {% if form.custom_fields %}
-  <hr />
   <div class="field-group">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Custom Fields</h5>
diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index 64cd8407e..38b22fe5e 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Interface</h5>
         </div>
@@ -27,9 +27,8 @@
         {% render_field form.mgmt_only %}
         {% render_field form.mark_connected %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">802.1Q Switching</h5>
         </div>
@@ -40,8 +39,7 @@
     </div>
 
     {% if form.custom_fields %}
-      <hr />
-      <div class="field-group my-4">
+      <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Custom Fields</h5>
         </div>
diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html
index 64e366ea7..ca97be34d 100644
--- a/netbox/templates/dcim/rack_edit.html
+++ b/netbox/templates/dcim/rack_edit.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Rack</h5>
         </div>
@@ -15,9 +15,8 @@
         {% render_field form.role %}
         {% render_field form.tags %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Inventory Control</h5>
         </div>
@@ -25,18 +24,16 @@
         {% render_field form.serial %}
         {% render_field form.asset_tag %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Tenancy</h5>
         </div>
         {% render_field form.tenant_group %}
         {% render_field form.tenant %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Dimensions</h5>
         </div>
@@ -45,34 +42,33 @@
         {% render_field form.u_height %}
         <div class="row mb-3">
             <label class="col col-md-3 col-form-label text-lg-end">Outer Dimensions</label>
-            <div class="col col-md-3">
+            <div class="col col-md-3 mb-1">
                 {{ form.outer_width }}
                 <div class="form-text">Width</div>
             </div>
-            <div class="col col-md-3">
+            <div class="col col-md-3 mb-1">
                 {{ form.outer_depth }}
                 <div class="form-text">Depth</div>
             </div>
-            <div class="col col-md-3">
+            <div class="col col-md-3 mb-1">
                 {{ form.outer_unit }}
                 <div class="form-text">Unit</div>
             </div>
         </div>
         {% render_field form.desc_units %}
     </div>
-    <hr />
 
     {% if form.custom_fields %}
-      <div class="field-group my-4">
+      <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Custom Fields</h5>
         </div>
           {% render_custom_fields form %}
       </div>
-      <hr />
     {% endif %}
 
-    <div class="field-group my-4">
-        {% render_field form.comments label='Comments' %}
+    <div class="field-group my-5">
+      <h5 class="text-center">Comments</h5>
+      {% render_field form.comments %}
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html
index 1ff0cd8bd..3c0b10826 100644
--- a/netbox/templates/dcim/virtualchassis_add.html
+++ b/netbox/templates/dcim/virtualchassis_add.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 
 {% block form %}
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Virtual Chassis</h5>
     </div>
@@ -10,9 +10,8 @@
     {% render_field form.domain %}
     {% render_field form.tags %}
   </div>
-  <hr />
 
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Member Devices</h5>
     </div>
@@ -25,8 +24,7 @@
   </div>
 
   {% if form.custom_fields %}
-    <hr />
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Custom Fields</h5>
       </div>
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index c994f05dc..a37ff102a 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -11,7 +11,7 @@
         {% csrf_token %}
         {{ pk_form.pk }}
         {{ formset.management_form }}
-        <div class="field-group my-4">
+        <div class="field-group my-5">
           <div class="row mb-2">
             <h5 class="offset-sm-3">Virtual Chassis</h5>
           </div>
@@ -20,16 +20,14 @@
           {% render_field vc_form.master %}
           {% render_field vc_form.tags %}
         </div>
-        <hr />
 
         {% if vc_form.custom_fields %}
-          <div class="field-group my-4">
+          <div class="field-group my-5">
             <div class="row mb-2">
               <h5 class="offset-sm-3">Custom Fields</h5>
             </div>
             {% render_custom_fields vc_form %}
           </div>
-          <hr />
         {% endif %}
 
         <div class="field-group mb-5">
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index bd3f6059b..c7b4c8a8b 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -6,18 +6,6 @@
   {% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}
 {% endblock title %}
 
-{% block controls %}
-  {% if obj and settings.DOCS_ROOT %}
-    <div class="controls">
-      <div class="control-group">
-        <a href="{{ obj|get_docs_url }}" target="_blank" class="btn btn-sm btn-outline-secondary" title="View model documentation">
-          <i class="mdi mdi-help-circle"></i> Help
-        </a>
-      </div>
-    </div>
-  {% endif %}
-{% endblock controls %}
-
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
     <li class="nav-item" role="presentation">
@@ -31,6 +19,16 @@
 {% block content-wrapper %}
   <div class="tab-content">
     <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
+
+      {# Link to model documentation #}
+      {% if obj and settings.DOCS_ROOT %}
+        <div class="float-end">
+          <a href="{{ obj|get_docs_url }}" target="_blank" class="btn btn-sm btn-outline-secondary" title="View model documentation">
+            <i class="mdi mdi-help-circle"></i> Help
+          </a>
+        </div>
+      {% endif %}
+
       <form action="" method="post" enctype="multipart/form-data" class="form-object-edit">
         {% csrf_token %}
         {% for field in form.hidden_fields %}
@@ -42,7 +40,7 @@
 
             {# Render grouped fields according to Form #}
             {% for group, fields in form.Meta.fieldsets %}
-              <div class="field-group my-4">
+              <div class="field-group my-5">
                 <div class="row mb-2">
                   <h5 class="offset-sm-3">{{ group }}</h5>
                 </div>
@@ -50,14 +48,10 @@
                     {% render_field form|getfield:name %}
                 {% endfor %}
               </div>
-              {% if not forloop.last %}
-                <hr />
-              {% endif %}
             {% endfor %}
 
             {% if form.custom_fields %}
-              <hr />
-              <div class="field-group my-4">
+              <div class="field-group my-5">
                 <div class="row mb-2">
                   <h5 class="offset-sm-3">Custom Fields</h5>
                 </div>
@@ -66,15 +60,15 @@
             {% endif %}
 
             {% if form.comments %}
-              <hr />
-              <div class="field-group my-4">
-                {% render_field form.comments label='Comments' %}
+              <div class="field-group my-5">
+                <h5 class="text-center">Comments</h5>
+                {% render_field form.comments %}
               </div>
             {% endif %}
 
           {% else %}
             {# Render all fields in a single group #}
-            <div class="field-group my-4">
+            <div class="field-group my-5">
               {% block form_fields %}{% render_form form %}{% endblock %}
             </div>
           {% endif %}
diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html
index af0b27e98..84e71b9fc 100644
--- a/netbox/templates/ipam/ipaddress_bulk_add.html
+++ b/netbox/templates/ipam/ipaddress_bulk_add.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block form %}
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">IP Addresses</h5>
         </div>
@@ -20,9 +20,8 @@
         {% render_field model_form.description %}
         {% render_field model_form.tags %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Tenancy</h5>
         </div>
@@ -30,8 +29,7 @@
         {% render_field model_form.tenant %}
     </div>
     {% if model_form.custom_fields %}
-        <hr />
-        <div class="field-group my-4">
+        <div class="field-group my-5">
             <div class="row mb-2">
               <h5 class="offset-sm-3">Custom Fields</h5>
             </div>
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index d12c12245..c23fcd63c 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -8,7 +8,7 @@
 {% endblock tabs %}
 
 {% block form %}
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">IP Address</h5>
       </div>
@@ -20,18 +20,16 @@
       {% render_field form.description %}
       {% render_field form.tags %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Tenancy</h5>
       </div>
       {% render_field form.tenant_group %}
       {% render_field form.tenant %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Interface Assignment</h5>
       </div>
@@ -81,9 +79,8 @@
         </div>
       {% endwith %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">NAT IP (Inside)</h5>
       </div>
@@ -152,8 +149,7 @@
     </div>
 
     {% if form.custom_fields %}
-      <hr />
-      <div class="field-group my-4">
+      <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Custom Fields</h5>
         </div>
diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html
index fe8ddf525..ddeffee4a 100644
--- a/netbox/templates/ipam/service_edit.html
+++ b/netbox/templates/ipam/service_edit.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 
 {% block form %}
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Service</h5>
     </div>
@@ -43,7 +43,6 @@
   </div>
 
   {% if form.custom_fields %}
-    <hr />
     <div class="row mb-2">
       <h5 class="offset-sm-3">Custom Fields</h5>
     </div>
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 776e0aa4a..5aa577942 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -4,7 +4,7 @@
 {% load helpers %}
 
 {% block form %}
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">VLAN</h5>
     </div>
@@ -15,18 +15,16 @@
     {% render_field form.description %}
     {% render_field form.tags %}
   </div>
-  <hr />
 
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Tenancy</h5>
     </div>
     {% render_field form.tenant_group %}
     {% render_field form.tenant %}
   </div>
-  <hr />
 
-  <div class="field-group my-4">
+  <div class="field-group my-5">
     <div class="row mb-2">
       <h5 class="offset-sm-3">Assignment</h5>
     </div>
@@ -58,8 +56,7 @@
   </div>
 
   {% if form.custom_fields %}
-    <hr />
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Custom Fields</h5>
       </div>
diff --git a/netbox/templates/virtualization/vminterface_edit.html b/netbox/templates/virtualization/vminterface_edit.html
index ad3c77e13..b4d097513 100644
--- a/netbox/templates/virtualization/vminterface_edit.html
+++ b/netbox/templates/virtualization/vminterface_edit.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Interface</h5>
       </div>
@@ -22,9 +22,8 @@
       {% render_field form.description %}
       {% render_field form.tags %}
     </div>
-    <hr />
 
-    <div class="field-group my-4">
+    <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">802.1Q Switching</h5>
       </div>
@@ -35,8 +34,7 @@
     </div>
 
     {% if form.custom_fields %}
-      <hr />
-      <div class="field-group my-4">
+      <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Custom Fields</h5>
         </div>