diff --git a/src/main/scala/servlet/TransactionFilter.scala b/src/main/scala/servlet/TransactionFilter.scala
index 0e96273..12363ad 100644
--- a/src/main/scala/servlet/TransactionFilter.scala
+++ b/src/main/scala/servlet/TransactionFilter.scala
@@ -21,9 +21,9 @@
       chain.doFilter(req, res)
     } else {
       Database(req.getServletContext) withTransaction {
-        logger.debug("TODO begin transaction")
+        logger.debug("begin transaction")
         chain.doFilter(req, res)
-        logger.debug("TODO end transaction")
+        logger.debug("end transaction")
       }
     }
   }
diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html
index e565b18..cb2241e 100644
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -48,10 +48,8 @@
       <a href="@url(repository)/settings">Settings</a>
     </th>
     }
-  </tr>  
+  </tr>
 </table>
-<form method="POST" id="repository_form">
-</form>
 <script type="text/javascript">
 $(function(){
   $('table.global-nav th.box-header').click(function(){
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 764a9fc..01cec78 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -41,7 +41,7 @@
             @labels.map { label =>
               <li>
                 <a href="#" class="toggle-label" data-label-id="@label.labelId">
-                  <i class="@{if(issueLabels.exists(_.labelId == label.labelId)) "icon-ok" else "icon-white"}"></i>
+                  @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
                   <span class="label" style="background-color: #@label.color;">&nbsp;</span>
                   @label.labelName
                 </a>
diff --git a/src/main/twirl/issues/issuedetail.scala.html b/src/main/twirl/issues/issuedetail.scala.html
index 28b557e..85b26e9 100644
--- a/src/main/twirl/issues/issuedetail.scala.html
+++ b/src/main/twirl/issues/issuedetail.scala.html
@@ -28,7 +28,7 @@
         @helper.html.dropdown() {
           <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
           @collaborators.map { collaborator =>
-            <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
+            <li><a href="javascript:void(0);" class="assign" data-name="@collaborator">@helper.html.checkicon(collaborator == issue.assignedUserName)@avatar(collaborator, 20) @collaborator</a></li>
           }
         }
       }
@@ -53,7 +53,7 @@
             @milestones.map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
-                  <i class="icon-white"></i> @milestone.title
+                  @helper.html.checkicon(milestone.milestoneId == issue.milestoneId) @milestone.title
                   <div class="small" style="padding-left: 20px;">
                     @milestone.dueDate.map { dueDate =>
                       @if(isPast(dueDate)){
@@ -85,13 +85,6 @@
 </div>
 <script>
 $(function(){
-  @if(issue.assignedUserName.isDefined){
-    $('a.assign[data-name=@issue.assignedUserName] i').attr('class', 'icon-ok');
-  }
-  @if(issue.milestoneId.isDefined){
-    $('a.milestone[data-id=@issue.milestoneId] i').attr('class', 'icon-ok');
-  }
-
   $('#edit').click(function(){
     $.get('@url(repository)/issues/_data/@issue.issueId',
     {