diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
index f0df114..6f13224 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
@@ -10,53 +10,56 @@
 @import gitbucket.core.service.IssuesService
 @import gitbucket.core.service.IssuesService.IssueInfo
 <table class="table table-bordered table-hover table-issues">
-  <tr>
-    <th style="background-color: #eee;">
-      @dashboard.html.header(openCount, closedCount, condition, groups)
-    </th>
-  </tr>
-  @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
-  <tr>
-    <td style="padding-top: 15px; padding-bottom: 15px;">
-      @if(issue.isPullRequest){
-        <i class="octicon octicon-git-pull-request @(if(issue.closed) "closed" else "open")"></i>
-      } else {
-        <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")"></i>
-      }
-      <a href="@path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
-      @if(issue.isPullRequest){
-        <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
-      } else {
-        <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-title">@issue.title</a>
-      }
-      @gitbucket.core.issues.html.commitstatus(issue, commitStatus)
-      @labels.map { label =>
-        <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
-      }
-      <span class="pull-right muted">
-        @issue.assignedUserName.map { userName =>
-          @avatar(userName, 20, tooltip = true)
-        }
-        @if(commentCount > 0){
-          <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">
-            <i class="octicon octicon-comment active"></i> @commentCount
-          </a>
-        } else {
-          <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count" style="color: silver;">
-            <i class="octicon octicon-comment"></i> @commentCount
-          </a>
-        }
-      </span>
-      <div class="small muted" style="margin-left: 20px; margin-top: 5px;">
-        #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
-        @milestone.map { milestone =>
-          <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> 
-@milestone</a></span>
-        }
-      </div>
-    </td>
-  </tr>
-  }
+  <thead>
+    <tr>
+      <th style="background-color: #eee;">
+        @dashboard.html.header(openCount, closedCount, condition, groups)
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
+      <tr>
+        <td style="padding-top: 12px; padding-bottom: 12px;">
+          @if(issue.isPullRequest){
+            <i class="octicon octicon-git-pull-request @(if(issue.closed) "closed" else "open")"></i>
+          } else {
+            <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")"></i>
+          }
+          <a href="@path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
+          @if(issue.isPullRequest){
+            <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
+          } else {
+            <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-title">@issue.title</a>
+          }
+          @gitbucket.core.issues.html.commitstatus(issue, commitStatus)
+          @labels.map { label =>
+            <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
+          }
+          <span class="pull-right muted">
+            @issue.assignedUserName.map { userName =>
+              @avatar(userName, 20, tooltip = true)
+            }
+            @if(commentCount > 0){
+              <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">
+                <i class="octicon octicon-comment active"></i> @commentCount
+              </a>
+            } else {
+              <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count" style="color: silver;">
+                <i class="octicon octicon-comment"></i> @commentCount
+              </a>
+            }
+          </span>
+          <div class="small muted" style="margin-left: 20px; margin-top: 2px;">
+            #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
+            @milestone.map { milestone =>
+              <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>
+            }
+          </div>
+        </td>
+      </tr>
+    }
+  </tbody>
 </table>
 <div class="pull-right">
   @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), IssuesService.IssueLimit, 10, condition.toURL)
diff --git a/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
index 9041a1b..11c9e2b 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
@@ -3,20 +3,18 @@
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<ul class="nav nav-pills-group pull-left fill-width" style="margin-bottom: 10px;">
-  <li class="@if(filter == "created_by"){active} first">
+<ul class="nav nav-pills pull-left" style="line-height: 14px;">
+  <li class="@if(filter == "created_by"){active}">
     <a href="@path/dashboard/@active/created_by@condition.copy(author = None, assigned = None).toURL">Created</a>
   </li>
   <li class="@if(filter == "assigned"){active}">
     <a href="@path/dashboard/@active/assigned@condition.copy(author = None, assigned = None).toURL">Assigned</a>
   </li>
-  <li class="@if(filter == "mentioned"){active} last">
+  <li class="@if(filter == "mentioned"){active}">
     <a href="@path/dashboard/@active/mentioned@condition.copy(author = None, assigned = None).toURL">Mentioned</a>
   </li>
