diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index d56bde5..63dd78a 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -5,23 +5,36 @@
   @html.header("issues", repository)
   @issuestab("issues", repository)
   <ul class="nav nav-tabs">
-    <li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues">&#8592; Back to issue list</a></li>
+    <li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
     <li class="pull-right">Issue #@issue.issueId</li>
   </ul>
-  <div class="box">
-    <div class="box-content">
-      <div class="small"><a href="#">@issue.openedUserName</a> opened this issue <time title="2013-06-03 15:56:05">TODO June 03, 2013</time></div>
-      <h4>@issue.title</h4>
+  <div class="row-fluid">
+    <div class="span10">
+      <div class="box">
+        <div class="box-content">
+          <div class="small"><a href="#">@issue.openedUserName</a> opened this issue <time title="2013-06-03 15:56:05">TODO June 03, 2013</time></div>
+          <h4>@issue.title</h4>
+        </div>
+        <div class="box-content" style="background-color: #f5f5f5;">
+          @markdown(issue.content getOrElse "No description given.", repository, false, true, true)
+        </div>
+      </div>
+      <div class="box">
+        <div class="box-content">
+          @html.preview(repository, "Leave a comment", false, true, true, "width: 730px; height: 100px;")
+        </div>
+      </div>
+      <input type="submit" class="btn btn-success" value="Comment"/>
     </div>
-    <div class="box-content" style="background-color: #f5f5f5;">
-      @markdown(issue.content getOrElse "No description given.", repository, false, true, true)
+    <div class="span2">
+      @if(issue.closed) {
+        <div class="label label-important">Closed</div>
+      } else {
+        <div class="label label-success">Open</div>
+      }
+      <div class="small">3 comments</div>
+      <hr/>
+      <strong>Labels</strong>
     </div>
   </div>
-  <div class="box">
-    <div class="box-content">
-      @html.preview(repository, "Leave a comment", false, true, true)
-    </div>
-  </div>
-  <input type="submit" class="btn btn-success" value="Comment"/>
-
 }
\ No newline at end of file