diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html
index 286cd2bca..0c38f15e7 100644
--- a/netbox/templates/dcim/rack_edit.html
+++ b/netbox/templates/dcim/rack_edit.html
@@ -3,7 +3,7 @@
{% block form %}
-
Rack
+ Rack
{% render_field form.region %}
{% render_field form.site_group %}
{% render_field form.site %}
@@ -14,18 +14,18 @@
{% render_field form.tags %}
-
Inventory Control
+ Inventory Control
{% render_field form.facility_id %}
{% render_field form.serial %}
{% render_field form.asset_tag %}
-
Tenancy
+ Tenancy
{% render_field form.tenant_group %}
{% render_field form.tenant %}
-
Dimensions
+ Dimensions
{% render_field form.type %}
{% render_field form.width %}
{% render_field form.u_height %}
@@ -48,12 +48,12 @@
{% if form.custom_fields %}
-
Custom Fields
+ Custom Fields
{% render_custom_fields form %}
{% endif %}
-
Comments
+ Comments
{% render_field form.comments %}
{% endblock %}
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index 0ebd9b317..691762508 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -30,7 +30,7 @@
{# Render grouped fields according to Form #}
{% for group, fields in form.Meta.fieldsets %}
-
{{ group }}
+
{{ group }}
{% for name in fields %}
{% render_field form|getfield:name %}
{% endfor %}
@@ -39,14 +39,14 @@
{% if form.custom_fields %}
-
Custom Fields
+ Custom Fields
{% render_custom_fields form %}
{% endif %}
{% if form.comments %}
-
Comments
+ Comments
{% render_field form.comments %}
{% endif %}
@@ -54,7 +54,7 @@
{% else %}
{# Render all fields in a single group #}
-
{{ obj_type|capfirst }}
+ {{ obj_type|capfirst }}
{% block form_fields %}{% render_form form %}{% endblock %}
{% endif %}
diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html
index b38a85e2e..6dccb5ee9 100644
--- a/netbox/templates/ipam/ipaddress_bulk_add.html
+++ b/netbox/templates/ipam/ipaddress_bulk_add.html
@@ -7,7 +7,7 @@
{% block form %}
{% include 'ipam/inc/ipadress_edit_header.html' with active_tab='bulk_add' %}
-
IP Addresses
+ IP Addresses
{% render_field form.pattern %}
{% render_field model_form.status %}
{% render_field model_form.role %}
@@ -16,13 +16,13 @@
{% render_field model_form.tags %}
-
Tenancy
+ Tenancy
{% render_field model_form.tenant_group %}
{% render_field model_form.tenant %}
{% if model_form.custom_fields %}
-
Custom Fields
+ Custom Fields
{% render_custom_fields model_form %}
{% endif %}
diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html
index ecee24cce..dd256207f 100644
--- a/netbox/templates/ipam/service_edit.html
+++ b/netbox/templates/ipam/service_edit.html
@@ -3,7 +3,7 @@
{% block form %}
-
Service
+
Service
{% if obj.device %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 49231e116..990f17a00 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -5,7 +5,7 @@
{% block form %}
-
VLAN
+ VLAN
{% render_field form.vid %}
{% render_field form.name %}
{% render_field form.status %}
@@ -14,12 +14,12 @@
{% render_field form.tags %}
-
Tenancy
+ Tenancy
{% render_field form.tenant_group %}
{% render_field form.tenant %}
-
Assignment
+
Assignment
{% with site_tab_active=form.initial.site %}
{% if form.custom_fields %}
-
Custom Fields
+ Custom Fields
{% render_custom_fields form %}
{% endif %}
diff --git a/netbox/templates/ipam/vlangroup_edit.html b/netbox/templates/ipam/vlangroup_edit.html
index 65a5e7a03..9f92aa2cb 100644
--- a/netbox/templates/ipam/vlangroup_edit.html
+++ b/netbox/templates/ipam/vlangroup_edit.html
@@ -4,13 +4,13 @@
{% block form %}
-
VLAN Group
+ VLAN Group
{% render_field form.name %}
{% render_field form.slug %}
{% render_field form.description %}
-
Scope
+ Scope
{% render_field form.scope_type %}
{% render_field form.region %}
{% render_field form.sitegroup %}
@@ -22,7 +22,7 @@
{% if form.custom_fields %}
-
Custom Fields
+ Custom Fields
{% render_custom_fields form %}
{% endif %}
diff --git a/netbox/templates/users/change_password.html b/netbox/templates/users/change_password.html
index da8a24438..a0c08035c 100644
--- a/netbox/templates/users/change_password.html
+++ b/netbox/templates/users/change_password.html
@@ -9,7 +9,7 @@