-  <li class="pull-right">
-    <form method="GET" id="search-filter-form" action="@path/dashboard/@active" style="margin-bottom: 0px;">
-      <input type="text" id="search-filter-box" class="form-control input-lg" name="q" style="width: 400px;"
-             value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-    </form>
-  </li>
 </ul>
+<form method="GET" id="search-filter-form" action="@path/dashboard/@active" class="pull-right">
+  <input type="text" id="search-filter-box" class="form-control input-lg" name="q" style="width: 400px;"
+         value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
+</form>
diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
index 4b6a159..3b081bf 100644
--- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
@@ -4,17 +4,14 @@
 <div class="dashboard-nav">
   <div class="container">
     <a href="@path/" @if(active == ""){ class="active"}>
-      <i class="octicon octicon-rss"></i>
-      News Feed
+      <i class="octicon octicon-rss"></i> News Feed
     </a>
     @if(loginAccount.isDefined){
       <a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}>
-        <i class="octicon octicon-git-pull-request"></i>
-        Pull Requests
+        <i class="octicon octicon-git-pull-request"></i> Pull Requests
       </a>
       <a href="@path/dashboard/issues" @if(active == "issues"){ class="active"}>
-        <i class="octicon octicon-issue-opened"></i>
-        Issues
+        <i class="octicon octicon-issue-opened"></i> Issues
       </a>
     }
   </div>
@@ -27,8 +24,6 @@
   margin-bottom: 20px;
 }
 
-
-
 div.dashboard-nav a  {
   line-height: 10px;
   margin-left: 20px;
@@ -38,7 +33,6 @@
   color: #888;
 }
 
-
 div.dashboard-nav .octicon{
     width: 16px;
     height: 16px;
diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
index 040b9e0..7d1aae1 100644
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -24,7 +24,7 @@
         <div style="text-align: right;">
           <input type="hidden" name="issueId" value="@issue.issueId"/>
           @if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){
-            <input type="submit" class="btn" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
+            <input type="submit" class="btn btn-default" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
           }
           <input type="submit" class="btn btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
         </div>
diff --git a/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
index f590d94..b75f055 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
@@ -4,10 +4,10 @@
 @import gitbucket.core.view.helpers._
 @defining(label.map(_.labelId).getOrElse("new")){ labelId =>
 <div id="edit-label-area-@labelId">
-  <form style="margin-bottom: 0px;">
-    <input type="text" id="labelName-@labelId" style="width: 300px; margin-bottom: 0px;" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
+  <form class="form-inline">
+    <input type="text" id="labelName-@labelId" style="width: 300px; margin-bottom: 0px;" class="form-control" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
     <div id="label-color-@labelId" class="input-append color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; margin-bottom: 0px;">
-      <input type="text" class="span3" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" readonly style="width: 100px;">
+      <input type="text" class="form-control span3" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" readonly style="width: 100px;">
       <span class="add-on"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
     </div>
     <script>
@@ -15,7 +15,7 @@
     </script>
     <span class="pull-right">
       <span id="label-error-@labelId" class="error"></span>
-      <input type="button" id="cancel-@labelId" class="btn label-edit-cancel" value="Cancel">
+      <input type="button" id="cancel-@labelId" class="btn btn-default label-edit-cancel" value="Cancel">
       <input type="button" id="submit-@labelId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
     </span>
   </form>
diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
index 891f31a..791b5e8 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
@@ -6,8 +6,8 @@
 @import gitbucket.core.view.helpers._
 <tr id="label-row-@label.labelId">
   <td style="padding-top: 15px; padding-bottom: 15px;">
-    <div class="milestone row-fluid" id="label-@label.labelId">
-      <div class="span8">
+    <div class="milestone row" id="label-@label.labelId">
+      <div class="col-md-8">
         <div style="margin-top: 6px">
           <a href="@url(repository)/issues?labels=@urlEncode(label.labelName)" id="label-row-content-@label.labelId">
             <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
@@ -17,13 +17,13 @@
           </a>
         </div>
       </div>
-      <div class="@if(hasWritePermission){span2} else {span4}">
+      <div class="@if(hasWritePermission){col-md-2} else {col-md-4}">
         <div class="pull-right">
           <span class="muted">@counts.get(label.labelName).getOrElse(0) open issues</span>
         </div>
       </div>
       @if(hasWritePermission){
-        <div class="span2">
+        <div class="col-md-2">
           <div class="pull-right">
             <a href="javascript:void(0);" onclick="editLabel(@label.labelId)">Edit</a>
             &nbsp;&nbsp;
diff --git a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
index d82a00d..7331129 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
@@ -12,24 +12,28 @@
       <tr><td></td></tr>
     </table>
     <table class="table table-bordered table-hover table-issues">
-      <tr id="label-row-header">
-        <th style="background-color: #eee;">
-          <span class="small">@labels.size labels</span>
-        </th>
-      </tr>
-      @labels.map { label =>
-        @gitbucket.core.issues.labels.html.label(label, counts, repository, hasWritePermission)
-      }
-      @if(labels.isEmpty){
-        <tr>
-          <td style="padding: 20px; background-color: #eee; text-align: center;">
-            No labels to show.
-            @if(hasWritePermission){
-              <a href="@url(repository)/issues/labels/new">Create a new label.</a>
-            }
-          </td>
+      <thead>
+        <tr id="label-row-header">
+          <th style="background-color: #eee;">
+            <span class="small">@labels.size labels</span>
+          </th>
         </tr>
-      }
+      </thead>
+      <tbody>
+        @labels.map { label =>
+          @gitbucket.core.issues.labels.html.label(label, counts, repository, hasWritePermission)
+        }
+        @if(labels.isEmpty){
+          <tr>
+            <td style="padding: 20px; background-color: #eee; text-align: center;">
+              No labels to show.
+              @if(hasWritePermission){
+                <a href="@url(repository)/issues/labels/new">Create a new label.</a>
+              }
+            </td>
+          </tr>
+        }
+      </tbody>
     </table>
   }
 }
diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
index 6d60c31..064921d 100644
--- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
@@ -173,7 +173,7 @@
     }
     @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
       <tr>
-        <td style="padding-top: 15px; padding-bottom: 15px;">
+        <td style="padding-top: 12px; padding-bottom: 12px;">
           @if(hasWritePermission){
             <input type="checkbox" value="@issue.issueId"/>
           }
@@ -204,7 +204,7 @@
               </a>
             }
           </span>
-          <div class="small muted" style="margin-left: 40px; margin-top: 5px;">
+          <div class="small muted" style="margin-left: 40px; margin-top: 2px;">
             #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
             @milestone.map { milestone =>
               <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>
diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
index 8a9a4cc..72ecc9b 100644
--- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
@@ -9,37 +9,37 @@
     <div class="muted" style="background-color: white;">
       <i class="octicon octicon-git-commit"></i> Commits on @date(day.head.commitTime)
     </div>
-    <div class="box-commits">
-    @day.map { commit =>
-      <div class="box-content-row" style="padding: 8px;">
-        <ul class="nav nav-pills-group pull-right" style="margin-top: 2px; margin-bottom: 0px; margin-right: 4px;">
-          <li class="first"><a href="@url(repository)/commit/@commit.id" class="link monospace">@commit.id.substring(0, 7)</a></li>
-          <li class="last"><a href="@url(repository)/tree/@commit.id" style="padding-top: 9px; padding-bottom: 10px;"><i class="octicon octicon-code link"></i></a></li>
-        </ul>
-        <div>
-          <div class="commit-avatar-image">@avatar(commit, 40)</div>
-          <div class="commit-message-box">
-            <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-            @if(commit.description.isDefined){
-              <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
-            }
-            <br>
-            @if(commit.description.isDefined){
-              <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
-            }
-            <div class="small">
-              @user(commit.authorName, commit.authorEmailAddress, "username")
-              <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
-              @if(commit.isDifferentFromAuthor) {
-                <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
-                @user(commit.committerName, commit.committerEmailAddress, "username")
-                <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
+    <div class="list-group box-commits">
+      @day.map { commit =>
+        <div class="list-group-item">
+          <ul class="nav nav-pills pull-right">
+            <li><a href="@url(repository)/commit/@commit.id" class="link monospace" style="line-height: 16px;">@commit.id.substring(0, 7)</a></li>
+            <li><a href="@url(repository)/tree/@commit.id" style="line-height: 16px;"><i class="octicon octicon-code link"></i></a></li>
+          </ul>
+          <div>
+            <div class="commit-avatar-image">@avatar(commit, 40)</div>
+            <div>
+              <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
+              @if(commit.description.isDefined){
+                <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
               }
+              <br>
+              @if(commit.description.isDefined){
+                <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+              }
+              <div style="margin-top: 2px;">
+                @user(commit.authorName, commit.authorEmailAddress, "username")
+                <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+                @if(commit.isDifferentFromAuthor) {
+                  <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
+                  @user(commit.committerName, commit.committerEmailAddress, "username")
+                  <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
+                }
+              </div>
             </div>
           </div>
         </div>
-      </div>
-    }
+      }
     </div>
   }
 </div>
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index ae9e417..b23a8bb 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -48,7 +48,7 @@
         </div>
       }
       <div class="pull-right">
