diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 63c53a14c29d3958a14abf6ca9adaa18f1650a6f..ac236416a0695191f141e0170b3c3412d367ab8c 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -8,12 +8,6 @@
         <ul>
           <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
           <li><a href="{{ site_url('about/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
-            <ul>
-              <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
-              <li><a href="https://reddit.com/r/i2p"><div class="menuitem"><span>Reddit</span></div></a></li>
-            </ul>
-          </li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('References') }}</span></div>
             <ul>
               <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
@@ -57,6 +51,132 @@
       <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li>
   </ul>
   <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li>
+  <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
+    <ul>
+      <li><a href="https://wiki.i2p-projekt.de"><div class="menuitem"><span>{{ _('Wiki') }}</span></div></a></li>
+      <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
+      <li><a href="https://reddit.com/r/i2p"><div class="menuitem"><span>Reddit</span></div></a></li>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div>
+        <ul>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('research') }}"><div class="menuitem"><span>{{ _('Academic research') }}</span></div></a></li>
+              <li><a href="{{ site_url('research/questions') }}"><div class="menuitem"><span>{{ _('Open research questions') }}</span></div></a></li>
+            </ul>
+            <li><a href="{{ get_url('papers_list') }}"><div class="menuitem"><span>{{ _('Academic papers and peer review') }}</span></div></a></li>
+          </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>Media</span></div></li>
+              <li><a href="{{ site_url('about/i2pcon') }}"><div class="menuitem"><span>I2PCon</span></div></a></li>
+            </ul>
+          </li>
+        <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li>
+        <li><a href="https://i2p-metrics.np-tokumei.net/"><div class="menuitem"><span>{{ _('I2P Metrics') }}</span></div></a></li>
+        </ul>
+        </li>
+      </li>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('Develop') }}</span></div>
+        <ul>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Docs') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('docs') }}"><div class="menuitem"><span>{{ _('Documentation index') }}</span></div></a></li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('How does it work?') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/how/intro') }}"><div class="menuitem"><span>{{ _('Gentle intro') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/tech-intro') }}"><div class="menuitem"><span>{{ _('Tech intro') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/threat-model') }}"><div class="menuitem"><span>{{ _('Threat model') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/garlic-routing') }}"><div class="menuitem"><span>{{ _('Garlic routing') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/network-database') }}"><div class="menuitem"><span>{{ _('Network database') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/tunnel-routing') }}"><div class="menuitem"><span>{{ _('Tunnel routing') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/peer-selection') }}"><div class="menuitem"><span>{{ _('Peer selection') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/cryptography') }}"><div class="menuitem"><span>{{ _('Cryptography') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/how/elgamal-aes') }}"><div class="menuitem"><span>{{ _('ElGamal/AES+SessionTags') }}</span></div></a></li>
+                </ul>
+              </li>
+              <li><a href="{{ url_for('spec_index') }}"><div class="menuitem"><span>{{ _('Specifications') }}</span></div></a></li>
+              <li><a href="{{ url_for('proposal_index') }}"><div class="menuitem"><span>{{ _('Proposals') }}</span></div></a></li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li>
+                </ul>
+              </li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/applications/bittorrent') }}"><div class="menuitem"><span>{{ _('Bittorrent') }}</span></div></a></li>
+                </ul>
+              </li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('Protocols') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/protocol') }}"><div class="menuitem"><span>{{ _('Protocol stack') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/protocol/i2cp') }}"><div class="menuitem"><span>I2CP</span></div></a></li>
+                  <li><a href="{{ site_url('docs/protocol/i2np') }}"><div class="menuitem"><span>I2NP</span></div></a></li>
+                </ul>
+              </li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('Transports') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/transport') }}"><div class="menuitem"><span>{{ _('Transport layer overview') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/transport/ntcp') }}"><div class="menuitem"><span>NTCP</span></div></a></li>
+                  <li><a href="{{ site_url('docs/transport/ssu') }}"><div class="menuitem"><span>SSU</span></div></a></li>
+                </ul>
+              </li>
+              <li class="has-sub"><div class="menuitem"><span>{{ _('Tunnels') }}</span></div>
+                <ul>
+                  <li><a href="{{ site_url('docs/tunnels/implementation') }}"><div class="menuitem"><span>{{ _('Tunnel implementation') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/tunnels/unidirectional') }}"><div class="menuitem"><span>{{ _('Unidirectional tunnels') }}</span></div></a></li>
+                  <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li>
+                </ul>
+              </li>
+              <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li>
+            </ul>
+          </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('License') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('get-involved/develop/applications') }}"><div class="menuitem"><span>{{ _('Applications') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/develop/licenses') }}"><div class="menuitem"><span>{{ _('Licenses') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Meetings, Roadmap') }}</span></div>
+            <ul>
+              <li><a href="{{ get_url('meetings_index') }}"><div class="menuitem"><span>{{ _('Meeting Logs') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/roadmap') }}"><div class="menuitem"><span>{{ _('Project Roadmap') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/todo') }}"><div class="menuitem"><span>{{ _('Task list') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li>
+        </ul>
+      </li>
+    </ul>
+  </li>
   <li><a href="{{ get_url('blog_index') }}"><div class="menuitem"><span>{{ _('Blog') }}</span></div></a></li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Labs') }}</span></div>
     <ul>