diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/models.py
index f5988030c..d5b52aed3 100644
--- a/netbox/dcim/forms/models.py
+++ b/netbox/dcim/forms/models.py
@@ -1097,6 +1097,7 @@ class ConsolePortForm(CustomFieldModelForm):
         widgets = {
             'device': forms.HiddenInput(),
             'type': StaticSelect(),
+            'speed': StaticSelect(),
         }
 
 
@@ -1114,6 +1115,7 @@ class ConsoleServerPortForm(CustomFieldModelForm):
         widgets = {
             'device': forms.HiddenInput(),
             'type': StaticSelect(),
+            'speed': StaticSelect(),
         }
 
 
@@ -1234,6 +1236,17 @@ class InterfaceForm(InterfaceCommonForm, CustomFieldModelForm):
             'mgmt_only', 'mark_connected', 'description', 'mode', 'rf_role', 'rf_channel', 'rf_channel_frequency',
             'rf_channel_width', 'tx_power', 'wireless_lans', 'untagged_vlan', 'tagged_vlans', 'tags',
         ]
+        # fieldsets = (
+        #     ('Interface', ('device', 'name', 'type', 'label', 'description', 'tags')),
+        #     ('Addressing', ('mac_address', 'wwn')),
+        #     ('Operation', ('mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected')),
+        #     ('Related Interfaces', ('parent', 'bridge', 'lag')),
+        #     ('802.1Q Switching', ('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans')),
+        #     ('Wireless', (
+        #         'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'wireless_lan_group',
+        #         'wireless_lans',
+        #     )),
+        # )
         widgets = {
             'device': forms.HiddenInput(),
             'type': StaticSelect(),
diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 009422038..682501895 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -707,8 +707,8 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
 
         return render(request, self.template_name, {
             'obj_type': self.queryset.model._meta.verbose_name,
-            'form': form,
-            'model_form': model_form,
+            'replication_form': form,
+            'form': model_form,
             'return_url': self.get_return_url(request),
         })
 
@@ -725,8 +725,8 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
 
         return render(request, self.template_name, {
             'obj_type': self.queryset.model._meta.verbose_name,
-            'form': form,
-            'model_form': model_form,
+            'replication_form': form,
+            'form': model_form,
             'return_url': self.get_return_url(request),
         })
 
diff --git a/netbox/templates/dcim/component_create.html b/netbox/templates/dcim/component_create.html
index 367fc2d11..a8750e20e 100644
--- a/netbox/templates/dcim/component_create.html
+++ b/netbox/templates/dcim/component_create.html
@@ -2,6 +2,6 @@
 {% load form_helpers %}
 
 {% block form %}
-  {% render_form form %}
-  {% render_form model_form %}
+  {% render_form replication_form %}
+  {{ block.super }}
 {% endblock form %}
diff --git a/netbox/templates/dcim/interface_create.html b/netbox/templates/dcim/interface_create.html
deleted file mode 100644
index 6b5486eff..000000000
--- a/netbox/templates/dcim/interface_create.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'generic/object_edit.html' %}
-
-{% block buttons %}
-  <a class="btn btn-outline-danger" href="{{ return_url }}">Cancel</a>
-  {% if component_type == 'interface' and perms.ipam.add_ipaddress %}
-    <button type="submit" name="_assignip" class="btn btn-outline-success">
-      Create & Assign IP Address
-    </button>
-  {% endif %}
-  <button type="submit" name="_addanother" class="btn btn-outline-primary">
-    Create & Add Another
-  </button>
-  <button type="submit" name="_create" class="btn btn-primary">
-    Create
-  </button>
-{% endblock %}
\ No newline at end of file
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index c7b4c8a8b..d72210dc7 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -40,7 +40,7 @@
 
             {# Render grouped fields according to Form #}
             {% for group, fields in form.Meta.fieldsets %}
-              <div class="field-group my-5">
+              <div class="field-group mb-5">
                 <div class="row mb-2">
                   <h5 class="offset-sm-3">{{ group }}</h5>
                 </div>
@@ -51,7 +51,7 @@
             {% endfor %}
 
             {% if form.custom_fields %}
-              <div class="field-group my-5">
+              <div class="field-group mb-5">
                 <div class="row mb-2">
                   <h5 class="offset-sm-3">Custom Fields</h5>
                 </div>
@@ -60,7 +60,7 @@
             {% endif %}
 
             {% if form.comments %}
-              <div class="field-group my-5">
+              <div class="field-group mb-5">
                 <h5 class="text-center">Comments</h5>
                 {% render_field form.comments %}
               </div>
@@ -68,7 +68,7 @@
 
           {% else %}
             {# Render all fields in a single group #}
-            <div class="field-group my-5">
+            <div class="field-group mb-5">
               {% block form_fields %}{% render_form form %}{% endblock %}
             </div>
           {% endif %}
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 007215b6e..0e1b42b28 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -346,11 +346,7 @@ class ExpandableNameField(forms.CharField):
         if not self.help_text:
             self.help_text = """
                 Alphanumeric ranges are supported for bulk creation. Mixed cases and types within a single range
-                are not supported. Examples:
-                <ul>
-                    <li><code>[ge,xe]-0/0/[0-9]</code></li>
-                    <li><code>e[0-3][a-d,f]</code></li>
-                </ul>
+                are not supported. Example: <code>[ge,xe]-0/0/[0-9]</code>
                 """
 
     def to_python(self, value):