diff --git a/src/main/twirl/gitbucket/core/admin/plugins.scala.html b/src/main/twirl/gitbucket/core/admin/plugins.scala.html
index b4f6d5403..04fe75e78 100644
--- a/src/main/twirl/gitbucket/core/admin/plugins.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/plugins.scala.html
@@ -12,31 +12,29 @@
       }
       </ul>
 
-      <div style="overflow: hidden;">
-        @plugins.map {plugin =>
-          <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-10">@plugin.pluginId</span>
-              </div>
-              <div class="row">
-                <label class="col-md-2">Version</label>
-                <span class="col-md-10">@plugin.version</span>
-              </div>
-              <div class="row">
-                <label class="col-md-2">Name</label>
-                <span class="col-md-10">@plugin.pluginName</span>
-              </div>
-              <div class="row">
-                <label class="col-md-2">Description</label>
-                <span class="col-md-10 muted">@plugin.description</span>
-              </div>
+      @plugins.map {plugin =>
+        <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-10">@plugin.pluginId</span>
+            </div>
+            <div class="row">
+              <label class="col-md-2">Version</label>
+              <span class="col-md-10">@plugin.version</span>
+            </div>
+            <div class="row">
+              <label class="col-md-2">Name</label>
+              <span class="col-md-10">@plugin.pluginName</span>
+            </div>
+            <div class="row">
+              <label class="col-md-2">Description</label>
+              <span class="col-md-10 muted">@plugin.description</span>
             </div>
           </div>
-        }
-      </div>
+        </div>
+      }
     } else {
       <p>No plugin detected on your gitbucket installation.</p>
     }
diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index 53cf4c571..8426d592a 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -10,15 +10,13 @@
 @import gitbucket.core.view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @if(showIndex){
-  <div style="overflow: hidden;">
-    <div class="pull-right" style="margin-bottom: 10px;">
-      <div class="btn-group" data-toggle="buttons-radio">
-        <input type="button" id="btn-unified" class="btn btn-default btn-small active" value="Unified">
-        <input type="button" id="btn-split" class="btn btn-default btn-small" value="Split">
-      </div>
+  <div class="pull-right" style="margin-bottom: 10px;">
+    <div class="btn-group" data-toggle="buttons-radio">
+      <input type="button" id="btn-unified" class="btn btn-default btn-small active" value="Unified">
+      <input type="button" id="btn-split" class="btn btn-default btn-small" value="Split">
     </div>
-    Showing <a href="javascript:void(0);" id="toggle-file-list">@diffs.size changed @plural(diffs.size, "file")</a>
   </div>
+  Showing <a href="javascript:void(0);" id="toggle-file-list">@diffs.size changed @plural(diffs.size, "file")</a>
   <ul id="commit-file-list" style="display: none;">
   @diffs.zipWithIndex.map { case (diff, i) =>
     <li@if(i > 0){ class="border"}>
diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html
index 6c6a2442f..17c88adfc 100644
--- a/src/main/twirl/gitbucket/core/settings/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html
@@ -7,65 +7,63 @@
 @html.main("Branches", Some(repository)){
   @html.menu("settings", repository){
     @menu("branches", repository){
-      <div style="overflow: hidden;">
-        @if(repository.branchList.isEmpty){
-          <div class="well">
-            <center>
-              <p><i class="octicon octicon-git-branch" style="font-size:300%"></i></p>
-              <p>You don’t have any branches</p>
-              <p>Before you can edit branch settings, you need to add a branch.</p>
-            </center>
+      @if(repository.branchList.isEmpty){
+        <div class="well">
+          <center>
+            <p><i class="octicon octicon-git-branch" style="font-size:300%"></i></p>
+            <p>You don’t have any branches</p>
+            <p>Before you can edit branch settings, you need to add a branch.</p>
+          </center>
+        </div>
+      } else {
+        @helper.html.information(info)
+        <div class="panel panel-default">
+          <div class="panel-heading strong">Default branch</div>
+          <div class="panel-body">
+            <p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p>
+            <form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline">
+              <span class="error" id="error-defaultBranch"></span>
+              <select name="defaultBranch" id="defaultBranch" class="form-control">
+                @repository.branchList.map { branch =>
+                  <option @if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+                }
+              </select>
+              <input type="submit" class="btn btn-default" value="Update" />
+            </form>
           </div>
-        } else {
-          @helper.html.information(info)
-          <div class="panel panel-default">
-            <div class="panel-heading strong">Default branch</div>
-            <div class="panel-body">
-              <p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p>
-              <form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline">
-                <span class="error" id="error-defaultBranch"></span>
-                <select name="defaultBranch" id="defaultBranch" class="form-control">
+        </div>
+
+        <div class="panel panel-default">
+          <div class="panel-heading strong">Protected branches</div>
+          <div class="panel-body">
+            <p>Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?
+              <form class="form-inline">
+                <select name="protectBranch" id="protectBranch" onchange="location=$(this).val()" class="form-control">
+                  <option>Choose a branch...</option>
                   @repository.branchList.map { branch =>
-                    <option @if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+                    <option value="@url(repository)/settings/branches/@encodeRefName(branch)">@branch</option>
                   }
                 </select>
-                <input type="submit" class="btn btn-default" value="Update" />
+                <span class="error" id="error-protectBranch"></span>
               </form>
-            </div>
+            </p>
+
+            <table class="table table-bordered table-hover branches">
+              @protectedBranchList.map { branch =>
+                <tr>
+                  <td>
+                    <span class="branch-name">@branch</span>
+                    <span class="branch-action">
+                      <a href="@url(repository)/settings/branches/@encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
+                    </span>
+                  </td>
+                </tr>
+              }
+            </table>
           </div>
 
-          <div class="panel panel-default">
-            <div class="panel-heading strong">Protected branches</div>
-            <div class="panel-body">
-              <p>Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?
-                <form class="form-inline">
-                  <select name="protectBranch" id="protectBranch" onchange="location=$(this).val()" class="form-control">
-                    <option>Choose a branch...</option>
-                    @repository.branchList.map { branch =>
-                      <option value="@url(repository)/settings/branches/@encodeRefName(branch)">@branch</option>
-                    }
-                  </select>
-                  <span class="error" id="error-protectBranch"></span>
-                </form>
-              </p>
-
-              <table class="table table-bordered table-hover branches">
-                @protectedBranchList.map { branch =>
-                  <tr>
-                    <td>
-                      <span class="branch-name">@branch</span>
-                      <span class="branch-action">
-                        <a href="@url(repository)/settings/branches/@encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
-                      </span>
-                    </td>
-                  </tr>
-                }
-              </table>
-            </div>
-
-          </div>
-        }
-      </div>
+        </div>
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index fb57d92d2..4740ac7f5 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -13,7 +13,7 @@
       @helper.html.information(info)
       <div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div>
       <form name="branchProtection" onsubmit="submitForm(event)">
-        <div class="panel panel-default" style="overflow: hidden;">
+        <div class="panel panel-default">
           <div class="panel-heading">Branch protection for <b>@branch</b></div>
           <div class="panel-body">
 
diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html
index f97258ac5..338a2b706 100644
--- a/src/main/twirl/gitbucket/core/settings/danger.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html
@@ -5,7 +5,7 @@
   @html.menu("settings", repository){
     @menu("danger", repository){
       @helper.html.information(info)
-      <div class="panel panel-default" style="overflow: hidden;">
+      <div class="panel panel-default">
         <div class="panel-heading strong">Danger Zone</div>
         <div class="panel-body">
           <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
index 0ca0c0d4b..a82f2d686 100644
--- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -7,7 +7,7 @@
   @html.menu("settings", repository){
     @menu("hooks", repository){
       @helper.html.information(info)
-      <div class="panel panel-default" style="overflow: hidden;">
+      <div class="panel panel-default">
         <div class="panel-heading strong">
           Webhooks
         </div>
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index 2d5856ece..6388afcc5 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -5,7 +5,7 @@
   @html.menu("settings", repository){
     @menu("options", repository){
       @helper.html.information(info)
-      <form id="form" method="post" action="@url(repository)/settings/options" validate="true" style="overflow: hidden;">
+      <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
         <div class="panel panel-default">
           <div class="panel-heading strong">Settings</div>
           <div class="panel-body">