Automatic Site Publish by Buildbot
diff --git a/output/bug-tracking.html b/output/bug-tracking.html
index 63d9ebf..809a560 100644
--- a/output/bug-tracking.html
+++ b/output/bug-tracking.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/community-faqs.html b/output/community-faqs.html
index 7182e9a..f8b761b 100644
--- a/output/community-faqs.html
+++ b/output/community-faqs.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/contact.html b/output/contact.html
index 0e4ba45..c2b4a49 100644
--- a/output/contact.html
+++ b/output/contact.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/contributing-code.html b/output/contributing-code.html
index 469068b..f12445f 100644
--- a/output/contributing-code.html
+++ b/output/contributing-code.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/developer-faqs.html b/output/developer-faqs.html
index 9975746..838038f 100644
--- a/output/developer-faqs.html
+++ b/output/developer-faqs.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/docs/edit-cms.html b/output/docs/edit-cms.html
index d2aadc6..2a748b2 100644
--- a/output/docs/edit-cms.html
+++ b/output/docs/edit-cms.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/docs/governance/consensusBuilding.html b/output/docs/governance/consensusBuilding.html
index 79e2616..70010d5 100644
--- a/output/docs/governance/consensusBuilding.html
+++ b/output/docs/governance/consensusBuilding.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/docs/governance/lazyConsensus.html b/output/docs/governance/lazyConsensus.html
index cce70ab..bedc6d5 100644
--- a/output/docs/governance/lazyConsensus.html
+++ b/output/docs/governance/lazyConsensus.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/docs/governance/voting.html b/output/docs/governance/voting.html
index 62d7688..71339ca 100644
--- a/output/docs/governance/voting.html
+++ b/output/docs/governance/voting.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/downloads.html b/output/downloads.html
index 86cf52b..726c998 100644
--- a/output/downloads.html
+++ b/output/downloads.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/events.html b/output/events.html
index c8c08f1..b4aa972 100644
--- a/output/events.html
+++ b/output/events.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/get-involved-de.html b/output/get-involved-de.html
index 01d9216..e6efcf9 100644
--- a/output/get-involved-de.html
+++ b/output/get-involved-de.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/get-involved.html b/output/get-involved.html
index 1d1b3db..3517c1d 100644
--- a/output/get-involved.html
+++ b/output/get-involved.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/get-it-here.html b/output/get-it-here.html
index 0dd6af4..d5558f6 100644
--- a/output/get-it-here.html
+++ b/output/get-it-here.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/index.html b/output/index.html
index 4840491..22efd57 100644
--- a/output/index.html
+++ b/output/index.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/license.html b/output/license.html
index 4f06d01..1cd4c6e 100644
--- a/output/license.html
+++ b/output/license.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/list-conduct.html b/output/list-conduct.html
index b51d82a..6913ba1 100644
--- a/output/list-conduct.html
+++ b/output/list-conduct.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/mailing-lists.html b/output/mailing-lists.html
index 6b35ff6..da5319a 100644
--- a/output/mailing-lists.html
+++ b/output/mailing-lists.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/mission.html b/output/mission.html
index 1fc8d72..3b8a905 100644
--- a/output/mission.html
+++ b/output/mission.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/native-lang.html b/output/native-lang.html
index 08b574a..e340502 100644
--- a/output/native-lang.html
+++ b/output/native-lang.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/decision-making.html b/output/orientation/decision-making.html
index e93c3ef..f02368f 100644
--- a/output/orientation/decision-making.html
+++ b/output/orientation/decision-making.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/how-aoo-project-works.html b/output/orientation/how-aoo-project-works.html
index 07b8416..21cde76 100644
--- a/output/orientation/how-aoo-project-works.html
+++ b/output/orientation/how-aoo-project-works.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/index.html b/output/orientation/index.html
index c936381..1c01358 100644
--- a/output/orientation/index.html
+++ b/output/orientation/index.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/infrastructure.html b/output/orientation/infrastructure.html
index cef589f..88628c4 100644
--- a/output/orientation/infrastructure.html
+++ b/output/orientation/infrastructure.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-contributing.html b/output/orientation/intro-contributing.html
index 12b0069..03d295d 100644
--- a/output/orientation/intro-contributing.html
+++ b/output/orientation/intro-contributing.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-development.html b/output/orientation/intro-development.html
index 6777fa1..63924cf 100644
--- a/output/orientation/intro-development.html
+++ b/output/orientation/intro-development.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-doc.html b/output/orientation/intro-doc.html
index 2614d06..a852b8c 100644
--- a/output/orientation/intro-doc.html
+++ b/output/orientation/intro-doc.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-l10n.html b/output/orientation/intro-l10n.html
index dbf54ef..7b9da32 100644
--- a/output/orientation/intro-l10n.html
+++ b/output/orientation/intro-l10n.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-marketing.html b/output/orientation/intro-marketing.html
index 3f9bd59..cef9e3f 100644
--- a/output/orientation/intro-marketing.html
+++ b/output/orientation/intro-marketing.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/orientation/intro-qa.html b/output/orientation/intro-qa.html
index 97f5d4d..19af5d4 100644
--- a/output/orientation/intro-qa.html
+++ b/output/orientation/intro-qa.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/people.html b/output/people.html
index c4b01a7..bf7720f 100644
--- a/output/people.html
+++ b/output/people.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/pmc-faqs.html b/output/pmc-faqs.html
index 32bb465..eb49e17 100644
--- a/output/pmc-faqs.html
+++ b/output/pmc-faqs.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/press.html b/output/press.html
index 02f8539..60fd534 100644
--- a/output/press.html
+++ b/output/press.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/privacy.html b/output/privacy.html
index b11851d..3ad66c0 100644
--- a/output/privacy.html
+++ b/output/privacy.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/qa.html b/output/qa.html
index a0bec57..ee200da 100644
--- a/output/qa.html
+++ b/output/qa.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/security.html b/output/security.html
index b55e197..cfcf151 100644
--- a/output/security.html
+++ b/output/security.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/social.html b/output/social.html
index 919a59d..2fbd4d3 100644
--- a/output/social.html
+++ b/output/social.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/source.html b/output/source.html
index c5611fc..d79be56 100644
--- a/output/source.html
+++ b/output/source.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/students.html b/output/students.html
index 282a1dc..3552a81 100644
--- a/output/students.html
+++ b/output/students.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/style-test.html b/output/style-test.html
index c3da703..7fc6864 100644
--- a/output/style-test.html
+++ b/output/style-test.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/svn-basics.html b/output/svn-basics.html
index 9d16bbc..f12ef75 100644
--- a/output/svn-basics.html
+++ b/output/svn-basics.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/terms.html b/output/terms.html
index 35aae78..e85f766 100644
--- a/output/terms.html
+++ b/output/terms.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/trademarks.html b/output/trademarks.html
index 2ac085b..bc743d1 100644
--- a/output/trademarks.html
+++ b/output/trademarks.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/translate.html b/output/translate.html
index 52f350a..8d04c0a 100644
--- a/output/translate.html
+++ b/output/translate.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/website-local.html b/output/website-local.html
index fdd24d6..086cd2c 100644
--- a/output/website-local.html
+++ b/output/website-local.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>
diff --git a/output/website-native.html b/output/website-native.html
index dab9027..ecae8d6 100644
--- a/output/website-native.html
+++ b/output/website-native.html
@@ -112,24 +112,24 @@
       </ul>
     </li>
   </ul>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item active dropdown dropdown-menu-right">
-      <a class="nav-link dropdown-toggle" href="#" id="asfDropdown"
+  <div class="navbar-nav">
+    <div class="nav-item dropdown dropdown-menu-right active">
+      <a class="nav-link dropdown-toggle" href="#"
          role="button" data-toggle="dropdown" aria-haspopup="true"
          aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather.svg"
 				    width="32" height="32" class="d-inline-block align-top"
 				    alt="Apache Feather">The ASF</a>
-      <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="asfDropdown">
-	<li><a class="dropdown-item" href="https://www.apache.org/">Website</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-	<li><a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-      </ul>
-    </li>
-  </ul>
+      <div class="dropdown-menu dropdown-menu-right">
+	<a class="dropdown-item" href="https://www.apache.org/">Website</a>
+	<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
+	<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
+	<a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a>
+	<a class="dropdown-item" href="https://www.openoffice.org/donations.html">Donations</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+	<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+      </div>
+    </div>
+  </div>
 </div>  </nav>
   <div id="contenta">
     <br/>