diff --git a/pagure/templates/pull_request_comment.html b/pagure/templates/pull_request_comment.html
index 08558b5..7ee76d4 100644
--- a/pagure/templates/pull_request_comment.html
+++ b/pagure/templates/pull_request_comment.html
@@ -1,17 +1,34 @@
 {% if authenticated %}
+
 <section class="add_comment">
+
   <form action="{{ url_for(
     'pull_request_add_comment', username=username, repo=repo.name,
     requestid=requestid, commit=commit, filename=filename, row=row) }}"
     method="post" onsubmit="return try_async_comment(this, true)">
+
+
+    <div class="tabs ui-widget ui-widget-content ui-corner-all"
+        id="comment_block">
+
+      <div id="edit">
+        <textarea class="form-control" id="comment" name="comment"
+            title="comment" style="width:100%;"></textarea>
+      </div>
+
     <div>
-      <textarea id="comment" name="comment" title="comment"></textarea>
-    </div>
+
   {{ form.csrf_token }}
-  <input type="submit" class="submit positive button" value="Comment">
-  <input type="button" class="cancel" value="Cancel">
+    <div>
+      <input type="submit" class="btn btn-primary" value="Comment" />
+      <input type="button" class="btn btn-secondary cancel" value="Cancel"
+      value="Cancel" {% if not is_js -%} onclick="history.back();"{% endif %} />
+    </div>
+
   </form>
+
 </section>
+
 {% else %}
 <p><a href="{{ url_for('auth_login') }}">Login</a> to comment on this ticket.</p>
 {% endif %}