diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html
index dd4450b..8238341 100644
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -4,7 +4,7 @@
 @import gitbucket.core.view.helpers._
 @html.main(account.userName){
   <div class="container body">
-    <div style="float: left; width: 250px;">
+    <div class="main-sidebar">
       <div class="block">
         <div class="account-image">@avatar(account.userName, 240)</div>
         <div class="account-fullname">@account.fullName</div>
@@ -25,7 +25,7 @@
         </div>
       }
     </div>
-    <div style="margin-left: 260px; overflow: hidden;">
+    <div class="main-content">
       <ul class="nav nav-tabs" style="margin-bottom: 5px;">
         <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
         @if(account.isGroupAccount){
diff --git a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
index ca35f25..4df81e3 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
@@ -11,12 +11,10 @@
 @import gitbucket.core.view.helpers._
 @html.main("Issues"){
   @sidebar(recentRepositories, userRepositories){
-    <div style="overflow: hidden;">
-      @dashboard.html.tab("issues")
-      <div class="container">
-        @issuesnavi(filter, openCount, closedCount, condition)
-        @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
-      </div>
+    @dashboard.html.tab("issues")
+    <div class="container">
+      @issuesnavi(filter, openCount, closedCount, condition)
+      @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
   }
 }
diff --git a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
index e4fff23..3823d4b 100644
--- a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
@@ -11,12 +11,10 @@
 @import gitbucket.core.view.helpers._
 @html.main("Pull Requests"){
   @sidebar(recentRepositories, userRepositories){
-    <div style="overflow: hidden;">
-      @dashboard.html.tab("pulls")
-      <div class="container">
-        @issuesnavi(filter, openCount, closedCount, condition)
-        @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
-      </div>
+    @dashboard.html.tab("pulls")
+    <div class="container">
+      @issuesnavi(filter, openCount, closedCount, condition)
+      @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
   }
 }
diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index cf13493..4840c17 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -11,14 +11,12 @@
         @Html(information)
       </div>
     }
-    <div style="overflow: hidden;">
-      @dashboard.html.tab()
-      <div class="container">
-        <div class="pull-right">
-          <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
-        </div>
-        @helper.html.activities(activities)
+    @dashboard.html.tab()
+    <div class="container">
+      <div class="pull-right">
+        <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
       </div>
+      @helper.html.activities(activities)
     </div>
   }
 }
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
index 4e48280..6f085b7 100644
--- a/src/main/twirl/gitbucket/core/search/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -3,7 +3,6 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.menu("", repository){
-<div style="overflow: hidden;">
   <ul class="nav nav-tabs" style="margin-bottom: 20px;">
     <li@if(active=="code"){ class="active"}>
       <a href="@url(repository)/search?q=@urlEncode(query)&type=code">
@@ -36,5 +35,4 @@
     <input type="hidden" name="type" value="@active"/>
   </form>
   @body
-</div>
 }
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/settings/menu.scala.html b/src/main/twirl/gitbucket/core/settings/menu.scala.html
index 860e78f..a8207dc 100644
--- a/src/main/twirl/gitbucket/core/settings/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/menu.scala.html
@@ -1,32 +1,30 @@
 @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<div  style="overflow: hidden;">
-  <ul class="nav nav-tabs" style="margin-bottom: 20px;">
-    <li@if(active=="options"){ class="active"}>
-      <a href="@url(repository)/settings/options">Options</a>
-    </li>
-    <li@if(active=="collaborators"){ class="active"}>
-      <a href="@url(repository)/settings/collaborators">Collaborators</a>
-    </li>
-    @if(!repository.branchList.isEmpty){
-    <li@if(active=="branches"){ class="active"}>
-      <a href="@url(repository)/settings/branches">Branches</a>
-    </li>
+<ul class="nav nav-tabs" style="margin-bottom: 20px;">
+  <li@if(active=="options"){ class="active"}>
+    <a href="@url(repository)/settings/options">Options</a>
+  </li>
+  <li@if(active=="collaborators"){ class="active"}>
+    <a href="@url(repository)/settings/collaborators">Collaborators</a>
+  </li>
+  @if(!repository.branchList.isEmpty){
+  <li@if(active=="branches"){ class="active"}>
+    <a href="@url(repository)/settings/branches">Branches</a>
+  </li>
+  }
+  <li@if(active=="hooks"){ class="active"}>
+    <a href="@url(repository)/settings/hooks">Service Hooks</a>
+  </li>
+  <li@if(active=="danger"){ class="active"}>
+    <a href="@url(repository)/settings/danger">Danger Zone</a>
+  </li>
+  @gitbucket.core.plugin.PluginRegistry().getRepositorySettingTabs.map { tab =>
+    @tab(repository, context).map { link =>
+      <li@if(active==link.id){ class="active"}>
+        <a href="@url(repository)/@link.path">@link.label</a>
+      </li>
     }
-    <li@if(active=="hooks"){ class="active"}>
-      <a href="@url(repository)/settings/hooks">Service Hooks</a>
-    </li>
-    <li@if(active=="danger"){ class="active"}>
-      <a href="@url(repository)/settings/danger">Danger Zone</a>
-    </li>
-    @gitbucket.core.plugin.PluginRegistry().getRepositorySettingTabs.map { tab =>
-      @tab(repository, context).map { link =>
-        <li@if(active==link.id){ class="active"}>
-          <a href="@url(repository)/@link.path">@link.label</a>
-        </li>
-      }
-    }
-  </ul>
-  @body
-</div>
\ No newline at end of file
+  }
+</ul>
+@body
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 440a67a..de7720b 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -13,37 +13,35 @@
       <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
     </div>
     <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
-    <div style="overflow: hidden;">
-      <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
-        <span id="error-pageName" class="error"></span>
-        <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/>
-        <div class="muted attachable">
-          @helper.html.preview(
-            repository         = repository,
-            content            = page.map(_.content).getOrElse(""),
-            enableWikiLink     = true,
-            enableRefsLink     = false,
-            enableLineBreaks   = false,
-            enableTaskList     = false,
-            hasWritePermission = false,
-            style              = "height: 400px;",
-            styleClass         = "monospace",
-            placeholder        = "",
-            uid                = 1
-          )
-          <div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
-        </div>
-        <div class="form-group">
-          <label for="message">Edit Message</label>
-          <input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/>
-        </div>
-        <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">
-        </div>
-      </form>
-    </div>
+    <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
+      <span id="error-pageName" class="error"></span>
+      <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/>
+      <div class="muted attachable">
+        @helper.html.preview(
+          repository         = repository,
+          content            = page.map(_.content).getOrElse(""),
+          enableWikiLink     = true,
+          enableRefsLink     = false,
+          enableLineBreaks   = false,
+          enableTaskList     = false,
+          hasWritePermission = false,
+          style              = "height: 400px;",
+          styleClass         = "monospace",
+          placeholder        = "",
+          uid                = 1
+        )
+        <div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
+      </div>
+      <div class="form-group">
+        <label for="message">Edit Message</label>
+        <input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/>
+      </div>
+      <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">
+      </div>
+    </form>
   }
 }
 <script>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 713326c..07f6174 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -201,6 +201,7 @@
 
 div.main-content {
   margin-left: 260px;
+  overflow: hidden;
 }
 
 div.main-center {
@@ -215,6 +216,7 @@
 
 div.dashboard-content {
   margin-left: 310px;
+  overflow: hidden;
 }
 
 div.body {