diff --git a/netbox/templates/403.html b/netbox/templates/403.html
index 844697aae..259206f21 100644
--- a/netbox/templates/403.html
+++ b/netbox/templates/403.html
@@ -1,4 +1,4 @@
-{% extends '40x.html' %}
+{% extends 'base/40x.html' %}
 
 {% block title %}Access Denied{% endblock %}
 
diff --git a/netbox/templates/404.html b/netbox/templates/404.html
index eec438071..766d81732 100644
--- a/netbox/templates/404.html
+++ b/netbox/templates/404.html
@@ -1,4 +1,4 @@
-{% extends '40x.html' %}
+{% extends 'base/40x.html' %}
 
 {% block title %}Page Not Found{% endblock %}
 
diff --git a/netbox/templates/40x.html b/netbox/templates/base/40x.html
similarity index 94%
rename from netbox/templates/40x.html
rename to netbox/templates/base/40x.html
index b27a157cf..bcd8d1bc0 100644
--- a/netbox/templates/40x.html
+++ b/netbox/templates/base/40x.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 
 {% block title %}{% endblock %}
 
diff --git a/netbox/templates/base.html b/netbox/templates/base/base.html
similarity index 97%
rename from netbox/templates/base.html
rename to netbox/templates/base/base.html
index 085293d0e..5c9f162c1 100644
--- a/netbox/templates/base.html
+++ b/netbox/templates/base/base.html
@@ -56,7 +56,7 @@
     {% block javascript %}{% endblock %}
 
     {# User messages #}
-    {% include './messages.html' %}
+    {% include 'inc/messages.html' %}
 
     {# Data container #}
     <div id="netbox-data" style="display: none!important; visibility: hidden!important">
diff --git a/netbox/templates/layout.html b/netbox/templates/base/layout.html
similarity index 97%
rename from netbox/templates/layout.html
rename to netbox/templates/base/layout.html
index a52778436..e455201cc 100644
--- a/netbox/templates/layout.html
+++ b/netbox/templates/base/layout.html
@@ -1,5 +1,5 @@
 {# Base layout for the core NetBox UI w/navbar and page content #}
-{% extends 'base.html' %}
+{% extends 'base/base.html' %}
 {% load nav %}
 {% load search_options %}
 {% load static %}
@@ -26,7 +26,7 @@
                 {% search_options %}
               </div>
               <div class="d-flex d-md-none mx-1 my-3 justify-content-end">
-                {% include './profile_button.html' %}
+                {% include 'inc/profile_button.html' %}
               </div>
               {% nav %}
             </ul>
@@ -81,7 +81,7 @@
             </div>
             <div class="d-none d-md-flex w-100 search-container">
               {% search_options %}
-              {% include './profile_button.html' %}
+              {% include 'inc/profile_button.html' %}
             </div>
         </nav>
 
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html
index 6877cfedc..bce3f3186 100644
--- a/netbox/templates/dcim/cable_connect.html
+++ b/netbox/templates/dcim/cable_connect.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load static %}
 {% load helpers %}
 {% load form_helpers %}
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index e89d12ce9..098f790e1 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block header %}
diff --git a/netbox/templates/dcim/connections_list.html b/netbox/templates/dcim/connections_list.html
index 3b8665947..8505d9ec4 100644
--- a/netbox/templates/dcim/connections_list.html
+++ b/netbox/templates/dcim/connections_list.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load buttons %}
 
 {% block title %}{{ title }}{% endblock %}
@@ -10,7 +10,7 @@
     <div class="col col-md-9">
         <div class="card">
             <div class="card-body">
-                {% include 'responsive_table.html' %}
+                {% include 'inc/responsive_table.html' %}
             </div>
         </div>
         {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html
index e8b82f2c0..d643ee145 100644
--- a/netbox/templates/dcim/device_component_add.html
+++ b/netbox/templates/dcim/device_component_add.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% block title %}Create {{ component_type }}{% endblock %}
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index ffe2caf8b..a83b56474 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% render_errors form %}
diff --git a/netbox/templates/dcim/devicetype_component_add.html b/netbox/templates/dcim/devicetype_component_add.html
index 552dd8853..567b2b280 100644
--- a/netbox/templates/dcim/devicetype_component_add.html
+++ b/netbox/templates/dcim/devicetype_component_add.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% block title %}Add {{ component_type }} to {{ parent }}{% endblock %}
diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html
index e61cb2996..dd79a668c 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/inc/devicetype_component_table.html
@@ -7,7 +7,7 @@
                 {{ title }}
             </h5>
             <div class="card-body">
