diff --git a/templates/forms.html b/templates/forms.html
index 5a52975..d59a7af 100644
--- a/templates/forms.html
+++ b/templates/forms.html
@@ -40,6 +40,7 @@
 
 {% macro stop_build(stop_url, authz, on_all=False, on_selected=False, builders=[], short=False, label="Build") %}
   {% if not short %}
+    <div class="box">
     <form method="post" name="stop_build" action="{{ stop_url }}" class='form-horizontal stopbuild'
                {{ 'style="display:inline"' if short else '' }}>
       {% if not short %}
@@ -65,14 +66,17 @@
       {% endif %}
 
       {% if not short %}
-        <div class="row">
-          <span class="label">Reason:</span>
-          <input type="text" name="comments"/>
-        </div>
-      {% endif %}
-
+      <p>
+        <span style="display: inline-block; width: 120pt;">Reason:</span>
+        <input type="text" name="comments"/>
+      </p>
+      <hr>
+      <p><input class="btn btn-default btn-success btn-squishy btn-block" type="submit" value="Stop {{ label }}" /></p>
+      {% else %}
       <input class="btn btn-default btn-success btn-squishy" type="submit" value="Stop {{ label }}" />
+      {% endif %}
     </form>
+    </div>
   {% endif %}
 {% endmacro %}