diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index dc9c36c6c..4495d27fe 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -147,7 +147,6 @@ class RackGroupAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'dcim.add_rackgroup'
     model = RackGroup
     form_class = RackGroupForm
-    template_name = 'dcim/rackgroup_edit.html'
     cancel_url = 'dcim:rackgroup_list'
 
 
@@ -155,7 +154,7 @@ class RackGroupEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rackgroup'
     model = RackGroup
     form_class = RackGroupForm
-    template_name = 'dcim/rackgroup_edit.html'
+    return_url = 'dcim:rackgroup_list'
 
 
 class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -298,7 +297,6 @@ class DeviceTypeAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'dcim.add_devicetype'
     model = DeviceType
     form_class = DeviceTypeForm
-    template_name = 'dcim/devicetype_edit.html'
     cancel_url = 'dcim:devicetype_list'
 
 
@@ -306,7 +304,6 @@ class DeviceTypeEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_devicetype'
     model = DeviceType
     form_class = DeviceTypeForm
-    template_name = 'dcim/devicetype_edit.html'
 
 
 class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView):
@@ -474,7 +471,6 @@ class DeviceRoleAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'dcim.add_devicerole'
     model = DeviceRole
     form_class = DeviceRoleForm
-    template_name = 'dcim/devicerole_edit.html'
     cancel_url = 'dcim:devicerole_list'
 
 
@@ -483,7 +479,6 @@ class DeviceRoleEditView(PermissionRequiredMixin, ObjectEditView):
     model = DeviceRole
     form_class = DeviceRoleForm
     return_url = 'dcim:devicerole_list'
-    template_name = 'dcim/devicerole_edit.html'
 
 
 class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index e8fccbd9e..c1d9696de 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -67,7 +67,6 @@ class VRFAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'ipam.add_vrf'
     model = VRF
     form_class = VRFForm
-    template_name = 'ipam/vrf_edit.html'
     cancel_url = 'ipam:vrf_list'
 
 
@@ -75,7 +74,6 @@ class VRFEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_vrf'
     model = VRF
     form_class = VRFForm
-    template_name = 'ipam/vrf_edit.html'
 
 
 class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
@@ -160,7 +158,6 @@ class AggregateAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'ipam.add_aggregate'
     model = Aggregate
     form_class = AggregateForm
-    template_name = 'ipam/aggregate_edit.html'
     cancel_url = 'ipam:aggregate_list'
 
 
@@ -168,7 +165,6 @@ class AggregateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_aggregate'
     model = Aggregate
     form_class = AggregateForm
-    template_name = 'ipam/aggregate_edit.html'
 
 
 class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
@@ -278,7 +274,6 @@ class PrefixAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'ipam.add_prefix'
     model = Prefix
     form_class = PrefixForm
-    template_name = 'ipam/prefix_edit.html'
     cancel_url = 'ipam:prefix_list'
     fields_initial = ['site', 'vrf', 'prefix']
 
@@ -287,7 +282,6 @@ class PrefixEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_prefix'
     model = Prefix
     form_class = PrefixForm
-    template_name = 'ipam/prefix_edit.html'
 
 
 class PrefixDeleteView(PermissionRequiredMixin, ObjectDeleteView):
@@ -485,7 +479,6 @@ class VLANAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'ipam.add_vlan'
     model = VLAN
     form_class = VLANForm
-    template_name = 'ipam/vlan_edit.html'
     cancel_url = 'ipam:vlan_list'
 
 
@@ -493,7 +486,6 @@ class VLANEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_vlan'
     model = VLAN
     form_class = VLANForm
-    template_name = 'ipam/vlan_edit.html'
 
 
 class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
diff --git a/netbox/templates/dcim/devicerole_edit.html b/netbox/templates/dcim/devicerole_edit.html
deleted file mode 100644
index 4271af50a..000000000
--- a/netbox/templates/dcim/devicerole_edit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Device Role</strong></div>
-        <div class="panel-body">
-            {% render_form form %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/dcim/devicetype_edit.html b/netbox/templates/dcim/devicetype_edit.html
deleted file mode 100644
index aed29cc5b..000000000
--- a/netbox/templates/dcim/devicetype_edit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Device Type</strong></div>
-        <div class="panel-body">
-            {% render_form form %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/dcim/rackgroup_edit.html b/netbox/templates/dcim/rackgroup_edit.html
deleted file mode 100644
index 5b256b63a..000000000
--- a/netbox/templates/dcim/rackgroup_edit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Rack Group</strong></div>
-        <div class="panel-body">
-            {% render_form form %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/ipam/aggregate_edit.html b/netbox/templates/ipam/aggregate_edit.html
deleted file mode 100644
index a16a70d70..000000000
--- a/netbox/templates/ipam/aggregate_edit.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Aggregate</strong></div>
-        <div class="panel-body">
-            {% render_field form.prefix %}
-            {% render_field form.rir %}
-            {% render_field form.date_added %}
-            {% render_field form.description %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/ipam/prefix_edit.html b/netbox/templates/ipam/prefix_edit.html
deleted file mode 100644
index 297bbba99..000000000
--- a/netbox/templates/ipam/prefix_edit.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Prefix</strong></div>
-        <div class="panel-body">
-            {% render_field form.prefix %}
-            {% render_field form.vrf %}
-            {% render_field form.site %}
-            {% render_field form.vlan %}
-            {% render_field form.status %}
-            {% render_field form.role %}
-            {% render_field form.description %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
deleted file mode 100644
index 3f471ca6b..000000000
--- a/netbox/templates/ipam/vlan_edit.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VLAN</strong></div>
-        <div class="panel-body">
-            {% render_field form.site %}
-            {% render_field form.vid %}
-            {% render_field form.name %}
-            {% render_field form.status %}
-            {% render_field form.role %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/ipam/vrf_edit.html b/netbox/templates/ipam/vrf_edit.html
deleted file mode 100644
index 694c2ceae..000000000
--- a/netbox/templates/ipam/vrf_edit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'utilities/obj_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VRF</strong></div>
-        <div class="panel-body">
-            {% render_form form %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/netbox/templates/utilities/obj_edit.html b/netbox/templates/utilities/obj_edit.html
index 8a34ba1a3..8ca61e02d 100644
--- a/netbox/templates/utilities/obj_edit.html
+++ b/netbox/templates/utilities/obj_edit.html
@@ -19,7 +19,14 @@
                         </div>
                     </div>
                 {% endif %}
-                {% block form %}{% endblock %}
+                {% block form %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading"><strong>Details</strong></div>
+                        <div class="panel-body">
+                            {% render_form form %}
+                        </div>
+                    </div>
+                {% endblock %}
             </div>
         </div>
         <div class="row">
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 3267a708a..b72b08049 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -80,7 +80,7 @@ class ObjectListView(View):
 class ObjectAddView(View):
     model = None
     form_class = None
-    template_name = None
+    template_name = 'utilities/obj_edit.html'
     cancel_url = None
     fields_initial = []
 
@@ -117,7 +117,7 @@ class ObjectAddView(View):
 class ObjectEditView(View):
     model = None
     form_class = None
-    template_name = None
+    template_name = 'utilities/obj_edit.html'
     return_url = None
 
     def get_object(self, kwargs):