diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html
index 9aee57a8a..ab7f835c3 100644
--- a/netbox/templates/extras/object_changelog.html
+++ b/netbox/templates/extras/object_changelog.html
@@ -1,7 +1,8 @@
 {% extends base_template %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
-    {% include 'inc/panel_table.html' %}
+    {% render_table table 'inc/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 7cbb70e49..654d68e7c 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -1,5 +1,6 @@
 {% extends base_template %}
 {% load form_helpers %}
+{% load render_table from django_tables2 %}
 
 {% render_errors form %}
 
@@ -23,8 +24,6 @@
         </div>
     </form>
     {% endif %}
-    <div class="col col-md-9 mb-3">
-        {% include 'inc/panel_table.html' %}
-    </div>
+    {% render_table table 'inc/table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 5f73eb0cd..7b837dd23 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -30,31 +30,29 @@
 {% if table.paginator.num_pages > 1 %}
 {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
   <div id="select-all-box" class="d-none card noprint">
-    <div class="row mb-3">
-      <form method="post" class="form col-md-12">
-        {% csrf_token %}
-        <div class="card-body d-inline-flex justify-content-between align-items-center">
-          <div class="form-check">
-            <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
-            <label for="select-all" class="form-check-label">
-              Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> Matching Query
-            </label>
-          </div>
-          <div class="float-end">
-            {% if bulk_edit_url and permissions.change %}
-              <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled>
-                <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
-              </button>
-            {% endif %}
-            {% if bulk_delete_url and permissions.delete %}
-              <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled>
-                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
-              </button>
-            {% endif %}
-          </div>
+    <form method="post" class="form col-md-12">
+      {% csrf_token %}
+      <div class="card-body">
+        <div class="float-end">
+          {% if bulk_edit_url and permissions.change %}
+            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled>
+              <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
+            </button>
+          {% endif %}
+          {% if bulk_delete_url and permissions.delete %}
+            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled>
+              <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
+            </button>
+          {% endif %}
         </div>
-      </form>
-    </div>
+        <div class="form-check">
+          <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
+          <label for="select-all" class="form-check-label">
+            Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
+          </label>
+        </div>
+      </div>
+    </form>
   </div>
 {% endwith %}
 {% endif %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index d8fb04558..4696465c7 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='inc/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 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 ae31979d9..effdbfab7 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -138,7 +138,7 @@
             </div>
         {% endif %}
         <div class="my-3">
-        {% include 'utilities/obj_table.html' with table=related_ips_table table_template='inc/panel_table.html' heading='Related IP Addresses' %}
+        {% include 'utilities/obj_table.html' with table=related_ips_table 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 4df17b53b..2aa195073 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='inc/panel_table.html' %}
+                {% include 'utilities/obj_table.html' %}
             </div>
         </div>
     {% endif %}
diff --git a/netbox/templates/ipam/prefix/base.html b/netbox/templates/ipam/prefix/base.html
index 59dd25a7e..9edeef167 100644
--- a/netbox/templates/ipam/prefix/base.html
+++ b/netbox/templates/ipam/prefix/base.html
@@ -17,22 +17,21 @@
 {% endblock %}
 
 {% block tab_items %}
-<li role="presentation" class="nav-item">
+  <li role="presentation" class="nav-item">
     <a class="nav-link{% if not active_tab %} active{% endif %}" href="{% url 'ipam:prefix' pk=object.pk %}">
-        Prefix
+      Prefix
     </a>
-</li>
-<li role="presentation" class="nav-item">
-    <a class="nav-link{% if active_tab %} active{% endif %}" href="{% url 'ipam:prefix_prefixes' pk=object.pk %}">
-        Child Prefixes <span class="badge bg-primary">{{ object.get_child_prefixes.count }}</span>
+  </li>
+  <li role="presentation" class="nav-item">
+    <a class="nav-link{% if active_tab == 'prefixes' %} active{% endif %}" href="{% url 'ipam:prefix_prefixes' pk=object.pk %}">
+      Child Prefixes <span class="badge bg-primary">{{ object.get_child_prefixes.count }}</span>
     </a>
-</li>
-{% if perms.ipam.view_ipaddress and object.status != 'container' %}
-<li role="presentation" class="nav-item">
-    <a class="nav-link{% if active_tab %} active{% endif %}" href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">
+  </li>
+  {% if perms.ipam.view_ipaddress and object.status != 'container' %}
+    <li role="presentation" class="nav-item">
+      <a class="nav-link{% if active_tab == 'ip-addresses' %} active{% endif %}" href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">
         IP Addresses <span class="badge bg-primary">{{ object.get_child_ips.count }}</span>
-    </a>
-</li>
-{% endif %}
-
+      </a>
+    </li>
+  {% endif %}
 {% endblock %}
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index 09c800b01..d67e136f0 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='inc/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 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 b33288768..4f18c476c 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='inc/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 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/vlan/interfaces.html b/netbox/templates/ipam/vlan/interfaces.html
index a114c9c74..d0eff51e5 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='inc/panel_table.html' heading='Device Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table 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 68cde9d1e..33e78a39f 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='inc/panel_table.html' heading='Virtual Machine Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table heading='Virtual Machine Interfaces' parent=vlan %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index d87c09f90..ad14de48d 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -4,14 +4,8 @@
         {% 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 %}" />
         {% if table.paginator.num_pages > 1 %}
-            <div id="select_all_box" class="hidden card noprint">
+            <div id="select-all-box" class="d-none card noprint">
                 <div class="card-body">
-                    <div class="checkbox-inline">
-                        <label for="select_all">
-                            <input type="checkbox" id="select_all" name="_all" />
-                            Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
-                        </label>
-                    </div>
                     <div class="float-end">
                         {% if bulk_edit_url and permissions.change %}
                             <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
@@ -24,6 +18,12 @@
                             </button>
                         {% endif %}
                     </div>
+                    <div class="form-check">
+                      <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
+                      <label for="select-all" class="form-check-label">
+                        Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
+                      </label>
+                    </div>
                 </div>
             </div>
         {% endif %}