diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index 8a375ea..f36e840 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -10,9 +10,9 @@
       @menu("application", settings.ssh)
     </div>
     <div class="col-md-9">
-      <div class="box">
-        <div class="box-header">Personal access tokens</div>
-        <div class="box-content-bottom">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">Personal access tokens</div>
+        <div class="panel-body">
           @if(personalTokens.isEmpty && gneratedToken.isEmpty){
             No tokens.
           } else {
@@ -38,9 +38,9 @@
         </div>
       </div>
       <form method="POST" action="@path/@account.userName/_personalToken" validate="true">
-        <div class="box">
-          <div class="box-header">Generate new token</div>
-          <div class="box-content-bottom">
+        <div class="panel panel-default">
+          <div class="panel-heading strong">Generate new token</div>
+          <div class="panel-body">
             <fieldset>
               <label for="note" class="strong">Token description</label>
               <div><span id="error-note" class="error"></span></div>
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index 8e0329e..ba16103 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -12,9 +12,9 @@
       @helper.html.information(info)
       @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
       <form action="@url(account.userName)/_edit" method="POST" validate="true">
-      <div class="box">
-        <div class="box-header"><span class="strong">Profile</span></div>
-        <div class="box-content-bottom">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">Profile</div>
+        <div class="panel-body">
           <div class="row">
             <div class="col-md-6">
               @if(account.password.nonEmpty){
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index fe6a16f..fcf5bda 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -9,9 +9,9 @@
       @menu("ssh", settings.ssh)
     </div>
     <div class="col-md-9">
-      <div class="box">
-        <div class="box-header">SSH Keys</div>
-        <div class="box-content-bottom">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">SSH Keys</div>
+        <div class="panel-body">
           @if(sshKeys.isEmpty){
             No keys
           }
@@ -25,18 +25,18 @@
         </div>
       </div>
       <form method="POST" action="@path/@account.userName/_ssh" validate="true">
-        <div class="box">
-          <div class="box-header">Add an SSH Key</div>
-          <div class="box-content-bottom">
-            <fieldset>
+        <div class="panel panel-default">
+          <div class="panel-heading strong">Add an SSH Key</div>
+          <div class="panel-body">
+            <fieldset class="form-group">
               <label for="title" class="strong">Title</label>
               <div><span id="error-title" class="error"></span></div>
-              <input type="text" name="title" id="title" style="width: 400px;"/>
+              <input type="text" name="title" id="title" class="form-control" style="width: 400px;"/>
             </fieldset>
-            <fieldset>
+            <fieldset class="form-group">
               <label for="publicKey" class="strong">Key</label>
               <div><span id="error-publicKey" class="error"></span></div>
-              <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
+              <textarea name="publicKey" id="publicKey" class="form-control" style="width: 600px; height: 250px;"></textarea>
             </fieldset>
             <input type="submit" class="btn btn-success" value="Add"/>
           </div>
diff --git a/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html b/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
index 8d82903..ed50e45 100644
--- a/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
@@ -13,9 +13,9 @@
       </ul>
 
       @plugins.map {plugin =>
-        <div class="box">
-          <div class="box-header">@plugin.pluginName</div>
-          <div class="box-content-bottom">
+        <div class="panel panel-default">
+          <div class="panel-heading strong">@plugin.pluginName</div>
+          <div class="panel-body">
             <div class="row">
               <label class="col-md-2">Id</label>
               <span class="col-md-8">@plugin.pluginId</span>
diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index c4f2cd9..33d94d0 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -6,9 +6,9 @@
   @menu("system"){
     @helper.html.information(info)
     <form action="@path/admin/system" method="POST" validate="true" class="form-horizontal">
-      <div class="box">
-        <div class="box-header"><span class="strong">System Settings</span></div>
-        <div class="box-content-bottom">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">System Settings</div>
+        <div class="panel-body">
           <!--====================================================================-->
           <!-- GITBUCKET_HOME -->
           <!--====================================================================-->
@@ -317,4 +317,4 @@
     $('.ldap input').prop('disabled', !$(this).prop('checked'));
   }).change();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html
index 23bb3e5..576dfa1 100644
--- a/src/main/twirl/gitbucket/core/wiki/page.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -26,20 +26,22 @@
     </ul>
     <div style="width: 200px; margin-top: 20px;" class="pull-right">
       @defining(15){ max =>
-        <div class="box-header">
-          <span class="strong">Pages</span> <span class="badge">@pages.length</span>
-        </div>
-        <div class="box-content-bottom" style="padding: 0px;">
-          @pages.zipWithIndex.map { case (page, i) =>
-            <div class="box-content-row page-link" style="border: none; @if(i > max - 1){display:none;}">
-              <a href="@url(repository)/wiki/@urlEncode(page)" class="strong">@page</a>
-            </div>
-          }
-          @if(pages.size > max){
-            <div class="box-content-row show-more">
-              <a href="javascript:void(0);" id="show-more-pages">Show more @{pages.size - max} pages...</a>
-            </div>
-          }
+        <div class="panel panel-default">
+          <div class="panel-heading strong">
+            Pages <span class="badge">@pages.length</span>
+          </div>
+          <ul class="list-group list-group-flush">
+            @pages.zipWithIndex.map { case (page, i) =>
+              <li class="list-group-item page-link" style="border: none; @if(i > max - 1){display:none;}">
+                <a href="@url(repository)/wiki/@urlEncode(page)" class="strong">@page</a>
+              </li>
+            }
+            @if(pages.size > max){
+              <li class="list-group-item show-more">
+                <a href="javascript:void(0);" id="show-more-pages">Show more @{pages.size - max} pages...</a>
+              </li>
+            }
+          </ul>
         </div>
       }
       <div class="small">
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index f2d514b..43e5aee 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -403,9 +403,9 @@
 }
 */
 
-li.repo-link {
-  padding-top: 5px;
-  padding-bottom: 5px;
+li.repo-link, li.page-link {
+  padding-top: 4px;
+  padding-bottom: 4px;
 }
 
 div.box-content-bottom {