-                {% include 'responsive_table.html' %}
+                {% include 'inc/responsive_table.html' %}
             </div>
             <div class="card-footer noprint">
                 {% if table.rows %}
@@ -37,7 +37,7 @@
             {{ title }}
         </h5>
         <div class="card-body">
-            {% include 'responsive_table.html' %}
+            {% include 'inc/responsive_table.html' %}
         </div>
     </div>
 {% endif %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 54cfc2604..eb3f61672 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -291,12 +291,12 @@
     </div>
     <div class="row mb-3">
         <div class="col col-md-12">
-            {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+            {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
         </div>
     </div>
     <div class="row mb-3">
         <div class="col col-md-12">
-            {% include 'panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %}
+            {% include 'inc/panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %}
         </div>
     </div>
     <div class="row mb-3">
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index 363b92779..7bd566e36 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load static %}
 
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index b7818b47f..e8c0dac59 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 195855620..d3e3f927f 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/exceptions/import_error.html b/netbox/templates/exceptions/import_error.html
index 776014e6f..e8ee7ae2c 100644
--- a/netbox/templates/exceptions/import_error.html
+++ b/netbox/templates/exceptions/import_error.html
@@ -16,4 +16,4 @@
         has recently been upgraded, check that the WSGI service (e.g. gunicorn or uWSGI) has been restarted. This
         ensures that the new code is running.
     </p>
-{% endblock %}
+{% endblock message %}
diff --git a/netbox/templates/exceptions/permission_error.html b/netbox/templates/exceptions/permission_error.html
index d6fb3d18c..dcff62bf9 100644
--- a/netbox/templates/exceptions/permission_error.html
+++ b/netbox/templates/exceptions/permission_error.html
@@ -9,4 +9,4 @@
         media root is <code>{{ settings.MEDIA_ROOT }}</code>. Ensure that the user NetBox runs as has access to write
         files to all locations within this path.
     </p>
-{% endblock %}
+{% endblock message %}
diff --git a/netbox/templates/exceptions/programming_error.html b/netbox/templates/exceptions/programming_error.html
index d55c311cc..3b9e84567 100644
--- a/netbox/templates/exceptions/programming_error.html
+++ b/netbox/templates/exceptions/programming_error.html
@@ -14,4 +14,4 @@
         can check this by connecting to the database using NetBox's credentials and issuing a query for
         <code>SELECT VERSION()</code>.
     </p>
-{% endblock %}
+{% endblock message %}
diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html
index 48df5161f..af65a9deb 100644
--- a/netbox/templates/extras/object_changelog.html
+++ b/netbox/templates/extras/object_changelog.html
@@ -3,7 +3,7 @@
 {% block title %}{{ object }} - Change Log{% endblock %}
 
 {% block content %}
-    {% include 'panel_table.html' %}
+    {% include 'inc/panel_table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     <div class="text-muted">
         Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index bcb070b22..04cbfd3dd 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -26,7 +26,7 @@
     </form>
     {% endif %}
     <div class="col col-md-9 mb-3">
-        {% include 'panel_table.html' %}
+        {% include 'inc/panel_table.html' %}
     </div>
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}
diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index 1df3bf5bc..caffd80b0 100644
--- a/netbox/templates/extras/objectchange.html
+++ b/netbox/templates/extras/objectchange.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }}{% endblock %}
@@ -155,7 +155,7 @@
 </div>
 <div class="row mb-3">
     <div class="col col-md-12">
-        {% include 'panel_table.html' with table=related_changes_table heading='Related Changes' panel_class='default' %}
+        {% include 'inc/panel_table.html' with table=related_changes_table heading='Related Changes' panel_class='default' %}
         {% if related_changes_count > related_changes_table.rows|length %}
             <div class="float-end">
                 <a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">See All {{ related_changes_count|add:"1" }} Changes</a>
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 23a91b150..e914e2776 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}{{ report.name }}{% endblock %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 8ce3fd931..c97e78c4e 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}Reports{% endblock %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 683319fca..47a8c1f77 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 {% load log_levels %}
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 290d7d64f..d271723d5 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}Scripts{% endblock %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 6d036251c..d8e25697d 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 {% load log_levels %}
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 7b50832fa..5caf81a9f 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -51,7 +51,7 @@
     </div>
   </div>
   <div class="col col-md-6">
-    {% include 'panel_table.html' with table=items_table heading='Tagged Objects' %}
+    {% include 'inc/panel_table.html' with table=items_table heading='Tagged Objects' %}
     {% include 'inc/paginator.html' with paginator=items_table.paginator page=items_table.page %}
   </div>
 </div>
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 73f11b1d1..db40cc264 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load buttons %}
 {% load custom_links %}
 {% load helpers %}
diff --git a/netbox/templates/generic/object_bulk_add_component.html b/netbox/templates/generic/object_bulk_add_component.html
index 31a9e405a..e9eadf92c 100644
--- a/netbox/templates/generic/object_bulk_add_component.html
+++ b/netbox/templates/generic/object_bulk_add_component.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% block title %}Add {{ model_name|title }}{% endblock %}
diff --git a/netbox/templates/generic/object_bulk_delete.html b/netbox/templates/generic/object_bulk_delete.html
index a7c48931e..df41b4642 100644
--- a/netbox/templates/generic/object_bulk_delete.html
+++ b/netbox/templates/generic/object_bulk_delete.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}Delete {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %}
diff --git a/netbox/templates/generic/object_bulk_edit.html b/netbox/templates/generic/object_bulk_edit.html
index 514012a5c..78309de7a 100644
--- a/netbox/templates/generic/object_bulk_edit.html
+++ b/netbox/templates/generic/object_bulk_edit.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/generic/object_bulk_import.html b/netbox/templates/generic/object_bulk_import.html
index 8c53edaff..2fbd00058 100644
--- a/netbox/templates/generic/object_bulk_import.html
+++ b/netbox/templates/generic/object_bulk_import.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/generic/object_bulk_remove.html b/netbox/templates/generic/object_bulk_remove.html
index 1126b4cf3..cf18bf1cc 100644
--- a/netbox/templates/generic/object_bulk_remove.html
+++ b/netbox/templates/generic/object_bulk_remove.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 
 {% block title %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %}