-        <input type="button" class="btn @if(!hasProblem){ btn-success }" id="merge-pull-request-button" value="Merge pull request"@if(hasConflict){ disabled="true"}/>
+        <input type="button" class="btn @if(!hasProblem){ btn-success }else{ btn-default }" id="merge-pull-request-button" value="Merge pull request"@if(hasConflict){ disabled="true"}/>
       </div>
       <div>
         @if(hasConflict){
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index fad8948..4dc3d4c 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -54,15 +54,15 @@
       <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
       <div class="btn-group pull-right">
         @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){
-          <a class="btn btn-xs btn-default" href="@url(repository)/edit/@encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
+          <a class="btn btn-sm btn-default" href="@url(repository)/edit/@encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
         }
-        <a class="btn btn-xs btn-default" href="?raw=true">Raw</a>
+        <a class="btn btn-sm btn-default" href="?raw=true">Raw</a>
         @if(content.viewType == "text"){
-          <a class="btn btn-xs btn-default blame-action" href="@url(repository)/blame/@latestCommit.id/@pathList.mkString("/")" data-url="@url(repository)/get-blame/@latestCommit.id/@pathList.mkString("/")" data-repository="@url(repository)">Blame</a>
+          <a class="btn btn-sm btn-default blame-action" href="@url(repository)/blame/@latestCommit.id/@pathList.mkString("/")" data-url="@url(repository)/get-blame/@latestCommit.id/@pathList.mkString("/")" data-repository="@url(repository)">Blame</a>
         }
-        <a class="btn btn-xs btn-default" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
+        <a class="btn btn-sm btn-default" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
         @if(hasWritePermission && repository.branchList.contains(branch)){
-          <a class="btn btn-xs btn-danger" href="@url(repository)/remove/@encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
+          <a class="btn btn-sm btn-danger" href="@url(repository)/remove/@encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
         }
       </div>
     </div>
diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
index 6a702b3..a726088 100644
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -16,43 +16,43 @@
       @branchInfo.map { case (branch, prs) =>
         <tr><td style="padding: 12px;">
           <div class="branch-action">
-              @branch.mergeInfo.map{ info =>
-                @prs.map{ case (pull, issue) =>
-                  <a href="@url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
-                  @if(issue.closed) {
-                    @if(info.isMerged){
-                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-info">Merged</a>
-                    }else{
-                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-important">Closed</a>
-                    }
-                  } else {
-                    <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-success">Open</a>
+            @branch.mergeInfo.map{ info =>
+              @prs.map{ case (pull, issue) =>
+                <a href="@url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
+                @if(issue.closed) {
+                  @if(info.isMerged){
+                    <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-info">Merged</a>
+                  }else{
+                    <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-important">Closed</a>
                   }
-                }.getOrElse{
-                  @if(context.loginAccount.isDefined){
-                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
-                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
-                    }.getOrElse {
-                      encodeRefName(repository.repository.defaultBranch)
-                    }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull Request</a>
-                  } else {
-                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
-                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
-                    }.getOrElse {
-                      encodeRefName(repository.repository.defaultBranch)
-                    }}...@{encodeRefName(branch.name)}" class="btn btn-default">Compare</a>
-                  }
+                } else {
+                  <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-success">Open</a>
                 }
-                @if(hasWritePermission){
-                  <span style="margin-left: 8px;">
-                    @if(prs.map(!_._2.closed).getOrElse(false)){
-                      <a class="disabled" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="octicon octicon-trashcan"></i></a>
-                    } else {
-                      <a href="@url(repository)/delete/@encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
-                    }
-                  </span>
+              }.getOrElse{
+                @if(context.loginAccount.isDefined){
+                  <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                    urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                  }.getOrElse {
+                    encodeRefName(repository.repository.defaultBranch)
+                  }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull Request</a>
+                } else {
+                  <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                    urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                  }.getOrElse {
+                    encodeRefName(repository.repository.defaultBranch)
+                  }}...@{encodeRefName(branch.name)}" class="btn btn-default">Compare</a>
                 }
               }
