diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
index 469d687..cce8913 100644
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -3,53 +3,54 @@
 @import gitbucket.core.view.helpers._
 @html.main(if(account.isEmpty) "Create group" else "Edit group"){
 <div class="body main-center">
+  <h2>@{if(account.isEmpty) "Create group" else "Edit group"}</h2>
   <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
-      <div class="row">
-        <div class="col-md-5">
-          <fieldset class="form-group">
-            <label for="groupName" class="strong">Group name</label>
-            <div>
-              <span id="error-groupName" class="error"></span>
-            </div>
-            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label class="strong">URL (Optional)</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="avatar" class="strong">Image (Optional)</label>
-            @helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-        <div class="col-md-7">
-          <fieldset class="form-group">
-            <label class="strong">Members</label>
-            <ul id="member-list" class="collaborator">
-            </ul>
-            @helper.html.account("memberName", 200)
-            <input type="button" class="btn btn-default" value="Add" id="addMember"/>
-            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
-            <div>
-              <span class="error" id="error-members"></span>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <fieldset class="margin">
-        @if(account.isDefined){
-          <div class="pull-right">
-            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+    <div class="row">
+      <div class="col-md-5">
+        <fieldset class="form-group">
+          <label for="groupName" class="strong">Group name</label>
+          <div>
+            <span id="error-groupName" class="error"></span>
           </div>
-        }
-        <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">Cancel</a>
-        }
-      </fieldset>
+          <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+        </fieldset>
+        <fieldset class="form-group">
+          <label class="strong">URL (Optional)</label>
+          <div>
+            <span id="error-url" class="error"></span>
+          </div>
+          <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
+        </fieldset>
+        <fieldset class="form-group">
+          <label for="avatar" class="strong">Image (Optional)</label>
+          @helper.html.uploadavatar(account)
+        </fieldset>
+      </div>
+      <div class="col-md-7">
+        <fieldset class="form-group">
+          <label class="strong">Members</label>
+          <ul id="member-list" class="collaborator">
+          </ul>
+          @helper.html.account("memberName", 200)
+          <input type="button" class="btn btn-default" value="Add" id="addMember"/>
+          <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
+          <div>
+            <span class="error" id="error-members"></span>
+          </div>
+        </fieldset>
+      </div>
+    </div>
+    <fieldset class="border-top">
+      @if(account.isDefined){
+        <div class="pull-right">
+          <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+        </div>
+      }
+      <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">Cancel</a>
+      }
+    </fieldset>
   </form>
 </div>
 }
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index 586d12c..007e182 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -9,7 +9,7 @@
     A repository contains all the files for your project, including the revision history.
   </p>
   <form id="form" method="post" action="@path/new" validate="true">
-    <fieldset class="margin form-group">
+    <fieldset class="border-top form-group">
       <dl style="float: left;">
         <dt>Owner</dt>
         <dd style="margin-left: 0px;">
@@ -41,7 +41,7 @@
       <label for="description" class="strong">Description (optional):</label>
       <input type="text" name="description" id="description" class="form-control" style="width: 95%;"/>
     </fieldset>
-    <fieldset class="margin">
+    <fieldset class="border-top">
       <label class="radio">
         <input type="radio" name="isPrivate" value="false" @if(isCreateRepoOptionPublic){checked}>
         <span class="strong"><i class="octicon octicon-repo"></i>&nbsp;</i>&nbsp;Public</span>
@@ -57,7 +57,7 @@
         </div>
       </label>
     </fieldset>
-    <fieldset class="margin">
+    <fieldset class="border-top">
       <label for="createReadme" class="checkbox">
         <input type="checkbox" name="createReadme" id="createReadme"/>
         <span class="strong">Initialize this repository with a README</span>
@@ -66,7 +66,7 @@
         </div>
       </label>
     </fieldset>
-    <fieldset class="margin form-actions">
+    <fieldset class="border-top form-actions">
       <input type="submit" class="btn btn-success" value="Create repository"/>
     </fieldset>
   </form>
diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html
index 8dc7c59..90eecc3 100644
--- a/src/main/twirl/gitbucket/core/account/register.scala.html
+++ b/src/main/twirl/gitbucket/core/account/register.scala.html
@@ -3,7 +3,7 @@
 @import gitbucket.core.view.helpers._
 @html.main("Create your account"){
 <div class="container body main-center">
-  <h3>Create your account</h3>
+  <h2>Create your account</h2>
   <form action="@path/register" method="POST" validate="true">
     <div class="row">
       <div class="col-md-6">
@@ -42,7 +42,7 @@
         </fieldset>
       </div>
     </div>
-    <fieldset class="margin">
+    <fieldset class="border-top">
       <input type="submit" class="btn btn-success" value="Create account"/>
     </fieldset>
   </form>
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index 2765da8..612d8fd 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -1,8 +1,8 @@
 @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
-<div class="container body">
-  <div class="main-sidebar">
-    <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
+<div class="main-sidebar">
+  <div class="sidebar">
+    <ul class="sidebar-menu" id="system-admin-menu-container">
       <li@if(active=="users"){ class="active"}>
         <a href="@path/admin/users">User Management</a>
       </li>
@@ -27,7 +27,9 @@
       }
    </ul>
   </div>
-  <div class="main-content">
+</div>
+<div class="content-wrapper">
+  <div class="content body">
     @body
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/twirl/gitbucket/core/admin/user.scala.html b/src/main/twirl/gitbucket/core/admin/user.scala.html
index 6723524..8ace5f9 100644
--- a/src/main/twirl/gitbucket/core/admin/user.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/user.scala.html
@@ -75,7 +75,7 @@
           </fieldset>
         </div>
       </div>
-      <fieldset class="margin">
+      <fieldset class="border-top">
         <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
         <a href="@path/admin/users" class="btn btn-default">Cancel</a>
       </fieldset>
diff --git a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
index 3b69e8b..f585072 100644
--- a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
@@ -45,7 +45,7 @@
           </fieldset>
         </div>
       </div>
-      <fieldset class="margin">
+      <fieldset class="border-top">
         <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
         <a href="@path/admin/users" class="btn btn-default">Cancel</a>
       </fieldset>
diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html
index 338a2b7..42213ba 100644
--- a/src/main/twirl/gitbucket/core/settings/danger.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html
@@ -24,7 +24,7 @@
             </fieldset>
           </form>
           <form id="delete-form" method="post" action="@url(repository)/settings/delete">
-            <fieldset class="margin form-group">
+            <fieldset class="border-top form-group">
               <label class="strong">Delete repository</label>
               <div>
                 Once you delete a repository, there is no going back.
@@ -33,7 +33,7 @@
             </fieldset>
           </form>
           <form id="gc-form" method="post" action="@url(repository)/settings/gc">
-            <fieldset class="margin form-group">
+            <fieldset class="border-top form-group">
               <label class="strong">Garbage collection</label>
               <div>
                 Run garbage collection for this git repository immediately.
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index 6388afc..907bf67 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -14,11 +14,11 @@
               <input type="text" name="repositoryName" id="repositoryName" class="form-control" value="@repository.name"/>
               <span id="error-repositoryName" class="error"></span>
             </fieldset>
-            <fieldset class="margin form-group">
+            <fieldset class="border-top form-group">
               <label for="description" class="strong">Description:</label>
               <input type="text" name="description" id="description" class="form-control" value="@repository.repository.description"/>
             </fieldset>
-            <fieldset class="margin">
+            <fieldset class="border-top">
               <label class="radio">
                 <input type="radio" name="isPrivate" value="false"
                   @if(!repository.repository.isPrivate              ){ checked  }