diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
index eec5ecb..c2dcd95 100644
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -2,14 +2,16 @@
 @import context._
 <div class="row-fluid">
   <div class="span3">
-    <ul class="nav nav-tabs nav-stacked">
-      <li@if(active=="users"){ class="active"}>
-        <a href="@path/admin/users">User Management</a>
-      </li>
-      <li@if(active=="system"){ class="active"}>
-        <a href="@path/admin/system">System Settings</a>
-      </li>
-   </ul>
+    <div class="box">
+      <ul class="nav nav-tabs nav-stacked">
+        <li@if(active=="users"){ class="active"}>
+          <a href="@path/admin/users">User Management</a>
+        </li>
+        <li@if(active=="system"){ class="active"}>
+          <a href="@path/admin/system">System Settings</a>
+        </li>
+     </ul>
+   </div>
   </div>
   <div class="span9">
     @body
diff --git a/src/main/twirl/settings/menu.scala.html b/src/main/twirl/settings/menu.scala.html
index 878765f..8e88d40 100644
--- a/src/main/twirl/settings/menu.scala.html
+++ b/src/main/twirl/settings/menu.scala.html
@@ -3,17 +3,19 @@
 @import view.helpers._
 <div class="row-fluid">
   <div class="span3">
-    <ul class="nav nav-tabs nav-stacked">
-      <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>
-      <li@if(active=="delete"){ class="active"}>
-        <a href="@url(repository)/settings/delete">Delete Repository</a>
-      </li>
-   </ul>
+    <div class="box">
+      <ul class="nav nav-tabs nav-stacked">
+        <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>
+        <li@if(active=="delete"){ class="active"}>
+          <a href="@url(repository)/settings/delete">Delete Repository</a>
+        </li>
+      </ul>
+    </div>
   </div>
   <div class="span9">
     @body
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 3105f84..c95825c 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -140,7 +140,7 @@
 
 div.box-content {
   background-color: white;
-  border: 1px solid silver;
+  border: 1px solid #d8d8d8;
   padding: 4px;
 }
 
@@ -188,6 +188,57 @@
 }
 
 /****************************************************************************/
+/* Stacked side menu */
+/****************************************************************************/
+ul.nav-stacked {
+  margin-bottom: 0px;
+}
+
+ul.nav-stacked li {
+  background-color: #f9f9f9;
+}
+
+ul.nav-stacked li a:hover {
+  background-color: white;
+}
+
+ul.nav-stacked li.active a {
+  background-color: white;
+  color: black;
+  font-weight: bold;
+  border-left: 2px solid #cc6666;
+}
+
+ul.nav-stacked li.active a:hover {
+  background-color: white;
+  color: black;
+  font-weight: bold;
+  border-left: 2px solid #cc6666;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 0px;
+
+  border-top-right-radius: 0px;
+  -webkit-border-top-left-radius: 0px;
+
+  border-top-left-radius: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-topleft: 0px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 0px;
+
+  border-bottom-right-radius: 0px;
+  -webkit-border-bottom-left-radius: 0px;
+
+  border-bottom-left-radius: 0px;
+  -moz-border-radius-bottomright: 0px;
+  -moz-border-radius-bottomleft: 0px;
+}
+
+/****************************************************************************/
 /* Repository Viewer */
 /****************************************************************************/
 table.table-file-list {