diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index ee7b9fb5..c7bc2e09 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -27,6 +27,12 @@
           <li><a href="{{ site_url('docs/how/elgamalaes') }}"><span>{{ _('ElGamal/AES+SessionTags') }}</span></a></li>
         </ul>
       </li>
+      <li class="has-sub"><a href="#"><span>{{ _('Applications') }}</span></a>
+        <ul>
+          <li><a href="{{ site_url('docs/applications/supported') }}"><span>{{ _('Supported applications') }}</span></a></li>
+          <li><a href="{{ site_url('docs/applications/bittorrent') }}"><span>{{ _('Bittorrent') }}</span></a></li>
+        </ul>
+      </li>
       <li class="has-sub"><a href="#"><span>{{ _('API') }}</span></a>
         <ul>
           <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><span>{{ _('I2PTunnel') }}</span></a></li>
@@ -48,7 +54,6 @@
         </ul>
       </li>
       <li><a href="howto.html"><span>{{ _('Howto docs') }}</span></a></li>
-      <li><a href="applications.html"><span>{{ _('Applications') }}</span></a></li>
     </ul>
   </li>
   <li class="has-sub"><a href="#"><span>{{ _('Support') }}</span></a>
diff --git a/www.i2p2/pages/bittorrent.html b/i2p2www/pages/site/docs/applications/bittorrent.html
similarity index 99%
rename from www.i2p2/pages/bittorrent.html
rename to i2p2www/pages/site/docs/applications/bittorrent.html
index bd37a9ad..2a9c98ce 100644
--- a/www.i2p2/pages/bittorrent.html
+++ b/i2p2www/pages/site/docs/applications/bittorrent.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Bittorrent over I2P{% endblock %}
 {% block content %}
 Updated September 2012, current as of router version 0.9.2
diff --git a/www.i2p2/pages/supported_applications.html b/i2p2www/pages/site/docs/applications/supported.html
similarity index 98%
rename from www.i2p2/pages/supported_applications.html
rename to i2p2www/pages/site/docs/applications/supported.html
index 5839354d..6deda707 100644
--- a/www.i2p2/pages/supported_applications.html
+++ b/i2p2www/pages/site/docs/applications/supported.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Supported Applications{% endblock %}
 {% block content %}
 
@@ -148,7 +148,7 @@ I2P. If you know of something that's missing please submit a ticket on
 
 <p><strong>Warning: Using an application, plugin, or service with I2P
 doesn't automatically protect your anonymity. I2P is merely a set of tools
-which can help you mitigate certain <a href="how_threatmodel">identified
+which can help you mitigate certain <a href="{{ site_url('docs/how/threatmodel') }}">identified
 threats to anonymity</a>. We do not and cannot make any guarantees about the
 safety of the applications, plugins, and services listed below. Most
 applications and plugins must be properly configured, and some will need to
@@ -338,7 +338,7 @@ and indexers</a></h4>
     <p><a href=
     "http://erdgeist.org/arts/software/opentracker/"><strong>opentracker</strong></a>
     — Lightweight tracker/indexer. I2P mod available in the i2p.opentracker
-    branch of the <a href="newdevelopers.html">I2P Monotone repository</a>.
+    branch of the <a href="{{ site_url('volunteer/guides/newdevelopers') }}">I2P Monotone repository</a>.
     <sup><em>[standalone/mod]</em></sup></p>
   </li>