diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 3456eee35..b69944cf6 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1738,6 +1738,9 @@ class FrontPortTemplateCreateForm(ComponentTemplateCreateForm):
         choices=PortTypeChoices,
         widget=StaticSelect()
     )
+    color = ColorField(
+        required=False
+    )
     rear_port_set = forms.MultipleChoiceField(
         choices=[],
         label='Rear ports',
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 376e4b919..f4977c9c3 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -147,6 +147,10 @@ class RouteTargetForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         fields = [
             'name', 'description', 'tenant_group', 'tenant', 'tags',
         ]
+        fieldsets = (
+            ('Route Target', ('name', 'description', 'tags')),
+            ('Tenancy', ('tenant_group', 'tenant')),
+        )
 
 
 class RouteTargetCSVForm(CustomFieldModelCSVForm):
@@ -626,9 +630,8 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilter
     model = Prefix
     field_groups = [
         ['q', 'tag'],
-        ['within_include', 'family', 'status', 'role_id'],
+        ['within_include', 'family', 'status', 'role_id', 'mask_length', 'is_pool', 'mark_utilized'],
         ['vrf_id', 'present_in_vrf_id'],
-        ['mask_length', 'is_pool', 'mark_utilized'],
         ['region_id', 'site_group_id', 'site_id'],
         ['tenant_group_id', 'tenant_id']
     ]
@@ -1270,9 +1273,8 @@ class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFil
     ]
     field_groups = [
         ['q', 'tag'],
-        ['parent', 'family', 'status', 'role'],
+        ['parent', 'family', 'status', 'role', 'mask_length', 'assigned_to_interface'],
         ['vrf_id', 'present_in_vrf_id'],
-        ['mask_length', 'assigned_to_interface'],
         ['tenant_group_id', 'tenant_id'],
     ]
     q = forms.CharField(
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 96c2c892e..e4bb7d693 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -548,7 +548,7 @@ class VLANTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = VLAN
-        fields = ('pk', 'vid', 'site', 'group', 'name', 'tenant', 'status', 'role', 'description')
+        fields = ('pk', 'vid', 'name', 'site', 'group', 'tenant', 'status', 'role', 'description')
         row_attrs = {
             'class': lambda record: 'success' if not isinstance(record, VLAN) else '',
         }
@@ -566,8 +566,8 @@ class VLANDetailTable(VLANTable):
     )
 
     class Meta(VLANTable.Meta):
-        fields = ('pk', 'vid', 'site', 'group', 'name', 'prefixes', 'tenant', 'status', 'role', 'description', 'tags')
-        default_columns = ('pk', 'vid', 'site', 'group', 'name', 'prefixes', 'tenant', 'status', 'role', 'description')
+        fields = ('pk', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description', 'tags')
+        default_columns = ('pk', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description')
 
 
 class VLANMembersTable(BaseTable):
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 7b22c5d65..bf26d7fe3 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -24,7 +24,7 @@
                     </tr>
                     <tr>
                         <th scope="row">Circuit ID</th>
-                        <td><code>{{ object.cid }}</code></td>
+                        <td>{{ object.cid }}</td>
                     </tr>
                     <tr>
                         <th scope="row">Type</th>
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 3b0a84219..e2fe6af29 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -54,9 +54,9 @@
                     {% endif %}
                     <a href="{{ peer.get_absolute_url }}">{{ peer }}</a>
                   {% endwith %}
-                  <div class="float-md-end mt-3 mt-md-0">
+                  <div class="mt-1">
                     <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
-                      <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
+                      <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i> Trace
                     </a>
                     {% if perms.dcim.delete_cable %}
                       <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-sm lh-1">
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 676dbf096..8eb84993c 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -27,10 +27,10 @@
                         </tr>
                         <tr>
                             <th scope="row">Type</th>
-                            <td>{{ object.get_type_display }}</td>
+                            <td>{{ object.get_type_display|placeholder }}</td>
                         </tr>
                         <tr>
-                            <td scope="row">Speed</td>
+                            <th scope="row">Speed</th>
                             <td>{{ object.get_speed_display|placeholder }}</td>
                     </tr>
                         <tr>
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 3c3699c91..85d76f14f 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -26,7 +26,7 @@
             </td>
           </tr>
           <tr>
-            <td>Inventory Items</td>
+            <th scope="row">Inventory Items</th>
             <td>
               <a href="{% url 'dcim:inventoryitem_list' %}?manufacturer_id={{ object.pk }}">{{ inventory_item_count }}</a>
             </td>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 0e8366e4a..43760ed80 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -34,7 +34,7 @@
                     <tr>
                         <td>Utilization</td>
                         <td>
-                            {{ object.get_utilization }}%
+                            {% utilization_graph object.get_utilization %}
                         </td>
                     </tr>
                     <tr>
diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html
index 9fbd3b9e6..20c9df0d4 100644
--- a/netbox/templates/ipam/service_edit.html
+++ b/netbox/templates/ipam/service_edit.html
@@ -24,10 +24,10 @@
     {% render_field form.name %}
     <div class="row">
         <label class="col-sm-3 col-form-label text-lg-end">Port(s)</label>
-        <div class="col-2">
+        <div class="col-3">
             {{ form.protocol }}
         </div>
-        <div class="col-7">
+        <div class="col-6">
             {{ form.ports }}
         </div>
     </div>
diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html
index fec0da220..082a4d37a 100644
--- a/netbox/templates/virtualization/cluster/base.html
+++ b/netbox/templates/virtualization/cluster/base.html
@@ -13,13 +13,13 @@
 
 {% block extra_controls %}
   {% if perms.virtualization.change_cluster and perms.virtualization.add_virtualmachine %}
-    <a href="{% url 'virtualization:virtualmachine_add' %}?cluster_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'virtualization:virtualmachine_add' %}?cluster={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Virtual Machine
     </a>
   {% endif %}
 
   {% if perms.virtualization.change_cluster %}
-    <a href="{% url 'virtualization:cluster_add_devices' pk=object.pk %}?site_id={{ object.site.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+    <a href="{% url 'virtualization:cluster_add_devices' pk=object.pk %}?site={{ object.site.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Assign Device
     </a>
   {% endif %}