diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html
index 4080ed6..ba87449 100644
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -3,13 +3,27 @@
 <div class="head">
   <a href="@path/@repository.owner">@repository.owner</a> / <a href="@path/@repository.owner/@repository.name">@repository.name</a>
 </div>
-<div class="navbar">
-  <div class="navbar-inner">
-    <ul class="nav">
-      <li@if(active=="code"){ class="active"}><a href="@path/@repository.owner/@repository.name">Code</a></li>
-      <li@if(active=="issue"){ class="active"}><a href="#">Issue</a></li>
-      <li@if(active=="wiki"){ class="active"}><a href="@path/@repository.owner/@repository.name/wiki">Wiki</a></li>
-      <li@if(active=="settings"){ class="active"}><a href="@path/@repository.owner/@repository.name/settings">Settings</a></li>
-    </ul>
-  </div>
-</div>
+<table class="global-nav box-header">
+  <tr>
+    <th class="box-header@if(active=="code"){ active}">
+      <a href="@path/@repository.owner/@repository.name">Code</a>
+    </th>
+    <th class="box-header@if(active=="issue"){ active}">
+      <a href="#">Issue</a>
+    </th>
+    <th class="box-header@if(active=="wiki"){ active}">
+      <a href="@path/@repository.owner/@repository.name/wiki">Wiki</a>
+    </th>
+    <th class="box-header@if(active=="settings"){ active}">
+      <a href="@path/@repository.owner/@repository.name/settings">Settings</a>
+    </th>
+  </tr>  
+</table>
+<script type="text/javascript">
+$(function(){
+  $('.box-header').click(function(){
+    location.href = $(this).find('a').attr('href');
+    return false;
+  });
+});
+</script>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index c701b3c..9fd62ea 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1,3 +1,25 @@
+table.global-nav {
+  width: 920px;
+  margin-bottom: 10px;
+}
+
+table.global-nav th {
+  padding-top: 5px;
+  padding-bottom: 8px;
+  width: 25%;
+  border-bottom: 2px solid silver;
+  cursor: pointer;
+}
+
+table.global-nav th.active {
+  border-bottom: 2px solid #D26911;
+}
+
+table.global-nav th a:link, table.global-nav th a:hover, table.global-nav th a:visited {
+  color: black;
+  text-decoration: none;
+}
+
 div.head {
   font-size: large;
   margin-bottom: 10px;