diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 0998646cf..3912c602f 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -190,8 +190,8 @@ class ObjectChangeListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.ObjectChangeFilterSet
     filterset_form = forms.ObjectChangeFilterForm
     table = ObjectChangeTable
-    # TODO: Remove custom template
     template_name = 'extras/objectchange_list.html'
+    action_buttons = ('export',)
 
 
 class ObjectChangeView(PermissionRequiredMixin, View):
diff --git a/netbox/templates/extras/objectchange_list.html b/netbox/templates/extras/objectchange_list.html
index e9be6ba69..3672f4f04 100644
--- a/netbox/templates/extras/objectchange_list.html
+++ b/netbox/templates/extras/objectchange_list.html
@@ -1,20 +1,9 @@
-{% extends '_base.html' %}
-{% load buttons %}
+{% extends 'utilities/obj_list.html' %}
 
-{% block content %}
-<div class="pull-right noprint">
-    {% export_button content_type %}
-</div>
-<h1>{% block title %}Changelog{% endblock %}</h1>
-<div class="row">
-	<div class="col-md-9">
-        {% include 'utilities/obj_table.html' %}
-        <div class="text-muted text-right">
-            Changelog retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
-        </div>
+{% block title %}Change Log{% endblock %}
+
+{% block sidebar %}
+    <div class="text-muted">
+        Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
     </div>
-    <div class="col-md-3 noprint">
-		{% include 'inc/search_panel.html' %}
-    </div>
-</div>
 {% endblock %}
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 55ac3e5c2..900d783f6 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -473,7 +473,7 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Logging</li>
                         <li{% if not perms.extras.view_objectchange %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:objectchange_list' %}">Changelog</a>
+                            <a href="{% url 'extras:objectchange_list' %}">Change Log</a>
                         </li>
                         <li class="divider"></li>
                         <li class="dropdown-header">Miscellaneous</li>
diff --git a/netbox/templates/utilities/obj_list.html b/netbox/templates/utilities/obj_list.html
index dba9e2f36..05dd6a6ac 100644
--- a/netbox/templates/utilities/obj_list.html
+++ b/netbox/templates/utilities/obj_list.html
@@ -16,17 +16,14 @@
 </div>
 <h1>{% block title %}{{ content_type.model_class|model_name_plural|bettertitle }}{% endblock %}</h1>
 <div class="row">
-    {% if filter_form %}
-        <div class="col-md-9">
-            {% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
-        </div>
-        <div class="col-md-3 noprint">
+    <div class="col-md-9">
+        {% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
+    </div>
+    <div class="col-md-3 noprint">
+        {% if filter_form %}
             {% include 'inc/search_panel.html' %}
-        </div>
-    {% else %}
-        <div class="col-md-12">
-            {% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
-        </div>
-    {% endif %}
+        {% endif %}
+        {% block sidebar %}{% endblock %}
+    </div>
 </div>
 {% endblock %}