diff --git a/static/server/taskbar.css b/static/server/taskbar.css
index 8071d26..d584f0a 100644
--- a/static/server/taskbar.css
+++ b/static/server/taskbar.css
@@ -19,9 +19,38 @@
     width: 20em;
 }
 
-.kiwixsearch {
+.kiwix .kiwix_centered {
+    max-width: 55.8em;
+    margin: 0 auto;
+}
+.kiwix .kiwix_button_wrapper {
+    float: left;
+}
+.kiwix .kiwix_searchform {
     float: right;
 }
+.kiwix #kiwixtoolbar button,
+.kiwix #kiwixtoolbar #kiwixsearchform input[type="submit"] {
+    margin-right: 5px;
+    padding: 0 6px;
+    border: 1px solid #999;
+    border-radius: 3px;
+    background-color: #ededed;
+    font-weight: normal;
+    cursor: pointer;
+}
+.kiwix #kiwixtoolbar a {
+    margin-bottom: 5px;
+}
+.kiwix #kiwixtoolbar a > button {
+    font-size: 16px;
+}
+.kiwix #kiwixtoolbar #kiwixsearchform input {
+    border: 1px solid #999;
+    border-radius: 3px;
+    background-color: #fff;
+    padding: 2px 2px 2px 3px;
+}
 
 /* Try to fix buggy stuff in jquery-ui autocomplete */
 #ui-id-1, .ui-autocomplete {
@@ -44,14 +73,14 @@ li.ui-state-focus {
     text-decoration: underline;
 }
 
-/* the breakpoint "600px" is the width of the 3 btns "library", "home" and "randoml" */
-@media (max-width: 600px) {
+/* the breakpoint "645px" is the width of the 3 btns "library", "home" and "randoml" */
+@media (max-width: 645px) {
     .kiwixsearch {
         float: none;
         margin-top: 5px;
     }
     #kiwixsearchbox {
-        width: 65%;
+      width: 65%;
     }
     #kiwixsearchform input[type="submit"] {
         width: 30%;
diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part
index 99af7ca..832e623 100644
--- a/static/server/taskbar.html.part
+++ b/static/server/taskbar.html.part
@@ -2,14 +2,20 @@
 <link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
 <span class="kiwix">
   <span id="kiwixtoolbar" class="ui-widget-header">
-  	<a href="/"><button>Library</button></a>
-  	<a href="/__CONTENT__/"><button>Home</button></a>
-  	<a href="/random?content=__CONTENT__"><button>Random</button></a>
-  	<form class="kiwixsearch" method="GET" action="/search" id="kiwixsearchform">
-  	<input type="hidden" name="content" value="__CONTENT__" />
-  	<input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-  	<input type="submit" value="Search">
-  	</form>
+    <div class="kiwix_centered">
+      <div class="kiwix_button_wrapper">
+        <a href="/"><button>Library</button></a>
+        <a href="/__CONTENT__/"><button>Home</button></a>
+        <a href="/random?content=__CONTENT__"><button>Random</button></a>
+      </div>
+      <div class="kiwix_searchform">
+        <form class="kiwixsearch" method="GET" action="/search" id="kiwixsearchform">
+          <input type="hidden" name="content" value="__CONTENT__" />
+          <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
+          <input type="submit" value="Search">
+        </form>
+      </div>
+    </div>
   </span>
 </span>
-<div class='height_separator'></div>
+<div style="display: block; height: 5em;"></div>