diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index 17f8570..2b65018 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -26,9 +26,9 @@
         } else {
           <div class="box-header">
             <div class="pull-right">
-              <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
+              <a href="@path/new" class="btn btn-success btn-sm">New repository</a>
             </div>
-            <span class="strong">Your repositories</span> <span class="label">@userRepositories.size</span>
+            <span class="strong">Your repositories</span> <span class="badge">@userRepositories.size</span>
           </div>
             @if(userRepositories.isEmpty){
               <div class="box-content-bottom">
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 06e6ae4..568a43f 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -41,11 +41,13 @@
     <form id="search" action="@path/search" method="POST" class="form-inline">
       <nav class="navbar navbar-default">
         <div class="container" style="width: 980px;">
+          @*
           <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
+          *@
           <a class="navbar-brand" href="@path/">
             <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
             @defining(AutoUpdate.getCurrentVersion){ version =>
@@ -62,23 +64,25 @@
             <a href="@path/dashboard/issues" class="global-header-menu">Issues</a>
           }
           @if(loginAccount.isDefined){
-            <div class="btn-group" style="margin-top: 0px;">
-              <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="octicon octicon-plus" style="font-size: 20px; vertical-align: middle;height:20px !important;"></i><span class="caret" style="vertical-align: middle;"></span></a>
-              <ul class="dropdown-menu pull-right">
-                <li><a href="@path/new">New repository</a></li>
-                <li><a href="@path/groups/new">New group</a></li>
-              </ul>
-            </div>
-            <div class="btn-group" style="margin-top: 0px;">
-              <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName">@avatar(loginAccount.get.userName, 16)<span class="caret" style="vertical-align: middle;"></span></a>
-              <ul class="dropdown-menu pull-right">
-                <li><a href="@url(loginAccount.get.userName)">Your profile</a></li>
-                <li><a href="@url(loginAccount.get.userName)/_edit">Account settings</a></li>
-                @if(loginAccount.get.isAdmin){
-                  <li><a href="@path/admin/users">System administration</a></li>
-                }
-                <li><a href="@path/signout">Sign out</a></li>
-              </ul>
+            <div class="pull-right" style="margin-top: 12px;">
+              <div class="btn-group" style="margin-right: 8px;">
+                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="octicon octicon-plus" style="font-size: 20px; vertical-align: middle;height:20px !important;"></i><span class="caret" style="vertical-align: middle;"></span></a>
+                <ul class="dropdown-menu pull-right">
+                  <li><a href="@path/new">New repository</a></li>
+                  <li><a href="@path/groups/new">New group</a></li>
+                </ul>
+              </div>
+              <div class="btn-group">
+                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName">@avatar(loginAccount.get.userName, 16)<span class="caret" style="vertical-align: middle;"></span></a>
+                <ul class="dropdown-menu pull-right">
+                  <li><a href="@url(loginAccount.get.userName)">Your profile</a></li>
+                  <li><a href="@url(loginAccount.get.userName)/_edit">Account settings</a></li>
+                  @if(loginAccount.get.isAdmin){
+                    <li><a href="@path/admin/users">System administration</a></li>
+                  }
+                  <li><a href="@path/signout">Sign out</a></li>
+                </ul>
+              </div>
             </div>
           } else {
             <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-default pull-right" style="margin-top: 12px;" id="signin">Sign in</a>
diff --git a/src/main/twirl/gitbucket/core/signinform.scala.html b/src/main/twirl/gitbucket/core/signinform.scala.html
index 7b5fb79..8c879f8 100644
--- a/src/main/twirl/gitbucket/core/signinform.scala.html
+++ b/src/main/twirl/gitbucket/core/signinform.scala.html
@@ -10,14 +10,16 @@
 </div>
 <div class="box-content-bottom">
   <form action="@path/signin" method="POST" validate="true">
-    <label for="userName">Username:</label>
-    <span id="error-userName" class="error"></span>
-    <input type="text" name="userName" id="userName" style="width: 95%" autofocus/>
-    <label for="password">Password:</label>
-    <span id="error-password" class="error"></span>
-    <input type="password" name="password" id="password" style="width: 95%"/>
-    <div>
-      <input type="submit" class="btn btn-success" value="Sign in"/>
+    <div class="form-group">
+      <label for="userName">Username:</label>
+      <span id="error-userName" class="error"></span>
+      <input type="text" name="userName" id="userName" class="form-control" autofocus/>
     </div>
+    <div class="form-group">
+      <label for="password">Password:</label>
+      <span id="error-password" class="error"></span>
+      <input type="password" name="password" id="password" class="form-control"/>
+    </div>
+    <input type="submit" class="btn btn-success" value="Sign in"/>
   </form>
 </div>