diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 61715439..23d4b573 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -1,9 +1,17 @@
 <div id="cssmenu">
 <ul>
-  <li><a href="{{ site_url() }}"><span>{{ _('Home') }}</span></a></li>
-  <li><a href="{{ url_for('downloads_list', lang=g.lang) }}"><span>{{ _('Download') }}</span></a></li>
-  <li class="has-sub"><a href="{{ site_url('docs') }}"><span>{{ _('Docs') }}</span></a>
+  <li class="has-sub"><a href="#"><span>{{ _('Download') }}</span></a>
     <ul>
+      <li><a href="{{ url_for('downloads_list', lang=g.lang) }}"><span>{{ _('Download I2P') }}</span></a></li>
+      <li><a href="#"><span>{{ _('Windows installer') }}</span></a></li>
+      <li><a href="#"><span>{{ _('Linux / OS X / BSD / Solaris installer') }}</span></a></li>
+      <li><a href="#"><span>{{ _('Debian / Ubuntu packages') }}</span></a></li>
+      <li><a href="#"><span>{{ _('Source package') }}</span></a></li>
+    </ul>
+  </li>
+  <li class="has-sub"><a href="#"><span>{{ _('Docs') }}</span></a>
+    <ul>
+      <li><a href="{{ site_url('docs') }}"><span>{{ _('Documentation index') }}</span></a></li>
       <li class="has-sub"><a href="#"><span>{{ _('How does it work?') }}</span></a>
         <ul>
           <li><a href="{{ site_url('docs/how/intro') }}"><span>{{ _('Gentle intro') }}</span></a></li>
@@ -28,8 +36,9 @@
       <li><a href="{{ site_url('develop/licenses') }}"><span>{{ _('Licenses') }}</span></a></li>
     </ul>
   </li>
-  <li class="has-sub"><a href="{{ site_url('volunteer') }}"><span>{{ _('Volunteer') }}</span></a>
+  <li class="has-sub"><a href="#"><span>{{ _('Volunteer') }}</span></a>
     <ul>
+      <li><a href="{{ site_url('volunteer') }}"><span>{{ _('Get involved!') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/team') }}"><span>{{ _('Team') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/bounties') }}"><span>{{ _('Bounties') }}</span></a></li>