diff --git a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
index aa903b8..f93a91d 100644
--- a/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
+++ b/djadmin2/static/themes/bootstrap/css/bootstrap-custom.css
@@ -25,7 +25,6 @@
     margin-bottom: 10px;
 }
 
-
 .history_btn {
 	float: right;
 	margin-bottom: 10px;
@@ -54,7 +53,7 @@ p {
 
 .comments_form {
 	clear: both;
-	margin-top: 50px;
+	margin-top: 40px;
 }
 
 .control-group {
@@ -76,5 +75,18 @@ textarea {
 }
 
 .add_comment {
-	height: 20px;
-}
\ No newline at end of file
+	margin-top: 0;
+	height: 25px;
+	padding: 5px;
+	/*border: 1px solid #CCCCC1;
+	border-radius: 5px;*/
+}
+
+.save_btns {
+	margin-top: 10px;
+	border: 1px solid #CCCCC1;
+	border-radius: 5px;
+	padding: 10px;
+	padding-left: 15px;
+	margin-bottom: 20px;
+}
diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
index caed6f6..bc3b7ae 100644
--- a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
@@ -43,15 +43,19 @@
 <div class="row-fluid">
   <div class="span12">
     <form method="post">
-
+       
       {% if view.model_admin.save_on_top %}
-        {# TODO - fix the format of the HTML #}
-        <hr />
+      <div class="save_btns">
+        <!-- <hr/> -->
         {% if object %}
-        <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">{% trans "Delete" %}</a>
+        <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 />
+          <!-- <hr /> -->
+      </div>
       {% endif %}
 
       <div class="change_form">
@@ -86,24 +90,34 @@
             {% endfor %}
           </tr>
           {% endfor %}
+          <tr class="new_row">
+            <td colspan="3">
+              <div class="add_comment">
+                <a href="#" class="btn btn-small">
+                  <i class="icon-plus"></i>
+                  Add another comment
+                </a>
+              </div>
+            </td>
+          </tr>
         </tbody>
+              
       </table>
       {% endfor %}
-
-      <div class="add_comment">
-        <a href="#" class="btn">
-          <i class="icon-plus"></i>
-          Add another comment
-        </a>
-      </div>
       
       {% if view.model_admin.save_on_bottom %}
-        <hr/>
+      <div class="save_btns">
+        <!-- <hr/> -->
         {% if object %}
-        <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">{% trans "Delete" %}</a>
+        <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>
       {% endif %}
+      
     </form>
   </div>
 </div>