diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index c5243d904..b667b829e 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -72,6 +72,13 @@ class SiteImportForm(BulkImportForm, BootstrapMixin):
 # Rack groups
 #
 
+class RackGroupForm(forms.ModelForm, BootstrapMixin):
+
+    class Meta:
+        model = RackGroup
+        fields = ['site', 'name', 'slug']
+
+
 class RackGroupBulkDeleteForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(queryset=RackGroup.objects.all(), widget=forms.MultipleHiddenInput)
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 7cec5db57..d43a5b9d4 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -23,8 +23,8 @@ from utilities.views import ObjectListView, BulkImportView, BulkEditView, BulkDe
 
 from .filters import RackGroupFilter, RackFilter, DeviceTypeFilter, DeviceFilter, ConsoleConnectionFilter, \
     PowerConnectionFilter, InterfaceConnectionFilter
-from .forms import SiteForm, SiteImportForm, RackGroupFilterForm, RackGroupBulkDeleteForm, RackForm, RackImportForm, \
-    RackBulkEditForm, RackBulkDeleteForm, RackFilterForm, DeviceTypeForm, DeviceTypeBulkEditForm, \
+from .forms import SiteForm, SiteImportForm, RackGroupForm, RackGroupFilterForm, RackGroupBulkDeleteForm, RackForm, \
+    RackImportForm, RackBulkEditForm, RackBulkDeleteForm, RackFilterForm, DeviceTypeForm, DeviceTypeBulkEditForm, \
     DeviceTypeBulkDeleteForm, DeviceTypeFilterForm, DeviceForm, DeviceImportForm, DeviceBulkEditForm, \
     DeviceBulkDeleteForm, DeviceFilterForm, ConsolePortForm, ConsolePortCreateForm, ConsolePortConnectionForm, \
     ConsoleConnectionImportForm, ConsoleServerPortForm, ConsoleServerPortCreateForm, ConsoleServerPortConnectionForm, \
@@ -144,17 +144,18 @@ class RackGroupListView(ObjectListView):
     template_name = 'dcim/rackgroup_list.html'
 
 
-class RackGroupAddView(PermissionRequiredMixin, CreateView):
+class RackGroupAddView(PermissionRequiredMixin, ObjectAddView):
     permission_required = 'dcim.add_rackgroup'
     model = RackGroup
-    fields = ['site', 'name', 'slug']
+    form_class = RackGroupForm
     template_name = 'dcim/rackgroup_edit.html'
+    cancel_url = 'dcim:rackgroup_list'
 
 
-class RackGroupEditView(PermissionRequiredMixin, UpdateView):
+class RackGroupEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rackgroup'
     model = RackGroup
-    fields = ['site', 'name', 'slug']
+    form_class = RackGroupForm
     template_name = 'dcim/rackgroup_edit.html'
 
 
diff --git a/netbox/templates/dcim/rackgroup_edit.html b/netbox/templates/dcim/rackgroup_edit.html
index 4b9229ee1..5b256b63a 100644
--- a/netbox/templates/dcim/rackgroup_edit.html
+++ b/netbox/templates/dcim/rackgroup_edit.html
@@ -1,49 +1,11 @@
-{% extends '_base.html' %}
+{% extends 'utilities/obj_edit.html' %}
 {% load form_helpers %}
 
-{% block title %}{% if rack %}Editing rack group {{ rackgroup }}{% else %}Add a rack group{% endif %}{% endblock %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if rackgroup %}
-                <h1>Rack group {{ rackgroup }}</h1>
-            {% else %}
-                <h1>Add a Rack Group</h1>
-            {% endif %}
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
+{% 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>
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <div class="panel panel-default">
-                <div class="panel-heading"><strong>Rack Group</strong></div>
-                <div class="panel-body">
-                    {% render_form form %}
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3 text-right">
-            {% if rackgroup %}
-                <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                <a href="{% url 'dcim:rackgroup_list' %}" class="btn btn-default">Cancel</a>
-            {% else %}
-                <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
-                <a href="{% url 'dcim:rackgroup_list' %}" class="btn btn-default">Cancel</a>
-            {% endif %}
-        </div>
-    </div>
-</form>
 {% endblock %}