diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index c00d955ef..73f11b1d1 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -34,15 +34,15 @@
   {% endif %}
   </div>
 </div>
-{% endblock %}
+{% endblock controls %}
 
 {% block tabs %}
 <ul class="nav nav-tabs mb-3">
   {% block tab_items %}
-  <li class="nav-item" role="presentation">
-    <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
-  </li>
-  {% endblock %}
+    <li class="nav-item" role="presentation">
+      <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
+    </li>
+  {% endblock tab_items %}
   {% if perms.extras.view_journalentry %}
     {% with journal_viewname=object|viewname:'journal' %}
     {% url journal_viewname pk=object.pk as journal_url %}
@@ -62,7 +62,7 @@
     {% endwith %}
   {% endif %}
 </ul>
-{% endblock %}
+{% endblock tabs %}
 
 {% block content %}
 <p>
@@ -72,5 +72,5 @@
   </small>
   <span class="badge bg-primary">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
 </p>
-{% endblock %}
+{% endblock content %}
 {% block components %}{% endblock %}
diff --git a/netbox/templates/generic/object_bulk_add_component.html b/netbox/templates/generic/object_bulk_add_component.html
index ee8a69289..31a9e405a 100644
--- a/netbox/templates/generic/object_bulk_add_component.html
+++ b/netbox/templates/generic/object_bulk_add_component.html
@@ -37,4 +37,4 @@
         </div>
     </div>
 </form>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_bulk_delete.html b/netbox/templates/generic/object_bulk_delete.html
index 4d3697db1..a7c48931e 100644
--- a/netbox/templates/generic/object_bulk_delete.html
+++ b/netbox/templates/generic/object_bulk_delete.html
@@ -39,4 +39,4 @@
             </form>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_bulk_edit.html b/netbox/templates/generic/object_bulk_edit.html
index a131ab78c..514012a5c 100644
--- a/netbox/templates/generic/object_bulk_edit.html
+++ b/netbox/templates/generic/object_bulk_edit.html
@@ -42,4 +42,4 @@
         </div>
     </div>
 </form>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_bulk_import.html b/netbox/templates/generic/object_bulk_import.html
index 943162778..8c53edaff 100644
--- a/netbox/templates/generic/object_bulk_import.html
+++ b/netbox/templates/generic/object_bulk_import.html
@@ -127,4 +127,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_bulk_remove.html b/netbox/templates/generic/object_bulk_remove.html
index 383139765..1126b4cf3 100644
--- a/netbox/templates/generic/object_bulk_remove.html
+++ b/netbox/templates/generic/object_bulk_remove.html
@@ -37,4 +37,4 @@
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_bulk_rename.html b/netbox/templates/generic/object_bulk_rename.html
index 0e1923a46..e63f6802f 100644
--- a/netbox/templates/generic/object_bulk_rename.html
+++ b/netbox/templates/generic/object_bulk_rename.html
@@ -47,4 +47,4 @@
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_delete.html b/netbox/templates/generic/object_delete.html
index fdfda0aac..cd6ec07ab 100644
--- a/netbox/templates/generic/object_delete.html
+++ b/netbox/templates/generic/object_delete.html
@@ -4,6 +4,6 @@
 {% block title %}Delete {{ obj_type }}?{% endblock %}
 
 {% block message %}
-    <p>Are you sure you want to delete {{ obj_type }} <strong>{{ obj }}</strong>?</p>
-    {% block message_extra %}{% endblock %}
-{% endblock %}
+  <p>Are you sure you want to delete {{ obj_type }} <strong>{{ obj }}</strong>?</p>
+  {% block message_extra %}{% endblock %}
+{% endblock message %}
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index f10cceb15..9b43e51fa 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -8,7 +8,7 @@
     <i class="mdi mdi-help-circle"></i>
   </button>
   {% endif %}
-{% endblock %}
+{% endblock controls %}
 
 {% block content %}
 <form action="" method="post" enctype="multipart/form-data">
@@ -47,7 +47,7 @@
         {% block form_fields %}{% render_form form %}{% endblock %}
       </div>
       {% endif %}
-      {% endblock %}
+      {% endblock form %}
     </div>
   </div>
   <div class="row my-3">
@@ -66,11 +66,11 @@
         Create
       </button>
       {% endif %}
-      {% endblock %}
+      {% endblock buttons %}
     </div>
   </div>
 </form>
 {% if obj and settings.DOCS_ROOT %} 
   {% include 'inc/modal.html' with name='docs' content=obj|get_docs %}
 {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_import.html b/netbox/templates/generic/object_import.html
index 89c32c808..248b8c529 100644
--- a/netbox/templates/generic/object_import.html
+++ b/netbox/templates/generic/object_import.html
@@ -22,4 +22,4 @@
 		</form>
 	</div>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 13c4954f4..678cce35f 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -21,7 +21,7 @@
     {% endif %}
   </div>
 </div>
-{% endblock %}
+{% endblock controls %}
 
 {% block content %}
 {% if table.paginator.num_pages > 1 %}
@@ -111,4 +111,4 @@
     {% endif %}
 </div>
 {% table_config_form table table_name="ObjectTable" %}
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index d8c83d5d3..61353c386 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -97,4 +97,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/import_success.html b/netbox/templates/import_success.html
index a86a78c3f..7eb742ebd 100644
--- a/netbox/templates/import_success.html
+++ b/netbox/templates/import_success.html
@@ -11,4 +11,4 @@
         <span class="mdi mdi-database-import-outline" aria-hidden="true"></span>
         Import More
     </a>
-{% endblock %}
+{% endblock content %}
diff --git a/netbox/templates/layout.html b/netbox/templates/layout.html
index be3aabbf6..a52778436 100644
--- a/netbox/templates/layout.html
+++ b/netbox/templates/layout.html
@@ -101,7 +101,7 @@
               {% block controls %}{% endblock %}
 
             </div>
-          {% endblock %}
+          {% endblock header %}
 
           {# Page content #}
           <div id="content" class="container-fluid p-0 m-0">
@@ -125,4 +125,4 @@
       </main>
     </div>
   </div>
-{% endblock %}
+{% endblock layout %}
diff --git a/netbox/templates/login.html b/netbox/templates/login.html
index 2cfbfe697..006091bf8 100644
--- a/netbox/templates/login.html
+++ b/netbox/templates/login.html
@@ -67,4 +67,4 @@
     </div>
   </footer>
 
-{% endblock %}
+{% endblock layout %}
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index b7637ba98..3383bb2cd 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -65,4 +65,4 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock content %}