diff --git a/netbox/templates/ipam/aggregate_list.html b/netbox/templates/ipam/aggregate_list.html
index 27363a56d..85a2bd36d 100644
--- a/netbox/templates/ipam/aggregate_list.html
+++ b/netbox/templates/ipam/aggregate_list.html
@@ -1,31 +1,14 @@
-{% extends '_base.html' %}
-{% load buttons %}
+{% extends 'utilities/obj_list.html' %}
{% load humanize %}
-{% block content %}
-
- {% if perms.ipam.add_aggregate %}
- {% add_button 'ipam:aggregate_add' %}
- {% import_button 'ipam:aggregate_import' %}
- {% endif %}
- {% export_button content_type %}
-
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:aggregate_bulk_edit' bulk_delete_url='ipam:aggregate_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
- Statistics
-
-
- - Total IPv4 IPs {{ ipv4_total|intcomma }}
- - Total IPv6 /64s {{ ipv6_total|intcomma }}
-
+{% block sidebar %}
+
-
+
+ - Total IPv4 IPs {{ ipv4_total|intcomma }}
+ - Total IPv6 /64s {{ ipv6_total|intcomma }}
+
+
{% endblock %}
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
index f0754d37b..00f0b7fe9 100644
--- a/netbox/templates/ipam/prefix_list.html
+++ b/netbox/templates/ipam/prefix_list.html
@@ -1,26 +1,9 @@
-{% extends '_base.html' %}
-{% load buttons %}
+{% extends 'utilities/obj_list.html' %}
{% load helpers %}
-{% block content %}
-
+{% block buttons %}
- {% if perms.ipam.add_prefix %}
- {% add_button 'ipam:prefix_add' %}
- {% import_button 'ipam:prefix_import' %}
- {% endif %}
- {% export_button content_type %}
-
-
{% block title %}Prefixes{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
{% endblock %}
diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html
index 846eb3cb2..02f01fc7c 100644
--- a/netbox/templates/ipam/rir_list.html
+++ b/netbox/templates/ipam/rir_list.html
@@ -1,9 +1,6 @@
-{% extends '_base.html' %}
-{% load buttons %}
-{% load humanize %}
+{% extends 'utilities/obj_list.html' %}
-{% block content %}
-
+{% block buttons %}
{% if request.GET.family == '6' %}
@@ -15,22 +12,12 @@
IPv6 Stats
{% endif %}
- {% if perms.ipam.add_rir %}
- {% add_button 'ipam:rir_add' %}
- {% import_button 'ipam:rir_import' %}
- {% endif %}
- {% export_button content_type %}
-
-
{% block title %}RIRs{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:rir_bulk_delete' %}
- {% if request.GET.family == '6' %}
-
Note: Numbers shown indicate /64 prefixes.
- {% endif %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
+{% endblock %}
+
+{% block sidebar %}
+ {% if request.GET.family == '6' %}
+
+ Numbers shown indicate /64 prefixes.
+
+ {% endif %}
{% endblock %}
diff --git a/netbox/templates/utilities/obj_list.html b/netbox/templates/utilities/obj_list.html
index 05dd6a6ac..5ffed3c2b 100644
--- a/netbox/templates/utilities/obj_list.html
+++ b/netbox/templates/utilities/obj_list.html
@@ -4,6 +4,7 @@
{% block content %}
+ {% block buttons %}{% endblock %}
{% if permissions.add and 'add' in action_buttons %}
{% add_button content_type.model_class|url_name:"add" %}
{% endif %}