diff --git a/src/documentation/content/xdocs/getinvolved/book.xml b/src/documentation/content/xdocs/getinvolved/book.xml
index 97cc62343b..1d3bc4d971 100644
--- a/src/documentation/content/xdocs/getinvolved/book.xml
+++ b/src/documentation/content/xdocs/getinvolved/book.xml
@@ -6,6 +6,10 @@
       copyright="@year@ Poi Project"
       xmlns:xlink="http://www.w3.org/1999/xlink">
 
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
+  </menu>
+
   <menu label="Get Involved">
     <menu-item label="Contributing" href="index.html"/>
     <menu-item label="Branching" href="branching.html"/>
diff --git a/src/documentation/content/xdocs/hdf/book.xml b/src/documentation/content/xdocs/hdf/book.xml
index 6dfc05464d..9ffea68ad0 100644
--- a/src/documentation/content/xdocs/hdf/book.xml
+++ b/src/documentation/content/xdocs/hdf/book.xml
@@ -5,8 +5,12 @@
       title="HDF"
       copyright="@year@ Poi Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
+  </menu>
+
+  <menu label="HDF">
+    <menu-item label="Overview" href="index.html"/>
     <menu-item label="HDF Format" href="docoverview.html"/>
   </menu>
 
diff --git a/src/documentation/content/xdocs/hpsf/book.xml b/src/documentation/content/xdocs/hpsf/book.xml
index 529baed75a..93004fcc7a 100644
--- a/src/documentation/content/xdocs/hpsf/book.xml
+++ b/src/documentation/content/xdocs/hpsf/book.xml
@@ -5,8 +5,8 @@
       title="HPSF" 
       copyright="@year@ POI Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
   </menu>
   <menu label="HPSF">
     <menu-item label="Overview" href="index.html"/>
diff --git a/src/documentation/content/xdocs/hssf/book.xml b/src/documentation/content/xdocs/hssf/book.xml
index a36db153f6..5f6f18c4f1 100644
--- a/src/documentation/content/xdocs/hssf/book.xml
+++ b/src/documentation/content/xdocs/hssf/book.xml
@@ -5,11 +5,12 @@
     title="HSSF"
     copyright="@year@ Poi Project">
 
-    <menu label="Navigation">
-        <menu-item label="Main" href="../index.html"/>
+    <menu label="Jakarta Poi">
+        <menu-item label="Top" href="../index.html"/>
     </menu>
 
     <menu label="HSSF">
+        <menu-item label="Overview" href="index.html"/>
         <menu-item label="Quick Guide" href="quick-guide.html"/>
         <menu-item label="HOWTO" href="how-to.html"/>
         <menu-item label="Formula Support" href="formula.html" />
diff --git a/src/documentation/content/xdocs/plan/book.xml b/src/documentation/content/xdocs/plan/book.xml
index 12857f774f..2dcf418ae0 100644
--- a/src/documentation/content/xdocs/plan/book.xml
+++ b/src/documentation/content/xdocs/plan/book.xml
@@ -5,11 +5,12 @@
       title="Poi Project planning" 
       copyright="@year@ Poi Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
   </menu>
 
   <menu label="Planning Documents">
+    <menu-item label="Overview" href="index.html"/>
     <menu-item label="1.0 Vision" href="POI10Vision.html"/>
     <menu-item label="2.0 Vision" href="POI20Vision.html"/>
   </menu>
diff --git a/src/documentation/content/xdocs/poifs/book.xml b/src/documentation/content/xdocs/poifs/book.xml
index 9ee98e5fd0..f460fc5e47 100644
--- a/src/documentation/content/xdocs/poifs/book.xml
+++ b/src/documentation/content/xdocs/poifs/book.xml
@@ -5,8 +5,12 @@
       title="PoiFS" 
       copyright="@year@ Poi Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
+  </menu>
+
+  <menu label="PoiFS">
+    <menu-item label="Overview" href="index.html"/>
     <menu-item label="How To" href="how-to.html"/>
     <menu-item label="File System Documentation" href="fileformat.html"/>
     <menu-item label="Use Cases" href="usecases.html"/>
diff --git a/src/documentation/content/xdocs/references/book.xml b/src/documentation/content/xdocs/references/book.xml
index 35f8646486..167b7f5686 100644
--- a/src/documentation/content/xdocs/references/book.xml
+++ b/src/documentation/content/xdocs/references/book.xml
@@ -6,7 +6,10 @@
       copyright="@year@ Poi Project"
       xmlns:xlink="http://www.w3.org/1999/xlink">
 
-     
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
+  </menu>
+
   <menu label="References">
     <menu-item label="Live Sites" href="index.html"/>
     <menu-item label="XLS spec [PDF]" href="http://sc.openoffice.org/excelfileformat.pdf"/>
diff --git a/src/documentation/content/xdocs/resolutions/book.xml b/src/documentation/content/xdocs/resolutions/book.xml
index c3f3d1a6aa..f692afadca 100644
--- a/src/documentation/content/xdocs/resolutions/book.xml
+++ b/src/documentation/content/xdocs/resolutions/book.xml
@@ -5,8 +5,8 @@
       title="Resolutions" 
       copyright="@year@ Poi Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
   </menu>
   
   <menu label="About">
diff --git a/src/documentation/content/xdocs/trans/es/hssf/book.xml b/src/documentation/content/xdocs/trans/es/hssf/book.xml
index 6aa20aa660..54ae441d66 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/book.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/book.xml
@@ -6,11 +6,12 @@
     copyright="El Proyecto de POI de @year@"
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
-        <menu label="Navegación">
+        <menu label="Jakarta Poi">
             <menu-item label="Página Principal" href="../index.html"/>
         </menu>
 
         <menu label="HSSF">
+            <menu-item label="Main" href="index.html"/>
             <menu-item label="Referencia Rápida" href="quick-guide.html"/>
             <menu-item label="Como Se Hace" href="how-to.html"/>
             <menu-item label="Apoyo Con Fórmulas" href="formula.html" />
diff --git a/src/documentation/content/xdocs/utils/book.xml b/src/documentation/content/xdocs/utils/book.xml
index d335bf38b4..690916bc66 100644
--- a/src/documentation/content/xdocs/utils/book.xml
+++ b/src/documentation/content/xdocs/utils/book.xml
@@ -5,8 +5,8 @@
       title="Poi Utils" 
       copyright="@year@ Poi Project">
 
-  <menu label="Navigation">
-    <menu-item label="Main" href="../index.html"/>
+  <menu label="Jakarta Poi">
+    <menu-item label="Top" href="../index.html"/>
   </menu>
 
   <menu label="POI Util">