diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
index be35630..653d467 100644
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -42,12 +42,12 @@
       <fieldset class="margin">
         @if(account.isDefined){
           <div class="pull-right">
-            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger btn-lg">Delete Group</a>
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
           </div>
         }
-        <input type="submit" class="btn btn-success btn-lg" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
         @if(account.isDefined){
-          <a href="@url(account.get.userName)" class="btn btn-default btn-lg">Cancel</a>
+          <a href="@url(account.get.userName)" class="btn btn-default">Cancel</a>
         }
       </fieldset>
   </form>
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index b796053..fbb7645 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -67,7 +67,7 @@
       </label>
     </fieldset>
     <fieldset class="margin form-actions">
-      <input type="submit" class="btn btn-success btn-lg" value="Create repository"/>
+      <input type="submit" class="btn btn-success" value="Create repository"/>
     </fieldset>
   </form>
 </div>
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index dba5f63..eac843e 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -3,7 +3,7 @@
 <div class="container body">
   <div class="row">
     <div class="col-md-3">
-      <ul class="nav nav-tabs nav-stacked side-menu" id="system-admin-menu-container">
+      <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
         <li@if(active=="users"){ class="active"}>
           <a href="@path/admin/users">User Management</a>
         </li>
diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
index c6b0f61..ba124ad 100644
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -25,9 +25,9 @@
         <div class="text-right">
           <input type="hidden" name="issueId" value="@issue.issueId"/>
           @if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){
-            <input type="submit" class="btn btn-lg 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-default" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
           }
-          <input type="submit" class="btn btn-lg btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
+          <input type="submit" class="btn btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
         </div>
       </div>
     </div>
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index 97ab7ac..9beb1a4 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -27,7 +27,7 @@
                 elastic            = true
               )
               <div class="align-right">
-                <input type="submit" class="btn btn-lg btn-success" value="Submit new issue"/>
+                <input type="submit" class="btn btn-success" value="Submit new issue"/>
               </div>
             </div>
           </div>
diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
index e8c5d4e..e30329e 100644
--- a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
@@ -5,8 +5,8 @@
   <textarea id="edit-content-@commentId" class="form-control">@content</textarea>
 }
 <div>