diff --git a/netbox/templates/generic/object_bulk_rename.html b/netbox/templates/generic/object_bulk_rename.html
index e63f6802f..78501825b 100644
--- a/netbox/templates/generic/object_bulk_rename.html
+++ b/netbox/templates/generic/object_bulk_rename.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index 9b43e51fa..01a044fc6 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %} {% load form_helpers %} {% load helpers %} 
+{% extends 'base/layout.html' %} {% load form_helpers %} {% load helpers %}
 
 {% block title %}{% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}
 
diff --git a/netbox/templates/generic/object_import.html b/netbox/templates/generic/object_import.html
index 248b8c529..f8024b5ae 100644
--- a/netbox/templates/generic/object_import.html
+++ b/netbox/templates/generic/object_import.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 678cce35f..52d47b54e 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load render_table from django_tables2 %}
@@ -78,7 +78,7 @@
                 <form method="post" class="form form-horizontal">
                     {% csrf_token %}
                     <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
-                    {% include table_template|default:'responsive_table.html' %}
+                    {% include table_template|default:'inc/responsive_table.html' %}
                     <div class="float-start noprint bulk-buttons">
                         {% block bulk_buttons %}{% endblock %}
                         {% if bulk_edit_url and permissions.change %}
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 61353c386..1b45d5fd2 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load get_status %}
 {% load helpers %}
 
diff --git a/netbox/templates/import_success.html b/netbox/templates/import_success.html
index 7eb742ebd..6feb7dab5 100644
--- a/netbox/templates/import_success.html
+++ b/netbox/templates/import_success.html
@@ -1,9 +1,9 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 
 {% block title %}Import Completed{% endblock %}
 
 {% block content %}
-    {% include 'responsive_table.html' %}
+    {% include 'inc/responsive_table.html' %}
     {% if return_url %}
         <a href="{{ return_url }}" class="btn btn-outline-dark">View All</a>
     {% endif %}
diff --git a/netbox/templates/messages.html b/netbox/templates/inc/messages.html
similarity index 100%
rename from netbox/templates/messages.html
rename to netbox/templates/inc/messages.html
diff --git a/netbox/templates/panel_table.html b/netbox/templates/inc/panel_table.html
similarity index 100%
rename from netbox/templates/panel_table.html
rename to netbox/templates/inc/panel_table.html
diff --git a/netbox/templates/profile_button.html b/netbox/templates/inc/profile_button.html
similarity index 100%
rename from netbox/templates/profile_button.html
rename to netbox/templates/inc/profile_button.html
diff --git a/netbox/templates/responsive_table.html b/netbox/templates/inc/responsive_table.html
similarity index 100%
rename from netbox/templates/responsive_table.html
rename to netbox/templates/inc/responsive_table.html
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 6ad1e3d15..609a450f0 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -77,7 +77,7 @@
 </div>
 <div class="row mb-3">
     <div class="col col-md-12">
