diff --git a/APIFolder/api.htm b/APIFolder/api.htm
index e1a72a4b0..62e4252c4 100644
--- a/APIFolder/api.htm
+++ b/APIFolder/api.htm
@@ -11,8 +11,13 @@
 <div id="page-wrapper">
     <div id="flybar">
         <div class="flybar-nav">
-            <h2 id="toc-menu-button" class="flybar-button">API Navigation</h2>
-            <div id="toc-menu" class="flybar-menu">
+            <h2 class="flybar-button">Overview</h2>
+            <div class="flybar-menu">go on then
+            </div>
+        </div>
+        <div class="flybar-nav">
+            <h2 class="flybar-button">Core</h2>
+            <div class="flybar-menu">
                 <div class="tocMatrix">
     <table class=matrixHeading>
         <tr class="matrixHeadingBG"><td></td><td valign="top"><div class="matrixHeadingVerbs"><table><tr><td>Resources</td></tr></table></div></td><td><table><tr><td><div class="matrixHeadingVerbs">POST</div></td></tr><tr><td>create/update</td></tr></table></td><td><table><tr><td><div class="matrixHeadingVerbs">GET</div></td></tr><tr><td>read</td></tr></table></td><td><table><tr><td><div class="matrixHeadingVerbs">PUT</div></td></tr><tr><td>simple update</td></tr></table></td><td><table><tr><td><div class="matrixHeadingVerbs">DELETE</div></td></tr><tr><td>delete</td></tr></table></td></tr>
@@ -44,17 +49,33 @@
         <tr><td></td><td>/v1/roles/{roleId}</td><td align="center">-</td><td><a href="#roles_retrieve">Retrieve a Role</a></td><td><a href="#roles_update">Update a Role</a></td><td align="center">-</td></tr>
         <tr class="alt"><td><a href="#permissions">PERMISSION</a></td><td>/v1/permissions</td><td align="center">-</td><td><a href="#permissions_list">List Application Permissions</a></td><td align="center">-</td><td align="center">-</td></tr>
     </table>
-                </div>
-                <div class="toc-column1">
-                    <div class="toc-section">
-                        <ul>
-                        <li><a href="#top">Mifos X API Documentation</a></li>
-                        <li><a href="#authentication_overview">Authentication Overview</a></li>
-                        <li><a href="#errors">Errors</a></li>
-                        </ul>
-                    </div>
-                </div>
-                
+                </div>                
+            </div>
+        </div>
+    
+        <div class="flybar-nav">
+            <h2 class="flybar-button">Configuration</h2>
+            <div class="flybar-menu">go on then
+            </div>
+        </div>
+        <div class="flybar-nav">
+            <h2 class="flybar-button">Additional Fields</h2>
+            <div class="flybar-menu">go on then
+            </div>
+        </div>
+        <div class="flybar-nav">
+            <h2 class="flybar-button">Report</h2>
+            <div class="flybar-menu">go on then
+            </div>
+        </div>
+        <div class="flybar-nav">
+            <h2 class="flybar-button">User Related</h2>
+            <div class="flybar-menu">go on then
+            </div>
+        </div>
+        <div class="flybar-nav">
+            <h2 class="flybar-button">Convenience API</h2>
+            <div class="flybar-menu">go on then
             </div>
         </div>
     </div>
diff --git a/APIFolder/apicss/apidocs.css b/APIFolder/apicss/apidocs.css
index de7119300..0fa22aab7 100644
--- a/APIFolder/apicss/apidocs.css
+++ b/APIFolder/apicss/apidocs.css
@@ -3,6 +3,7 @@
 }
 
 .matrixHeading { 
+	font-family: Helvetica, Arial, sans-serif;
 	border-collapse:collapse;
 	margin-right:10px;
 	margin-left:10px;
@@ -81,7 +82,7 @@ body {
     height: 40px;
     min-width: 745px;
     left: 0; right: 0; top: 0;
-    padding-left: 580px;
+    padding-left: 50px;
     background: #eee;
     background: -webkit-gradient(linear, left top, left bottom, from(#f8f8f8), to(#dadada));
     background: -moz-linear-gradient(top, #f8f8f8, #dadada);
@@ -156,6 +157,10 @@ body {
     right: -480px;
 }
 
+#toc-menu2 {
+    right: -480px;
+}
+
 #language-menu {
     left: -25px;
 }
@@ -231,10 +236,6 @@ body {
     font-size: 90%;
 }
 
-#toc-menu-button {
-    border-right: 1px solid #bbb;
-}
-
 code {
     white-space: pre;
     white-space: -o-pre-wrap;