diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index 2abe723f6..ace19c521 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -15,22 +15,40 @@
             </div>
         {% endif %}
         {% render_field form.name %}
-        {% render_field form.label %}
         {% render_field form.type %}
-        {% render_field form.parent %}
-        {% render_field form.bridge %}
-        {% render_field form.lag %}
-        {% render_field form.mac_address %}
-        {% render_field form.wwn %}
-        {% render_field form.mtu %}
-        {% render_field form.tx_power %}
+        {% render_field form.label %}
         {% render_field form.description %}
         {% render_field form.tags %}
+    </div>
+
+    <div class="field-group my-5">
+        <div class="row mb-2">
+          <h5 class="offset-sm-3">Addressing</h5>
+        </div>
+        {% render_field form.mac_address %}
+        {% render_field form.wwn %}
+    </div>
+
+    <div class="field-group my-5">
+        <div class="row mb-2">
+          <h5 class="offset-sm-3">Operation</h5>
+        </div>
+        {% render_field form.mtu %}
+        {% render_field form.tx_power %}
         {% render_field form.enabled %}
         {% render_field form.mgmt_only %}
         {% render_field form.mark_connected %}
     </div>
 
+    <div class="field-group my-5">
+        <div class="row mb-2">
+          <h5 class="offset-sm-3">Related Interfaces</h5>
+        </div>
+        {% render_field form.parent %}
+        {% render_field form.bridge %}
+        {% render_field form.lag %}
+    </div>
+
     {% if form.instance.is_wireless %}
         <div class="field-group my-5">
             <div class="row mb-2">
diff --git a/netbox/templates/virtualization/vminterface_edit.html b/netbox/templates/virtualization/vminterface_edit.html
index 824f2bf24..2e54d7e2b 100644
--- a/netbox/templates/virtualization/vminterface_edit.html
+++ b/netbox/templates/virtualization/vminterface_edit.html
@@ -15,13 +15,19 @@
           </div>
       {% endif %}
       {% render_field form.name %}
-      {% render_field form.enabled %}
-      {% render_field form.parent %}
-      {% render_field form.bridge %}
+      {% render_field form.description %}
       {% render_field form.mac_address %}
       {% render_field form.mtu %}
-      {% render_field form.description %}
       {% render_field form.tags %}
+      {% render_field form.enabled %}
+    </div>
+
+    <div class="field-group my-5">
+        <div class="row mb-2">
+          <h5 class="offset-sm-3">Related Interfaces</h5>
+        </div>
+        {% render_field form.parent %}
+        {% render_field form.bridge %}
     </div>
 
     <div class="field-group my-5">