-  <input type="button" id="cancel-comment-@commentId" class="btn btn-lg btn-danger" value="Cancel"/>
-  <input type="button" id="update-comment-@commentId" class="btn btn-lg btn-default pull-right" value="Update comment"/>
+  <input type="button" id="cancel-comment-@commentId" class="btn btn-danger" value="Cancel"/>
+  <input type="button" id="update-comment-@commentId" class="btn btn-default pull-right" value="Update comment"/>
 </div>
 <script>
 $(function(){
diff --git a/src/main/twirl/gitbucket/core/issues/editissue.scala.html b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
index 176ff19..ddbab35 100644
--- a/src/main/twirl/gitbucket/core/issues/editissue.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
@@ -4,8 +4,8 @@
   <textarea id="edit-content" class="form-control">@content.getOrElse("")</textarea>
 }
 <div>
-  <input type="button" id="cancel-issue" class="btn btn-lg btn-danger" value="Cancel"/>
-  <input type="button" id="update-issue" class="btn btn-lg btn-default pull-right" value="Update comment"/>
+  <input type="button" id="cancel-issue" class="btn btn-danger" value="Cancel"/>
+  <input type="button" id="update-issue" class="btn btn-default pull-right" value="Update comment"/>
 </div>
 <script>
 $(function(){
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index 36ad7ee..4d2c7c3 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -78,7 +78,7 @@
                   <input type="hidden" name="commitIdFrom" value="@sourceId"/>
                   <input type="hidden" name="commitIdTo" value="@commitId"/>
                   <div class="align-right">
-                    <input type="submit" class="btn btn-lg btn-success" value="Create pull request"/>
+                    <input type="submit" class="btn btn-success" value="Create pull request"/>
                   </div>
                 </div>
               </div>
diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html
index 2096ed3..9bc3132 100644
--- a/src/main/twirl/gitbucket/core/repo/editor.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -58,11 +58,11 @@
           </div>
           <div style="text-align: right;">
             @if(fileName.isEmpty){
-              <a href="@url(repository)/tree/@encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-lg btn-danger">Cancel</a>
+              <a href="@url(repository)/tree/@encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-danger">Cancel</a>
             } else {
-              <a href="@url(repository)/blob/@encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-lg btn-danger">Cancel</a>
+              <a href="@url(repository)/blob/@encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-danger">Cancel</a>
             }
-            <input type="submit" id="commit" class="btn btn-lg btn-success" value="Commit changes" disabled="true"/>
+            <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
             <input type="hidden" id="charset" name="charset" value="@content.charset"/>
             <input type="hidden" id="lineSeparator" name="lineSeparator" value="@content.lineSeparator"/>
             <input type="hidden" id="content" name="content" value=""/>
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index 41855ee..bbd78ab 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -57,7 +57,7 @@
                 </div>
               </div>
             </div>
-            <input class="btn btn-success btn-lg" type="submit" value="Save changes" />
+            <input class="btn btn-success" type="submit" value="Save changes" />
           </div>
         </div>
       </form>
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
index 74e64d9..a82f2d6 100644
--- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -9,7 +9,6 @@
       @helper.html.information(info)
       <div class="panel panel-default">
         <div class="panel-heading strong">
-          <a href="@url(repository)/settings/hooks/new" class="btn btn-success btn-sm pull-right">Add webhook</a>
           Webhooks
         </div>
         <div class="panel-body">
@@ -18,8 +17,9 @@
             When the specified events happen, we’ll send a POST request to each of the URLs you provide.
             Learn more in <a href="https://github.com/takezoe/gitbucket/wiki/API-WebHook" target="_blank">GitBucket Wiki Webhook Page</a>.
           </p>
+          <a href="@url(repository)/settings/hooks/new" class="btn btn-success pull-right" style="margin-bottom: 10px;">Add webhook</a>
 
-          <table class="table table-condensed" style="margin-bottom:0">
+          <table class="table table-condensed" style="margin-bottom:0px;">
             @webHooks.map { case (webHook, events) =>
               <tr><td style="vertical-align: middle;">
                 <a href="@url(repository)/settings/hooks/edit?url=@urlEncode(webHook.url)" class="css-truncate" style="max-width:360px">
diff --git a/src/main/twirl/gitbucket/core/settings/menu.scala.html b/src/main/twirl/gitbucket/core/settings/menu.scala.html
index 2734226..5c7a464 100644
--- a/src/main/twirl/gitbucket/core/settings/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/menu.scala.html
@@ -4,7 +4,7 @@
 <div class="row">
   <div class="col-md-3">
     <div class="box">
-      <ul class="nav nav-tabs nav-stacked side-menu">
+      <ul class="nav nav-pills nav-stacked">
         <li@if(active=="options"){ class="active"}>
           <a href="@url(repository)/settings/options">Options</a>
         </li>
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 64c527e..787e03e 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -41,7 +41,7 @@
       <div class="form-group pull-right">
         <input type="hidden" name="currentPageName" value="@pageName"/>
         <input type="hidden" name="id" value="@page.map(_.id)"/>
-        <input type="submit" value="Save" class="btn btn-success btn-lg">
+        <input type="submit" value="Save" class="btn btn-success">
       </div>
     </form>
   }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 80b7b05..7e1bce9 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -113,6 +113,11 @@
   border-radius: initial;
 }
 
+label.radio, label.checkbox {
+  position: relative;
+  left: 20px;
+}
+
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
@@ -478,6 +483,7 @@
 /****************************************************************************/
 /* Stacked side menu */
 /****************************************************************************/
+/*
 ul.nav-stacked.side-menu {
   margin-bottom: 0px;
 }
@@ -527,7 +533,7 @@
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-
+*/
 /****************************************************************************/
 /* Repositories */
 /****************************************************************************/