-        {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+        {% include 'utilities/obj_table.html' with table=prefix_table table_template='inc/panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
 	</div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index dffffd1f1..ae31979d9 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -114,7 +114,7 @@
 	</div>
     
 	<div class="col col-md-8">
-        {% include 'panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}
+        {% include 'inc/panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}
         {% if duplicate_ips_table.rows %}
             {# Custom version of panel_table.html #}
             <div class="card bg-danger">
@@ -138,7 +138,7 @@
             </div>
         {% endif %}
         <div class="my-3">
-        {% include 'utilities/obj_table.html' with table=related_ips_table table_template='panel_table.html' heading='Related IP Addresses' %}
+        {% include 'utilities/obj_table.html' with table=related_ips_table table_template='inc/panel_table.html' heading='Related IP Addresses' %}
         </div>
         {% plugin_right_page object %}
 	</div>
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index c87d1ead1..48b04c8aa 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -34,7 +34,7 @@
         <div class="row mb-3">
             <div class="col col-md-12">
                 <h3>Search Results</h3>
-                {% include 'utilities/obj_table.html' with table_template='panel_table.html' %}
+                {% include 'utilities/obj_table.html' with table_template='inc/panel_table.html' %}
             </div>
         </div>
     {% endif %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 36675aa13..08270f760 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -117,9 +117,9 @@
     </div>
     <div class="col col-md-7">
         {% if duplicate_prefix_table.rows %}
-            {% include 'panel_table.html' with table=duplicate_prefix_table heading='Duplicate Prefixes' %}
+            {% include 'inc/panel_table.html' with table=duplicate_prefix_table heading='Duplicate Prefixes' %}
         {% endif %}
-        {% include 'panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' %}
+        {% include 'inc/panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index 4d422b682..09c800b01 100644
--- a/netbox/templates/ipam/prefix/ip_addresses.html
+++ b/netbox/templates/ipam/prefix/ip_addresses.html
@@ -12,7 +12,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+      {% include 'utilities/obj_table.html' with table=ip_table table_template='inc/panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html
index a83b3ac12..b33288768 100644
--- a/netbox/templates/ipam/prefix/prefixes.html
+++ b/netbox/templates/ipam/prefix/prefixes.html
@@ -19,7 +19,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
+      {% include 'utilities/obj_table.html' with table=prefix_table table_template='inc/panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index c2c7fd7ed..c29bdc0bd 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -42,9 +42,9 @@
 	</div>
 	<div class="col col-md-6">
         <div class="mb-4">
-        {% include 'panel_table.html' with table=importing_vrfs_table heading="Importing VRFs" %}
+        {% include 'inc/panel_table.html' with table=importing_vrfs_table heading="Importing VRFs" %}
         </div>
-        {% include 'panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
+        {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 094310d9b..397a0a2a8 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -87,7 +87,7 @@
                     Prefixes
                 </h5>
                 <div class="card-body">
-                    {% include 'responsive_table.html' with table=prefix_table %}
+                    {% include 'inc/responsive_table.html' with table=prefix_table %}
                 </div>
                 {% if perms.ipam.add_prefix %}
                 <div class="card-footer text-end noprint">
diff --git a/netbox/templates/ipam/vlan/interfaces.html b/netbox/templates/ipam/vlan/interfaces.html
index 9f59e21ab..a114c9c74 100644
--- a/netbox/templates/ipam/vlan/interfaces.html
+++ b/netbox/templates/ipam/vlan/interfaces.html
@@ -3,7 +3,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Device Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table table_template='inc/panel_table.html' heading='Device Interfaces' parent=vlan %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan/vminterfaces.html b/netbox/templates/ipam/vlan/vminterfaces.html
index 7ecc8ef93..68cde9d1e 100644
--- a/netbox/templates/ipam/vlan/vminterfaces.html
+++ b/netbox/templates/ipam/vlan/vminterfaces.html
@@ -3,7 +3,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Virtual Machine Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table table_template='inc/panel_table.html' heading='Virtual Machine Interfaces' parent=vlan %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 0fa79aec9..937c1d6de 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -66,8 +66,8 @@
         {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-        {% include 'panel_table.html' with table=import_targets_table heading="Import Route Targets" %}
-        {% include 'panel_table.html' with table=export_targets_table heading="Export Route Targets" %}
+        {% include 'inc/panel_table.html' with table=import_targets_table heading="Import Route Targets" %}
+        {% include 'inc/panel_table.html' with table=export_targets_table heading="Export Route Targets" %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/login.html b/netbox/templates/login.html
index 006091bf8..5f56e7b9a 100644
--- a/netbox/templates/login.html
+++ b/netbox/templates/login.html
@@ -1,5 +1,5 @@
 {# User login page. Extends base.html directly to override normal UI layout. #}
-{% extends 'base.html' %}
+{% extends 'base/base.html' %}
 {% load form_helpers %}
 {% load static %}
 
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index 3383bb2cd..24cd0b3bd 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
@@ -11,7 +11,7 @@
                 <div class="col col-md-9">
                     {% for obj_type in results %}
                         <h3 id="{{ obj_type.name|lower }}">{{ obj_type.name|bettertitle }}</h3>
-                        {% include 'panel_table.html' with table=obj_type.table %}
+                        {% include 'inc/panel_table.html' with table=obj_type.table %}
                         <a href="{{ obj_type.url }}" class="btn btn-primary float-end my-3">
                             <i class="mdi mdi-arrow-right-bold" aria-hidden="true"></i>
                             {% if obj_type.table.page.has_next %}
diff --git a/netbox/templates/search_form.html b/netbox/templates/search_form.html
deleted file mode 100644
index a4dcc79d3..000000000
--- a/netbox/templates/search_form.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="row" style="padding-bottom: 20px">
-    <div class="col col-md-12 text-center">
-        <form action="{% url 'search' %}" method="get" class="form-inline">
-            <input type="text" name="q" value="{{ request.GET.q }}" placeholder="Search" id="id_q" class="form-control" style="width: 350px" />
-            {{ search_form.obj_type }}
-            <button type="submit" class="btn btn-primary">Search</button>
-        </form>
-    </div>
-</div>
diff --git a/netbox/templates/users/base.html b/netbox/templates/users/base.html
index 503b081ad..712339fd4 100644
--- a/netbox/templates/users/base.html
+++ b/netbox/templates/users/base.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 
 {% block title %}{% endblock %}
 
diff --git a/netbox/templates/utilities/confirmation_form.html b/netbox/templates/utilities/confirmation_form.html
index e1e420bb0..32ba3345f 100644
--- a/netbox/templates/utilities/confirmation_form.html
+++ b/netbox/templates/utilities/confirmation_form.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load form_helpers %}
 
 {% block content %}
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index 061fe7428..d87c09f90 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -27,7 +27,7 @@
                 </div>
             </div>
         {% endif %}
-        {% include table_template|default:'responsive_table.html' %}
+        {% include table_template|default:'inc/responsive_table.html' %}
         <div class="float-start noprint">
             {% block extra_actions %}{% endblock %}
             {% if bulk_edit_url and permissions.change %}
@@ -43,7 +43,7 @@
         </div>
     </form>
 {% else %}
-    {% include table_template|default:'responsive_table.html' %}
+    {% include table_template|default:'inc/responsive_table.html' %}
 {% endif %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 <div class="clearfix"></div>
diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html
index 99f8d43df..658162243 100644
--- a/netbox/templates/virtualization/cluster/devices.html
+++ b/netbox/templates/virtualization/cluster/devices.html
@@ -11,7 +11,7 @@
       <form action="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}" method="post">
       {% csrf_token %}
       <div class="card-body">
-        {% include 'responsive_table.html' with table=devices_table %}
+        {% include 'inc/responsive_table.html' with table=devices_table %}
       </div>
       {% if perms.virtualization.change_cluster %}
         <div class="card-footer noprint">
diff --git a/netbox/templates/virtualization/cluster/virtual_machines.html b/netbox/templates/virtualization/cluster/virtual_machines.html
index d50b9d792..5c92f14cb 100644
--- a/netbox/templates/virtualization/cluster/virtual_machines.html
+++ b/netbox/templates/virtualization/cluster/virtual_machines.html
@@ -9,7 +9,7 @@
         Virtual Machines
       </h5>
       <div class="card-body">
-        {% include 'responsive_table.html' with table=virtualmachines_table %}
+        {% include 'inc/responsive_table.html' with table=virtualmachines_table %}
       </div>
     </div>
   </div>
diff --git a/netbox/templates/virtualization/virtualmachine_component_add.html b/netbox/templates/virtualization/virtualmachine_component_add.html
index 2d64b919c..939acb1c4 100644
--- a/netbox/templates/virtualization/virtualmachine_component_add.html
+++ b/netbox/templates/virtualization/virtualmachine_component_add.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index afa3164a6..5429aadd0 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -102,12 +102,12 @@
 </div>
 <div class="row mb-3">
     <div class="col col-md-12">
-        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+        {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
     </div>
 </div>
 <div class="row mb-3">
     <div class="col col-md-12">
-        {% include 'panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %}
+        {% include 'inc/panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %}
     </div>
 </div>
 <div class="row">