You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/12/14 23:00:00 UTC

[sling-site] branch asf-site updated: modified nav table

This is an automated email from the ASF dual-hosted git repository.

jeb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 8ec562a  modified nav table
8ec562a is described below

commit 8ec562ae9f827a405740dcdb48cbfb2531fde5e8
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Fri Dec 14 17:59:40 2018 -0500

    modified nav table
---
 archive.html                                       | 86 +++++++++-------------
 contributing.html                                  | 86 +++++++++-------------
 documentation.html                                 | 86 +++++++++-------------
 documentation/apidocs.html                         | 86 +++++++++-------------
 documentation/bundles.html                         | 86 +++++++++-------------
 ...filesystem-resources-extensions-fsresource.html | 86 +++++++++-------------
 .../bundles/apache-sling-commons-thread-pool.html  | 86 +++++++++-------------
 .../apache-sling-eventing-and-job-handling.html    | 86 +++++++++-------------
 ...bundle-resources-extensions-bundleresource.html | 86 +++++++++-------------
 documentation/bundles/caching-services.html        | 86 +++++++++-------------
 documentation/bundles/commons-html-utilities.html  | 86 +++++++++-------------
 .../bundles/configuration-installer-factory.html   | 86 +++++++++-------------
 documentation/bundles/content-distribution.html    | 86 +++++++++-------------
 .../bundles/content-loading-jcr-contentloader.html | 86 +++++++++-------------
 ...aware-configuration-default-implementation.html | 86 +++++++++-------------
 .../context-aware-configuration-override.html      | 86 +++++++++-------------
 .../context-aware-configuration-spi.html           | 86 +++++++++-------------
 .../context-aware-configuration.html               | 86 +++++++++-------------
 documentation/bundles/datasource-providers.html    | 86 +++++++++-------------
 documentation/bundles/discovery-api-and-impl.html  | 86 +++++++++-------------
 documentation/bundles/distribution.html            | 86 +++++++++-------------
 documentation/bundles/dynamic-includes.html        | 86 +++++++++-------------
 documentation/bundles/file-installer-provider.html | 86 +++++++++-------------
 documentation/bundles/hapi.html                    | 86 +++++++++-------------
 .../bundles/installer-provider-installhook.html    | 86 +++++++++-------------
 .../bundles/internationalization-support-i18n.html | 86 +++++++++-------------
 documentation/bundles/jcr-installer-provider.html  | 86 +++++++++-------------
 documentation/bundles/log-tracers.html             | 86 +++++++++-------------
 ...aging-permissions-jackrabbit-accessmanager.html | 86 +++++++++-------------
 ...ng-users-and-groups-jackrabbit-usermanager.html | 86 +++++++++-------------
 ...content-the-slingpostservlet-servlets-post.html | 86 +++++++++-------------
 documentation/bundles/metrics.html                 | 86 +++++++++-------------
 .../bundles/mime-type-support-commons-mime.html    | 86 +++++++++-------------
 documentation/bundles/models.html                  | 86 +++++++++-------------
 .../bundles/nosql-resource-providers.html          | 86 +++++++++-------------
 .../bundles/org-apache-sling-junit-bundles.html    | 86 +++++++++-------------
 documentation/bundles/osgi-installer.html          | 86 +++++++++-------------
 ...riting-pipelines-org-apache-sling-rewriter.html | 86 +++++++++-------------
 .../rendering-content-default-get-servlets.html    | 86 +++++++++-------------
 .../bundles/repository-initialization.html         | 86 +++++++++-------------
 documentation/bundles/request-analysis.html        | 86 +++++++++-------------
 .../bundles/resource-access-security.html          | 86 +++++++++-------------
 documentation/bundles/resource-editor.html         | 86 +++++++++-------------
 documentation/bundles/resource-merger.html         | 86 +++++++++-------------
 .../scheduler-service-commons-scheduler.html       | 86 +++++++++-------------
 documentation/bundles/scripting.html               | 86 +++++++++-------------
 documentation/bundles/scripting/scripting-htl.html | 86 +++++++++-------------
 documentation/bundles/scripting/scripting-jsp.html | 86 +++++++++-------------
 .../bundles/scripting/scripting-thymeleaf.html     | 86 +++++++++-------------
 documentation/bundles/servlet-helpers.html         | 86 +++++++++-------------
 documentation/bundles/sling-health-check-tool.html | 86 +++++++++-------------
 documentation/bundles/sling-oak-restrictions.html  | 86 +++++++++-------------
 documentation/bundles/sling-pipes.html             | 86 +++++++++-------------
 documentation/bundles/sling-pipes/bindings.html    | 86 +++++++++-------------
 .../bundles/sling-pipes/execution-monitoring.html  | 86 +++++++++-------------
 documentation/bundles/sling-pipes/logical.html     | 86 +++++++++-------------
 documentation/bundles/sling-pipes/readers.html     | 86 +++++++++-------------
 documentation/bundles/sling-pipes/samples.html     | 86 +++++++++-------------
 documentation/bundles/sling-pipes/writers.html     | 86 +++++++++-------------
 documentation/bundles/sling-query.html             | 86 +++++++++-------------
 documentation/bundles/sling-query/basic-ideas.html | 86 +++++++++-------------
 documentation/bundles/sling-query/examples.html    | 86 +++++++++-------------
 .../bundles/sling-query/hierarchy-operators.html   | 86 +++++++++-------------
 documentation/bundles/sling-query/methods.html     | 86 +++++++++-------------
 documentation/bundles/sling-query/modifiers.html   | 86 +++++++++-------------
 documentation/bundles/sling-query/operators.html   | 86 +++++++++-------------
 documentation/bundles/sling-query/selectors.html   | 86 +++++++++-------------
 documentation/bundles/sling-query/vs-jcr.html      | 86 +++++++++-------------
 .../sling-settings-org-apache-sling-settings.html  | 86 +++++++++-------------
 .../bundles/subsystem-installer-factory.html       | 86 +++++++++-------------
 documentation/bundles/validation.html              | 86 +++++++++-------------
 documentation/bundles/web-console-extensions.html  | 86 +++++++++-------------
 documentation/bundles/xml-support.html             | 86 +++++++++-------------
 documentation/configuration.html                   | 86 +++++++++-------------
 documentation/development.html                     | 86 +++++++++-------------
 .../development/client-request-logging.html        | 86 +++++++++-------------
 .../development/dependency-management.html         | 86 +++++++++-------------
 documentation/development/embedding-sling.html     | 86 +++++++++-------------
 documentation/development/feature-model.html       | 86 +++++++++-------------
 .../development/getting-and-building-sling.html    | 86 +++++++++-------------
 documentation/development/hamcrest.html            | 86 +++++++++-------------
 documentation/development/htl-maven-plugin.html    | 86 +++++++++-------------
 documentation/development/ide-tooling.html         | 86 +++++++++-------------
 .../ide-tooling/ide-tooling-incremental-build.html | 86 +++++++++-------------
 documentation/development/issue-tracker.html       | 86 +++++++++-------------
 documentation/development/jcr-mock.html            | 86 +++++++++-------------
 documentation/development/jspc.html                | 86 +++++++++-------------
 documentation/development/jsr-305.html             | 86 +++++++++-------------
 documentation/development/logging.html             | 86 +++++++++-------------
 documentation/development/maven-archetypes.html    | 86 +++++++++-------------
 .../development/maven-launchpad-plugin.html        | 86 +++++++++-------------
 documentation/development/maven-usage.html         | 86 +++++++++-------------
 documentation/development/maventipsandtricks.html  | 86 +++++++++-------------
 documentation/development/monitoring-requests.html | 86 +++++++++-------------
 documentation/development/null-analysis.html       | 86 +++++++++-------------
 documentation/development/osgi-mock.html           | 86 +++++++++-------------
 documentation/development/release-management.html  | 86 +++++++++-------------
 .../development/repository-based-development.html  | 86 +++++++++-------------
 .../development/resourceresolver-mock.html         | 86 +++++++++-------------
 documentation/development/sling-mock.html          | 86 +++++++++-------------
 documentation/development/sling-testing-tools.html | 86 +++++++++-------------
 documentation/development/sling.html               | 86 +++++++++-------------
 documentation/development/slingstart.html          | 86 +++++++++-------------
 documentation/development/testing-paxexam.html     | 86 +++++++++-------------
 documentation/development/version-policy.html      | 86 +++++++++-------------
 documentation/getting-started.html                 | 86 +++++++++-------------
 .../discover-sling-in-15-minutes.html              | 86 +++++++++-------------
 documentation/karaf.html                           | 86 +++++++++-------------
 documentation/legacy/logging.html                  | 86 +++++++++-------------
 documentation/pax-exam-utils.html                  | 86 +++++++++-------------
 documentation/the-sling-engine.html                | 86 +++++++++-------------
 documentation/the-sling-engine/adapters.html       | 86 +++++++++-------------
 documentation/the-sling-engine/architecture.html   | 86 +++++++++-------------
 documentation/the-sling-engine/authentication.html | 86 +++++++++-------------
 .../authentication/authentication-actors.html      | 86 +++++++++-------------
 .../authentication-authenticationhandler.html      | 86 +++++++++-------------
 .../form-based-authenticationhandler.html          | 86 +++++++++-------------
 .../openid-authenticationhandler.html              | 86 +++++++++-------------
 .../authentication/authentication-framework.html   | 86 +++++++++-------------
 .../authentication/authentication-tasks.html       | 86 +++++++++-------------
 .../default-mapping-and-rendering.html             | 86 +++++++++-------------
 .../the-sling-engine/dispatching-requests.html     | 86 +++++++++-------------
 documentation/the-sling-engine/errorhandling.html  | 86 +++++++++-------------
 documentation/the-sling-engine/featureflags.html   | 86 +++++++++-------------
 documentation/the-sling-engine/filters.html        | 86 +++++++++-------------
 .../mappings-for-resource-resolution.html          | 86 +++++++++-------------
 .../the-sling-engine/request-listeners.html        | 86 +++++++++-------------
 .../the-sling-engine/request-parameters.html       | 86 +++++++++-------------
 documentation/the-sling-engine/resources.html      | 86 +++++++++-------------
 .../the-sling-engine/service-authentication.html   | 86 +++++++++-------------
 documentation/the-sling-engine/servlets.html       | 86 +++++++++-------------
 .../the-sling-engine/sling-api-crud-support.html   | 86 +++++++++-------------
 .../the-sling-engine/sling-properties.html         | 86 +++++++++-------------
 .../the-sling-engine/the-sling-launchpad.html      | 86 +++++++++-------------
 .../the-sling-engine/url-decomposition.html        | 86 +++++++++-------------
 .../the-sling-engine/url-to-script-resolution.html | 86 +++++++++-------------
 .../wrap-or-decorate-resources.html                | 86 +++++++++-------------
 documentation/tutorials-how-tos.html               | 86 +++++++++-------------
 documentation/tutorials-how-tos/46-line-blog.html  | 86 +++++++++-------------
 .../getting-resources-and-properties-in-sling.html | 86 +++++++++-------------
 .../how-to-manage-events-in-sling.html             | 86 +++++++++-------------
 .../installing-and-upgrading-bundles.html          | 86 +++++++++-------------
 .../tutorials-how-tos/jackrabbit-persistence.html  | 86 +++++++++-------------
 .../testing-sling-based-applications.html          | 86 +++++++++-------------
 downloads.html                                     | 86 +++++++++-------------
 errors/403.html                                    | 86 +++++++++-------------
 errors/404.html                                    | 86 +++++++++-------------
 guides.html                                        | 86 +++++++++-------------
 index.html                                         | 86 +++++++++-------------
 links.html                                         | 86 +++++++++-------------
 media.html                                         | 86 +++++++++-------------
 news.html                                          | 86 +++++++++-------------
 news/sling-10-released.html                        | 86 +++++++++-------------
 news/sling-11-released.html                        | 86 +++++++++-------------
 news/sling-ide-tooling-11-released.html            | 86 +++++++++-------------
 news/sling-ide-tooling-12-released.html            | 86 +++++++++-------------
 news/sling-launchpad-8-released.html               | 86 +++++++++-------------
 news/sling-launchpad-9-released.html               | 86 +++++++++-------------
 old-stuff.html                                     | 86 +++++++++-------------
 old-stuff/assembly.html                            | 86 +++++++++-------------
 old-stuff/launch-sling.html                        | 86 +++++++++-------------
 old-stuff/request-processing.html                  | 86 +++++++++-------------
 old-stuff/run-modes-org-apache-sling-runmode.html  | 86 +++++++++-------------
 old-stuff/scriptengineintegration.html             | 86 +++++++++-------------
 .../scriptengineintegration/groovy-support.html    | 86 +++++++++-------------
 .../xslt-processing-pipeline.html                  | 86 +++++++++-------------
 old-stuff/servlet-resolution.html                  | 86 +++++++++-------------
 old-stuff/sling-api.html                           | 86 +++++++++-------------
 project-information.html                           | 86 +++++++++-------------
 ...apache-sling-community-roles-and-processes.html | 86 +++++++++-------------
 project-information/project-license.html           | 86 +++++++++-------------
 project-information/project-team.html              | 86 +++++++++-------------
 project-information/security.html                  | 86 +++++++++-------------
 releases.html                                      | 86 +++++++++-------------
 repolist.html                                      | 86 +++++++++-------------
 res/css/site.css                                   | 20 +++--
 site-conversion.html                               | 86 +++++++++-------------
 sitemap.html                                       | 86 +++++++++-------------
 sitemap.xml                                        | 86 +++++++++-------------
 tags/adaptTo.html                                  | 86 +++++++++-------------
 tags/api.html                                      | 86 +++++++++-------------
 tags/authentication.html                           | 86 +++++++++-------------
 tags/bundles.html                                  | 86 +++++++++-------------
 tags/caching.html                                  | 86 +++++++++-------------
 tags/commons.html                                  | 86 +++++++++-------------
 tags/community.html                                | 86 +++++++++-------------
 tags/configuration.html                            | 86 +++++++++-------------
 tags/contentdistribution.html                      | 86 +++++++++-------------
 tags/contentloading.html                           | 86 +++++++++-------------
 tags/core.html                                     | 86 +++++++++-------------
 tags/databases.html                                | 86 +++++++++-------------
 tags/development.html                              | 86 +++++++++-------------
 tags/discovery.html                                | 86 +++++++++-------------
 tags/distribution.html                             | 86 +++++++++-------------
 tags/documentation.html                            | 86 +++++++++-------------
 tags/downloads.html                                | 86 +++++++++-------------
 tags/eclipse.html                                  | 86 +++++++++-------------
 tags/editors.html                                  | 86 +++++++++-------------
 tags/embedding.html                                | 86 +++++++++-------------
 tags/error.html                                    | 86 +++++++++-------------
 tags/errorhandling.html                            | 86 +++++++++-------------
 tags/events.html                                   | 86 +++++++++-------------
 tags/exam.html                                     | 86 +++++++++-------------
 tags/featureflags.html                             | 86 +++++++++-------------
 tags/featuremodel.html                             | 86 +++++++++-------------
 tags/formauth.html                                 | 86 +++++++++-------------
 tags/git.html                                      | 86 +++++++++-------------
 tags/github.html                                   | 86 +++++++++-------------
 tags/groovy.html                                   | 86 +++++++++-------------
 tags/healthchecks.html                             | 86 +++++++++-------------
 tags/htl.html                                      | 86 +++++++++-------------
 tags/html.html                                     | 86 +++++++++-------------
 tags/hypermedia.html                               | 86 +++++++++-------------
 tags/i18n.html                                     | 86 +++++++++-------------
 tags/ide.html                                      | 86 +++++++++-------------
 tags/installer.html                                | 86 +++++++++-------------
 tags/issuetracker.html                             | 86 +++++++++-------------
 tags/jackrabbit.html                               | 86 +++++++++-------------
 tags/jcr.html                                      | 86 +++++++++-------------
 tags/jobs.html                                     | 86 +++++++++-------------
 tags/jsp.html                                      | 86 +++++++++-------------
 tags/junit.html                                    | 86 +++++++++-------------
 tags/karaf.html                                    | 86 +++++++++-------------
 tags/launchers.html                                | 86 +++++++++-------------
 tags/launchpad.html                                | 86 +++++++++-------------
 tags/logging.html                                  | 86 +++++++++-------------
 tags/mailinglists.html                             | 86 +++++++++-------------
 tags/maven.html                                    | 86 +++++++++-------------
 tags/metrics.html                                  | 86 +++++++++-------------
 tags/mimetypes.html                                | 86 +++++++++-------------
 tags/mocks.html                                    | 86 +++++++++-------------
 tags/models.html                                   | 86 +++++++++-------------
 tags/modules.html                                  | 86 +++++++++-------------
 tags/news.html                                     | 86 +++++++++-------------
 tags/nodetypes.html                                | 86 +++++++++-------------
 tags/nosql.html                                    | 86 +++++++++-------------
 tags/oak.html                                      | 86 +++++++++-------------
 tags/obsolete.html                                 | 86 +++++++++-------------
 tags/openid.html                                   | 86 +++++++++-------------
 tags/operations.html                               | 86 +++++++++-------------
 tags/osgi.html                                     | 86 +++++++++-------------
 tags/pipes.html                                    | 86 +++++++++-------------
 tags/pmc.html                                      | 86 +++++++++-------------
 tags/postprocessing.html                           | 86 +++++++++-------------
 tags/postservlet.html                              | 86 +++++++++-------------
 tags/publishing.html                               | 86 +++++++++-------------
 tags/repoinit.html                                 | 86 +++++++++-------------
 tags/repository.html                               | 86 +++++++++-------------
 tags/requests.html                                 | 86 +++++++++-------------
 tags/resourcemappings.html                         | 86 +++++++++-------------
 tags/resourceproviders.html                        | 86 +++++++++-------------
 tags/resourceresolver.html                         | 86 +++++++++-------------
 tags/resources.html                                | 86 +++++++++-------------
 tags/runmodes.html                                 | 86 +++++++++-------------
 tags/scheduling.html                               | 86 +++++++++-------------
 tags/scriptresolver.html                           | 86 +++++++++-------------
 tags/scripts.html                                  | 86 +++++++++-------------
 tags/security.html                                 | 86 +++++++++-------------
 tags/serviceusers.html                             | 86 +++++++++-------------
 tags/servletresolver.html                          | 86 +++++++++-------------
 tags/servlets.html                                 | 86 +++++++++-------------
 tags/slingquery.html                               | 86 +++++++++-------------
 tags/slingstart.html                               | 86 +++++++++-------------
 tags/sourcecode.html                               | 86 +++++++++-------------
 tags/testing.html                                  | 86 +++++++++-------------
 tags/threads.html                                  | 86 +++++++++-------------
 tags/thymeleaf.html                                | 86 +++++++++-------------
 tags/tutorial.html                                 | 86 +++++++++-------------
 tags/tutorials.html                                | 86 +++++++++-------------
 tags/urls.html                                     | 86 +++++++++-------------
 tags/validation.html                               | 86 +++++++++-------------
 tags/webconsole.html                               | 86 +++++++++-------------
 tags/xml.html                                      | 86 +++++++++-------------
 tags/xslt.html                                     | 86 +++++++++-------------
 274 files changed, 9023 insertions(+), 14475 deletions(-)

