diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
index e50355b..8a6a100 100644
--- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
@@ -2,71 +2,62 @@
   userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<div class="container body">
-  <div class="dashboard-sidebar">
-    @if(loginAccount.isEmpty){
-      <div id="dashboard-signin-form">@html.signinform(settings)</div>
+<div class="main-sidebar">
+  <div class="sidebar">
+  <ul class="nav sidebar-menu">
+  @if(loginAccount.isDefined){
+    <li class="header">Your repositories <span class="label label-primary pull-right">@userRepositories.size</span></li>
+    @if(userRepositories.isEmpty){
+      <li>No repositories</li>
     } else {
-      <div class="panel panel-default">
-        <div class="panel-heading strong">
-          Your repositories <span class="badge">@userRepositories.size</span>
-        </div>
-        <ul class="list-group list-group-flush">
-        @if(userRepositories.isEmpty){
-          <li class="list-group-item">No repositories</li>
-        } else {
-          @defining(20){ max =>
-            @userRepositories.zipWithIndex.map { case (repository, i) =>
-            <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
-              @helper.html.repositoryicon(repository, false)
-              @if(repository.owner == loginAccount.get.userName){
-                <a href="@url(repository)"><span class="strong">@repository.name</span></a>
-              } else {
-                <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-              }
-              </li>
-            }
-            @if(userRepositories.size > max){
-              <li class="list-group-item show-more">
-                <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
-              </li>
-            }
+      @defining(10){ max =>
+        @userRepositories.zipWithIndex.map { case (repository, i) =>
+        <li class="repo-link" style="@if(i > max - 1){display:none;}">
+          @if(repository.owner == loginAccount.get.userName){
+            <a href="@url(repository)">@helper.html.repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
+          } else {
+            <a href="@url(repository)">@helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
           }
+          </li>
         }
-        </ul>
-      </div>
-    }
-    <div class="panel panel-default">
-      <div class="panel-heading strong">Recent updated repositories</div>
-      <ul class="list-group list-group-flush">
-      @if(recentRepositories.isEmpty){
-        <li class="list-group-item">No repositories</li>
-      } else {
-        @defining(20){ max =>
-          @recentRepositories.zipWithIndex.map { case (repository, i) =>
-          <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
-            @helper.html.repositoryicon(repository, false)
-          <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-            </li>
-          }
-          @if(recentRepositories.size > max){
-            <li class="list-group-item show-more">
-              <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
-            </li>
-          }
+        @if(userRepositories.size > max){
+          <li class="show-more">
+            <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
+          </li>
         }
       }
-      </ul>
-    </div>
+    }
+  } else {
+    <li class="header">Recent updated repositories</li>
+    @if(recentRepositories.isEmpty){
+      <li>No repositories</li>
+    } else {
+      @defining(10){ max =>
+        @recentRepositories.zipWithIndex.map { case (repository, i) =>
+          <li class="repo-link" style="@if(i > max - 1){display:none;}">
+            <a href="@url(repository)">@helper.html.repositoryicon(repository, false) @repository.owner/<span class="strong">@repository.name</span></a>
+          </li>
+        }
+        @if(recentRepositories.size > max){
+          <li class="show-more">
+            <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
+          </li>
+        }
+      }
+    }
+  }
+  </ul>
   </div>
-  <div class="dashboard-content">
+</div>
+<div class="content-wrapper">
+  <div class="content body">
     @body
   </div>
 </div>
 <script>
 $(function(){
   $('#show-more-repos, #show-more-recent-repos').click(function(e){
-    $(e.target).parents('ul.list-group').find('li.repo-link').show();
+    $(e.target).parents('ul').find('li.repo-link').show();
     $(e.target).parents('li.show-more').remove();
   });
 });
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index d347037..50834ca 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -63,9 +63,6 @@
         @repository.map { repository =>
           <form id="search" action="@path/search" method="POST" class="navbar-form navbar-left" role="search">
             <div class="form-group">
-              @*
-              <input type="text" class="form-control" id="navbar-search-input" placeholder="Search">
-              *@
               <input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search this repository"/>
               <input type="hidden" name="owner" value="@repository.owner"/>
               <input type="hidden" name="repository" value="@repository.name"/>
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index a1f3abb..be2c051 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -10,11 +10,11 @@
   <li @if(active == name){class="active"}>
     @if(path.startsWith("http")){
       <a href="@path" target="_blank">
-        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="badge">@count</span> }</span>
+        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }</span>
       </a>
     } else {
       <a href="@url(repository)@path">
-        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="badge">@count</span> }</span>
+        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }</span>
       </a>
     }
   </li>