diff --git a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
index f93a91d..3011d14 100644
--- a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
+++ b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
@@ -82,6 +82,7 @@ textarea {
 	border-radius: 5px;*/
 }
 
+
 .save_btns {
 	margin-top: 10px;
 	border: 1px solid #CCCCC1;
diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
index bc3b7ae..26fc4bc 100644
--- a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
@@ -40,24 +40,25 @@
 
 {% block content %}
 
-<div class="row-fluid">
-  <div class="span12">
     <form method="post">
        
       {% if view.model_admin.save_on_top %}
-      <div class="save_btns">
-        <!-- <hr/> -->
-        {% if object %}
-        <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
-          <i class="icon-remove icon-white"></i>
-          {% trans "Delete" %}
-        </a>
-        {% endif %}
-          {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
-          <!-- <hr /> -->
+      <div class="row-fluid">
+        <div class="span12 save_btns">
+            {% if object %}
+            <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
+              <i class="icon-remove icon-white"></i>
+              {% trans "Delete" %}
+            </a>
+            {% endif %}
+              {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
+          </div>
       </div>
       {% endif %}
 
+<div class="row-fluid"><!-- begin main form row -->
+    <div class="span12">
+        
       <div class="change_form">
         {% csrf_token %}
         {{ form|crispy }}
@@ -104,22 +105,25 @@
               
       </table>
       {% endfor %}
+
+  </div>
+</div><!-- end main form row -->
       
       {% if view.model_admin.save_on_bottom %}
-      <div class="save_btns">
-        <!-- <hr/> -->
-        {% if object %}
-        <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
-          <i class="icon-remove icon-white"></i>
-          {% trans "Delete" %}
-        </a>
-        {% endif %}
-          {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
+      <div class="row-fluid">
+        <div class="span12 save_btns">
+            {% if object %}
+            <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
+              <i class="icon-remove icon-white"></i>
+              {% trans "Delete" %}
+            </a>
+            {% endif %}
+              {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
+          </div>
       </div>
       {% endif %}
       
-    </form>
-  </div>
-</div>
+</form>
+
 
 {% endblock content %}
diff --git a/example/blog/admin2.py b/example/blog/admin2.py
index 604b62a..30564ae 100644
--- a/example/blog/admin2.py
+++ b/example/blog/admin2.py
@@ -33,6 +33,7 @@ class PostAdmin(djadmin2.ModelAdmin2):
     field_renderers = {
         'title': renderers.title_renderer,
     }
+    save_on_top = True
 
 
 class CommentAdmin(djadmin2.ModelAdmin2):