diff --git a/archive.html b/archive.html
index 01e79b0..1b4abec 100644
--- a/archive.html
+++ b/archive.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
                 <breadcrumbs/>
                 <tags/>
diff --git a/contributing.html b/contributing.html
index 02ce449..c34c8c0 100644
--- a/contributing.html
+++ b/contributing.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation.html b/documentation.html
index cafbc8a..decc87d 100644
--- a/documentation.html
+++ b/documentation.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/apidocs.html b/documentation/apidocs.html
index 19c613e..6367d2e 100644
--- a/documentation/apidocs.html
+++ b/documentation/apidocs.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles.html b/documentation/bundles.html
index 9e8eb30..cdfbbd0 100644
--- a/documentation/bundles.html
+++ b/documentation/bundles.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html b/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
index 596ac55..e87680e 100644
--- a/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
+++ b/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/apache-sling-commons-thread-pool.html b/documentation/bundles/apache-sling-commons-thread-pool.html
index 31f7547..7f26362 100644
--- a/documentation/bundles/apache-sling-commons-thread-pool.html
+++ b/documentation/bundles/apache-sling-commons-thread-pool.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/apache-sling-eventing-and-job-handling.html b/documentation/bundles/apache-sling-eventing-and-job-handling.html
index 66001f2..0b97e03 100644
--- a/documentation/bundles/apache-sling-eventing-and-job-handling.html
+++ b/documentation/bundles/apache-sling-eventing-and-job-handling.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/bundle-resources-extensions-bundleresource.html b/documentation/bundles/bundle-resources-extensions-bundleresource.html
index be87a9a..565f0e1 100644
--- a/documentation/bundles/bundle-resources-extensions-bundleresource.html
+++ b/documentation/bundles/bundle-resources-extensions-bundleresource.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/caching-services.html b/documentation/bundles/caching-services.html
index 4874f5c..83a351b 100644
--- a/documentation/bundles/caching-services.html
+++ b/documentation/bundles/caching-services.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/commons-html-utilities.html b/documentation/bundles/commons-html-utilities.html
index 05fbb0e..d145e8e 100644
--- a/documentation/bundles/commons-html-utilities.html
+++ b/documentation/bundles/commons-html-utilities.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/configuration-installer-factory.html b/documentation/bundles/configuration-installer-factory.html
index d9f2b40..fd2c01a 100644
--- a/documentation/bundles/configuration-installer-factory.html
+++ b/documentation/bundles/configuration-installer-factory.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/content-distribution.html b/documentation/bundles/content-distribution.html
index ea42009..965d556 100644
--- a/documentation/bundles/content-distribution.html
+++ b/documentation/bundles/content-distribution.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/content-loading-jcr-contentloader.html b/documentation/bundles/content-loading-jcr-contentloader.html
index ee9a3d4..a27bdcd 100644
--- a/documentation/bundles/content-loading-jcr-contentloader.html
+++ b/documentation/bundles/content-loading-jcr-contentloader.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
index 463431f..ce2df6b 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
index 8f71bf0..c348446 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html b/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
index cac296a..8241c61 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/context-aware-configuration/context-aware-configuration.html b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
index 1d02f1b..186ba63 100644
--- a/documentation/bundles/context-aware-configuration/context-aware-configuration.html
+++ b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/datasource-providers.html b/documentation/bundles/datasource-providers.html
index 209e296..deb4966 100644
--- a/documentation/bundles/datasource-providers.html
+++ b/documentation/bundles/datasource-providers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/discovery-api-and-impl.html b/documentation/bundles/discovery-api-and-impl.html
index 38c7970..ae3243c 100644
--- a/documentation/bundles/discovery-api-and-impl.html
+++ b/documentation/bundles/discovery-api-and-impl.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/distribution.html b/documentation/bundles/distribution.html
index 43511a5..32f9071 100644
--- a/documentation/bundles/distribution.html
+++ b/documentation/bundles/distribution.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/dynamic-includes.html b/documentation/bundles/dynamic-includes.html
index e00aa96..1f47ad8 100644
--- a/documentation/bundles/dynamic-includes.html
+++ b/documentation/bundles/dynamic-includes.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/file-installer-provider.html b/documentation/bundles/file-installer-provider.html
index f699170..83fd315 100644
--- a/documentation/bundles/file-installer-provider.html
+++ b/documentation/bundles/file-installer-provider.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/hapi.html b/documentation/bundles/hapi.html
index c3e8241..457b545 100644
--- a/documentation/bundles/hapi.html
+++ b/documentation/bundles/hapi.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/installer-provider-installhook.html b/documentation/bundles/installer-provider-installhook.html
index 9bc218e..8a530ed 100644
--- a/documentation/bundles/installer-provider-installhook.html
+++ b/documentation/bundles/installer-provider-installhook.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/internationalization-support-i18n.html b/documentation/bundles/internationalization-support-i18n.html
index c491946..db02b78 100644
--- a/documentation/bundles/internationalization-support-i18n.html
+++ b/documentation/bundles/internationalization-support-i18n.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/jcr-installer-provider.html b/documentation/bundles/jcr-installer-provider.html
index 0e8a2f2..29acbc6 100644
--- a/documentation/bundles/jcr-installer-provider.html
+++ b/documentation/bundles/jcr-installer-provider.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/log-tracers.html b/documentation/bundles/log-tracers.html
index d6268c9..6c77391 100644
--- a/documentation/bundles/log-tracers.html
+++ b/documentation/bundles/log-tracers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html b/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
index 59a4df6..f9eab41 100644
--- a/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
+++ b/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html b/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
index 311a5cd..207e09d 100644
--- a/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
+++ b/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
index 3ec6b95..7500cd9 100644
--- a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+++ b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/metrics.html b/documentation/bundles/metrics.html
index 792ecda..0581d98 100644
--- a/documentation/bundles/metrics.html
+++ b/documentation/bundles/metrics.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/mime-type-support-commons-mime.html b/documentation/bundles/mime-type-support-commons-mime.html
index d8c4420..7baeca2 100644
--- a/documentation/bundles/mime-type-support-commons-mime.html
+++ b/documentation/bundles/mime-type-support-commons-mime.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/models.html b/documentation/bundles/models.html
index 83c624e..167b257 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/nosql-resource-providers.html b/documentation/bundles/nosql-resource-providers.html
index 93319e1..5df8a6e 100644
--- a/documentation/bundles/nosql-resource-providers.html
+++ b/documentation/bundles/nosql-resource-providers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/org-apache-sling-junit-bundles.html b/documentation/bundles/org-apache-sling-junit-bundles.html
index 581f5ef..a68866b 100644
--- a/documentation/bundles/org-apache-sling-junit-bundles.html
+++ b/documentation/bundles/org-apache-sling-junit-bundles.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/osgi-installer.html b/documentation/bundles/osgi-installer.html
index 2865d2c..ce56e1d 100644
--- a/documentation/bundles/osgi-installer.html
+++ b/documentation/bundles/osgi-installer.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html b/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
index 0c63d2a..4185f79 100644
--- a/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
+++ b/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/rendering-content-default-get-servlets.html b/documentation/bundles/rendering-content-default-get-servlets.html
index 8df7253..1b8c361 100644
--- a/documentation/bundles/rendering-content-default-get-servlets.html
+++ b/documentation/bundles/rendering-content-default-get-servlets.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/repository-initialization.html b/documentation/bundles/repository-initialization.html
index f592c2d..25a36b4 100644
--- a/documentation/bundles/repository-initialization.html
+++ b/documentation/bundles/repository-initialization.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/request-analysis.html b/documentation/bundles/request-analysis.html
index 57d6541..3c71c39 100644
--- a/documentation/bundles/request-analysis.html
+++ b/documentation/bundles/request-analysis.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/resource-access-security.html b/documentation/bundles/resource-access-security.html
index 49a243c..65bdd17 100644
--- a/documentation/bundles/resource-access-security.html
+++ b/documentation/bundles/resource-access-security.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/resource-editor.html b/documentation/bundles/resource-editor.html
index b430eb7..61d9fb8 100644
--- a/documentation/bundles/resource-editor.html
+++ b/documentation/bundles/resource-editor.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/resource-merger.html b/documentation/bundles/resource-merger.html
index 735d897..1731589 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/scheduler-service-commons-scheduler.html b/documentation/bundles/scheduler-service-commons-scheduler.html
index e41550e..7daa906 100644
--- a/documentation/bundles/scheduler-service-commons-scheduler.html
+++ b/documentation/bundles/scheduler-service-commons-scheduler.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/scripting.html b/documentation/bundles/scripting.html
index d23397f..c496556 100644
--- a/documentation/bundles/scripting.html
+++ b/documentation/bundles/scripting.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/scripting/scripting-htl.html b/documentation/bundles/scripting/scripting-htl.html
index a0bf25f..8fa96b1 100644
--- a/documentation/bundles/scripting/scripting-htl.html
+++ b/documentation/bundles/scripting/scripting-htl.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/scripting/scripting-jsp.html b/documentation/bundles/scripting/scripting-jsp.html
index e8a7027..69925ca 100644
--- a/documentation/bundles/scripting/scripting-jsp.html
+++ b/documentation/bundles/scripting/scripting-jsp.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/scripting/scripting-thymeleaf.html b/documentation/bundles/scripting/scripting-thymeleaf.html
index 5cfd827..e12a2ba 100644
--- a/documentation/bundles/scripting/scripting-thymeleaf.html
+++ b/documentation/bundles/scripting/scripting-thymeleaf.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/servlet-helpers.html b/documentation/bundles/servlet-helpers.html
index 9eaa3b1..6009f34 100644
--- a/documentation/bundles/servlet-helpers.html
+++ b/documentation/bundles/servlet-helpers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-health-check-tool.html b/documentation/bundles/sling-health-check-tool.html
index 0d1c27b..93a6b31 100644
--- a/documentation/bundles/sling-health-check-tool.html
+++ b/documentation/bundles/sling-health-check-tool.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-oak-restrictions.html b/documentation/bundles/sling-oak-restrictions.html
index 81014ba..3c24561 100644
--- a/documentation/bundles/sling-oak-restrictions.html
+++ b/documentation/bundles/sling-oak-restrictions.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes.html b/documentation/bundles/sling-pipes.html
index 1cbef10..0913a7b 100644
--- a/documentation/bundles/sling-pipes.html
+++ b/documentation/bundles/sling-pipes.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/bindings.html b/documentation/bundles/sling-pipes/bindings.html
index 68cda2b..c9c6176 100644
--- a/documentation/bundles/sling-pipes/bindings.html
+++ b/documentation/bundles/sling-pipes/bindings.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/execution-monitoring.html b/documentation/bundles/sling-pipes/execution-monitoring.html
index 4036afc..b90dd84 100644
--- a/documentation/bundles/sling-pipes/execution-monitoring.html
+++ b/documentation/bundles/sling-pipes/execution-monitoring.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/logical.html b/documentation/bundles/sling-pipes/logical.html
index 9190144..5aa5c21 100644
--- a/documentation/bundles/sling-pipes/logical.html
+++ b/documentation/bundles/sling-pipes/logical.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/readers.html b/documentation/bundles/sling-pipes/readers.html
index 7d5b55d..92c54d6 100644
--- a/documentation/bundles/sling-pipes/readers.html
+++ b/documentation/bundles/sling-pipes/readers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/samples.html b/documentation/bundles/sling-pipes/samples.html
index f9528a1..8cda563 100644
--- a/documentation/bundles/sling-pipes/samples.html
+++ b/documentation/bundles/sling-pipes/samples.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-pipes/writers.html b/documentation/bundles/sling-pipes/writers.html
index 242c76b..0fc5f11 100644
--- a/documentation/bundles/sling-pipes/writers.html
+++ b/documentation/bundles/sling-pipes/writers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query.html b/documentation/bundles/sling-query.html
index 2c343d3..d55bc4b 100644
--- a/documentation/bundles/sling-query.html
+++ b/documentation/bundles/sling-query.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/basic-ideas.html b/documentation/bundles/sling-query/basic-ideas.html
index 94dbc04..469a01d 100644
--- a/documentation/bundles/sling-query/basic-ideas.html
+++ b/documentation/bundles/sling-query/basic-ideas.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/examples.html b/documentation/bundles/sling-query/examples.html
index 5183bfb..a9d6370 100644
--- a/documentation/bundles/sling-query/examples.html
+++ b/documentation/bundles/sling-query/examples.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/hierarchy-operators.html b/documentation/bundles/sling-query/hierarchy-operators.html
index e49a98b..29c1672 100644
--- a/documentation/bundles/sling-query/hierarchy-operators.html
+++ b/documentation/bundles/sling-query/hierarchy-operators.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/methods.html b/documentation/bundles/sling-query/methods.html
index cd9fe91..bdee52e 100644
--- a/documentation/bundles/sling-query/methods.html
+++ b/documentation/bundles/sling-query/methods.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/modifiers.html b/documentation/bundles/sling-query/modifiers.html
index 720b5f6..d06ad58 100644
--- a/documentation/bundles/sling-query/modifiers.html
+++ b/documentation/bundles/sling-query/modifiers.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/operators.html b/documentation/bundles/sling-query/operators.html
index b36e5d8..419d07f 100644
--- a/documentation/bundles/sling-query/operators.html
+++ b/documentation/bundles/sling-query/operators.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/selectors.html b/documentation/bundles/sling-query/selectors.html
index 1a7ffad..ac01e16 100644
--- a/documentation/bundles/sling-query/selectors.html
+++ b/documentation/bundles/sling-query/selectors.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-query/vs-jcr.html b/documentation/bundles/sling-query/vs-jcr.html
index 55bb291..1e52002 100644
--- a/documentation/bundles/sling-query/vs-jcr.html
+++ b/documentation/bundles/sling-query/vs-jcr.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/sling-settings-org-apache-sling-settings.html b/documentation/bundles/sling-settings-org-apache-sling-settings.html
index 4453228..f2dc8cc 100644
--- a/documentation/bundles/sling-settings-org-apache-sling-settings.html
+++ b/documentation/bundles/sling-settings-org-apache-sling-settings.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/subsystem-installer-factory.html b/documentation/bundles/subsystem-installer-factory.html
index c4ab3ab..24a1629 100644
--- a/documentation/bundles/subsystem-installer-factory.html
+++ b/documentation/bundles/subsystem-installer-factory.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/validation.html b/documentation/bundles/validation.html
index f105225..79293de 100644
--- a/documentation/bundles/validation.html
+++ b/documentation/bundles/validation.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/web-console-extensions.html b/documentation/bundles/web-console-extensions.html
index 498ca5e..fc913f4 100644
--- a/documentation/bundles/web-console-extensions.html
+++ b/documentation/bundles/web-console-extensions.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/bundles/xml-support.html b/documentation/bundles/xml-support.html
index fccc551..15770cf 100644
--- a/documentation/bundles/xml-support.html
+++ b/documentation/bundles/xml-support.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/configuration.html b/documentation/configuration.html
index cecb001..8088515 100644
--- a/documentation/configuration.html
+++ b/documentation/configuration.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development.html b/documentation/development.html
index 1bb0216..1ee1984 100644
--- a/documentation/development.html
+++ b/documentation/development.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/client-request-logging.html b/documentation/development/client-request-logging.html
index 386589a..f138399 100644
--- a/documentation/development/client-request-logging.html
+++ b/documentation/development/client-request-logging.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/dependency-management.html b/documentation/development/dependency-management.html
index ec2a0d3..6bb8130 100644
--- a/documentation/development/dependency-management.html
+++ b/documentation/development/dependency-management.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/embedding-sling.html b/documentation/development/embedding-sling.html
index 595b28b..96df20a 100644
--- a/documentation/development/embedding-sling.html
+++ b/documentation/development/embedding-sling.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/feature-model.html b/documentation/development/feature-model.html
index 31a6bd8..abf33d2 100644
--- a/documentation/development/feature-model.html
+++ b/documentation/development/feature-model.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/getting-and-building-sling.html b/documentation/development/getting-and-building-sling.html
index bd350b7..fa1ef1e 100644
--- a/documentation/development/getting-and-building-sling.html
+++ b/documentation/development/getting-and-building-sling.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/hamcrest.html b/documentation/development/hamcrest.html
index a50b3e7..80aaad7 100644
--- a/documentation/development/hamcrest.html
+++ b/documentation/development/hamcrest.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/htl-maven-plugin.html b/documentation/development/htl-maven-plugin.html
index ef9807f..52df0fe 100644
--- a/documentation/development/htl-maven-plugin.html
+++ b/documentation/development/htl-maven-plugin.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/ide-tooling.html b/documentation/development/ide-tooling.html
index 5eb1c21..caff296 100644
--- a/documentation/development/ide-tooling.html
+++ b/documentation/development/ide-tooling.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/ide-tooling/ide-tooling-incremental-build.html b/documentation/development/ide-tooling/ide-tooling-incremental-build.html
index 414d687..263d91a 100644
--- a/documentation/development/ide-tooling/ide-tooling-incremental-build.html
+++ b/documentation/development/ide-tooling/ide-tooling-incremental-build.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/issue-tracker.html b/documentation/development/issue-tracker.html
index 93a323b..99c41b3 100644
--- a/documentation/development/issue-tracker.html
+++ b/documentation/development/issue-tracker.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/jcr-mock.html b/documentation/development/jcr-mock.html
index 8b7d6ce..daca112 100644
--- a/documentation/development/jcr-mock.html
+++ b/documentation/development/jcr-mock.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/jspc.html b/documentation/development/jspc.html
index 6525120..a4f04a1 100644
--- a/documentation/development/jspc.html
+++ b/documentation/development/jspc.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/jsr-305.html b/documentation/development/jsr-305.html
index 9be5cd2..4202b2f 100644
--- a/documentation/development/jsr-305.html
+++ b/documentation/development/jsr-305.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/logging.html b/documentation/development/logging.html
index 8129ca3..5540f4c 100644
--- a/documentation/development/logging.html
+++ b/documentation/development/logging.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/maven-archetypes.html b/documentation/development/maven-archetypes.html
index 27ccace..a03e864 100644
--- a/documentation/development/maven-archetypes.html
+++ b/documentation/development/maven-archetypes.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/maven-launchpad-plugin.html b/documentation/development/maven-launchpad-plugin.html
index 1590ef3..de30b71 100644
--- a/documentation/development/maven-launchpad-plugin.html
+++ b/documentation/development/maven-launchpad-plugin.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/maven-usage.html b/documentation/development/maven-usage.html
index e57eba2..59eabe1 100644
--- a/documentation/development/maven-usage.html
+++ b/documentation/development/maven-usage.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/maventipsandtricks.html b/documentation/development/maventipsandtricks.html
index d613e55..f17da5d 100644
--- a/documentation/development/maventipsandtricks.html
+++ b/documentation/development/maventipsandtricks.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/monitoring-requests.html b/documentation/development/monitoring-requests.html
index 9b9a2ad..0d981c3 100644
--- a/documentation/development/monitoring-requests.html
+++ b/documentation/development/monitoring-requests.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/null-analysis.html b/documentation/development/null-analysis.html
index 2f594bf..cab2d60 100644
--- a/documentation/development/null-analysis.html
+++ b/documentation/development/null-analysis.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/osgi-mock.html b/documentation/development/osgi-mock.html
index ece836a..1f4553b 100644
--- a/documentation/development/osgi-mock.html
+++ b/documentation/development/osgi-mock.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/release-management.html b/documentation/development/release-management.html
index 459188a..a7598a1 100644
--- a/documentation/development/release-management.html
+++ b/documentation/development/release-management.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/repository-based-development.html b/documentation/development/repository-based-development.html
index f106e35..40434a7 100644
--- a/documentation/development/repository-based-development.html
+++ b/documentation/development/repository-based-development.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/resourceresolver-mock.html b/documentation/development/resourceresolver-mock.html
index 5900016..31720a3 100644
--- a/documentation/development/resourceresolver-mock.html
+++ b/documentation/development/resourceresolver-mock.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/sling-mock.html b/documentation/development/sling-mock.html
index 36bdfdf..d8c8f07 100644
--- a/documentation/development/sling-mock.html
+++ b/documentation/development/sling-mock.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
-                <a href="/documentation/bundles.html">Bundles</a><br/>
-                <a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a><br/>
-                <a href="http://sling.apache.org/components/">Maven Plugins</a><br/>
-                <a href="/documentation/configuration.html">Configuration</a>
-                
-            </p><p>
-                <a href="http://s.apache.org/sling.wiki">Wiki</a><br/>
-                <a href="http://s.apache.org/sling.faq">FAQ</a><br/>
-                
-            </p><p>
-                <strong>API Docs</strong><br/>
-                <a href="/apidocs/sling11/index.html">Sling 11</a><br/>
-                <a href="/apidocs/sling10/index.html">Sling 10</a><br/>
-                <a href="/apidocs/sling9/index.html">Sling 9</a><br/>
-                <a href="/documentation/apidocs.html">All versions</a><br/>
-                
-            </p><p>
-                <strong>Project Info</strong><br/>
-                <a href="/downloads.cgi">Downloads</a><br/>
-                <a href="http://www.apache.org/licenses/">License</a><br/>
-                <a href="/news.html">News</a><br/>
-                <a href="/releases.html">Releases</a><br/>
-                <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/>
-                <a href="/links.html">Links</a><br/>
-                <a href="/contributing.html">Contributing</a><br/>
-                <a href="/project-information.html">Project Information</a><br/>
-                <a href="/project-information/security.html">Security</a><br/>
-                
-            </p><p>
-                <strong>Source</strong><br/>
-                <a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a><br/>
-                <a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a><br/>
-                
-            </p><p>
-                <strong><a href="/sitemap.html">Site Map</a></strong>
-            </p><p>
-                <strong>Apache Software Foundation</strong><br/>
-                <a href="http://www.apache.org/foundation/thanks.html">Thanks!</a><br/>
-                <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/>
-                <a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a><br/>
-                <a href="https://www.apache.org/events/current-event.html">
-                    <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125px"/>
-                </a><a href="http://apache.org/foundation/contributing.html">
-                    <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125px"/>
-                </a>
-            </p>
-        </div>        <div class="main">
+        </div><nav class="menu">
+            <ul>
+                <li>
+                    <strong>Documentation</strong><ul>
+                        <li><a href="/documentation.html">Main</a></li><li><a href="/documentation/getting-started.html">Getting Started</a></li><li><a href="/documentation/the-sling-engine.html">The Sling Engine</a></li><li><a href="/documentation/development.html">Development</a></li><li><a href="/documentation/bundles.html">Bundles</a></li><li><a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a></li><li><a href="http://sling.apache.org/components/">Maven Plugins [...]
+                    </ul>
+                </li><li>
+                    <strong>API Docs</strong><ul>
+                        <li><a href="/apidocs/sling11/index.html">Sling 11</a></li><li><a href="/apidocs/sling10/index.html">Sling 10</a></li><li><a href="/apidocs/sling9/index.html">Sling 9</a></li><li><a href="/documentation/apidocs.html">All versions</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Support</strong><ul>
+                        <li><a href="http://s.apache.org/sling.wiki">Wiki</a></li><li><a href="http://s.apache.org/sling.faq">FAQ</a></li><li><a href="/sitemap.html">Site Map</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Project Info</strong><ul>
+                        <li><a href="/downloads.cgi">Downloads</a></li><li><a href="http://www.apache.org/licenses/">License</a></li><li><a href="/news.html">News</a></li><li><a href="/releases.html">Releases</a></li><li><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a></li><li><a href="/links.html">Links</a></li><li><a href="/contributing.html">Contributing</a></li><li><a href="/project-information.html">Project Information</a></li><li><a href="/project-information [...]
+                    </ul>
+                </li><li>
+                    <strong>Source</strong><ul>
+                        <li><a href="https://github.com/apache/?utf8=%E2%9C%93&q=sling">GitHub</a></li><li><a href="https://gitbox.apache.org/repos/asf?s=sling">Git at Apache</a></li>
+                    </ul>
+                </li><li>
+                    <strong>Apache Software Foundation</strong><ul>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li><li><a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a></li><li><a href="https://www.apache.org/events/current-event.html">
+                                <img border="0" alt="Current ASF Events" src="https://www.apache.org/events/current-event-125x125.png" width="125"/>
+                            </a></li><li><a href="http://apache.org/foundation/contributing.html">
+                                <img border="0" alt="Support the Apache Software Foundation!" src="/res/images/SupportApache-small.png" width="125"/>
+                            </a></li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>        <div class="main">
             <div class="pagenav">
 <div class="breadcrumbs">
                     <a href="/">
diff --git a/documentation/development/sling-testing-tools.html b/documentation/development/sling-testing-tools.html
index 5d5cd4c..69a3612 100644
--- a/documentation/development/sling-testing-tools.html
+++ b/documentation/development/sling-testing-tools.html
@@ -20,59 +20,39 @@
                     <img border="0" alt="Apache" src="/res/logos/apache.png"/>
                 </a>
             </div>
-        </div><div class="menu">
-            <p>
-                <strong><a href="/documentation.html">Documentation</a></strong><br/>
-                <a href="/documentation/getting-started.html">Getting Started</a><br/>
-                <a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/>
-                <a href="/documentation/development.html">Development</a><br/>
... 16816 lines suppressed ...