+              @if(hasWritePermission){
+                <span style="margin-left: 8px;">
+                  @if(prs.map(!_._2.closed).getOrElse(false)){
+                    <a class="disabled" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="octicon octicon-trashcan"></i></a>
+                  } else {
+                    <a href="@url(repository)/delete/@encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
+                  }
+                </span>
+              }
+            }
           </div>
           <div class="branch-details">
             <a href="@url(repository)/tree/@encodeRefName(branch.name)" class="branch-name">@branch.name</a>
diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html
index 9d70ec8..66e7ba9 100644
--- a/src/main/twirl/gitbucket/core/repo/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html
@@ -38,12 +38,12 @@
         <div class="muted" style="background-color: white;">
           <i class="octicon octicon-git-commit"></i> Commits on @date(day.head.commitTime)
         </div>
-        <div class="box-commits">
+        <div class="list-group box-commits">
           @day.map { commit =>
-            <div class="box-content-row" style="padding: 8px;">
+            <div class="list-group-item">
               <ul class="nav nav-pills pull-right">
-                <li class="first"><a href="@url(repository)/commit/@commit.id" class="link monospace" style="line-height: 16px;">@commit.id.substring(0, 7)</a></li>
-                <li class="last"><a href="@url(repository)/tree/@commit.id" style="line-height: 16px;"><i class="octicon octicon-code link"></i></a></li>
+                <li><a href="@url(repository)/commit/@commit.id" class="link monospace" style="line-height: 16px;">@commit.id.substring(0, 7)</a></li>
+                <li><a href="@url(repository)/tree/@commit.id" style="line-height: 16px;"><i class="octicon octicon-code link"></i></a></li>
               </ul>
               <div>
                 <div class="commit-avatar-image">@avatar(commit, 40)</div>
diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html
index 681cf50..ca6a811 100644
--- a/src/main/twirl/gitbucket/core/wiki/history.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html
@@ -31,14 +31,17 @@
       </li>
     </ul>
     <table class="table table-bordered fill-width pull-left">
-      <tr>
-        <th colspan="3">
-          <div class="pull-left" style="padding-top: 4px;">Revisions</div>
-          <div class="pull-right">
-            <input type="button" id="compare" value="Compare Revisions" class="btn btn-mini"/>
-          </div>
-        </th>
-      </tr>
+      <thead>
+        <tr>
+          <th colspan="3">
+            <div class="pull-left" style="padding-top: 4px;">Revisions</div>
+            <div class="pull-right">
+              <input type="button" id="compare" value="Compare Revisions" class="btn btn-dm btn-default"/>
+            </div>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
       @commits.map { commit =>
         <tr>
           <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
@@ -48,6 +51,7 @@
           </td>
         </tr>
       }
+      </tbody>
     </table>
     <script>
     $(function(){
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6bc30bc..626cdd4 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -372,7 +372,6 @@
 
 div.box-commits {
   background-color: white;
-  border: 1px solid #d8d8d8;
   padding-left: 0px;
   padding-right: 0px;
   margin-top: 10px;
@@ -386,7 +385,7 @@
   padding: 4px;
   border-radius: 3px;
 }
-
+/*
 div > div.box-content-row:nth-of-type(1) {
   border: none;
 }
@@ -395,7 +394,7 @@
   border-top: 1px solid #d8d8d8;
   padding: 4px;
 }
-
+*/
 div.repo-link {
   white-space: nowrap;
   overflow: hidden;