diff --git a/pages/api.html b/pages/api.html
new file mode 100644
index 00000000..274ebe35
--- /dev/null
+++ b/pages/api.html
@@ -0,0 +1,7 @@
+<h1>API</h1>
+<ul>
+<li><a href="sam">SAM[ ]</a></li>
+<li><a href="ministreaming">ministreaming[ ]</a></li>
+<li><a href="i2cp">I2CP[ ]</a></li>
+<li><a href="datagrams">Datagrams[ ]</a></li>
+</ul>
diff --git a/pages/header.html b/pages/header.html
index aeacdb1d..ab6f4424 100644
--- a/pages/header.html
+++ b/pages/header.html
@@ -34,8 +34,8 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 - <a href="applications">Applications[x]</a><br/>
 &nbsp;&nbsp;* <a href="myi2p">MyI2P[ ]</a><br/>
 &nbsp;&nbsp;* <a href="minwww">MinWWW[x]</a><br/>
-&nbsp;&nbsp;* <a href="i2ptunnel">I2PTunnel[ ]</a><br/>
-<!--
+&nbsp;&nbsp;* <a href="i2ptunnel">I2PTunnel[.]</a><br/>
+<!-- NAVIGATION MOVED TO I2PTUNNEL PAGE
 &nbsp;&nbsp;&nbsp;&nbsp;&gt; <a href="i2ptunnel_services">Setting up services[ ]</a><br/>
 &nbsp;&nbsp;&nbsp;&nbsp;&gt; <a href="i2ptunnel_tuning">Tuning[ ]</a><br/>
 &nbsp;&nbsp;&nbsp;&nbsp;&gt; <a href="i2ptunnel_lan">LAN setup[ ]</a><br/>
@@ -44,15 +44,16 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 &nbsp;&nbsp;* <a href="jbigi">jbigi[x]</a><br/>
 &nbsp;&nbsp;* <a href="jvm">JVM[ ]</a><br/>
 &nbsp;&nbsp;* <a href="config_tweaks">Config tweaks[ ]</a><br/>
-- <a href="api">API[ ]</a><br/>
-<!--
+- <a href="api">API[.]</a><br/>
+<!-- NAVIGATION MOVED TO API PAGE
 &nbsp;&nbsp;* <a href="sam">SAM[ ]</a><br/>
 &nbsp;&nbsp;* <a href="ministreaming">ministreaming[ ]</a><br/>
 &nbsp;&nbsp;* <a href="i2cp">I2CP[ ]</a><br/>
 &nbsp;&nbsp;* <a href="datagrams">Datagrams[ ]</a><br/>
 -->
-- <a href="how_intro">How does it work?[x]</a><br/>
-<!-- &nbsp;&nbsp;* <a href="how_intro">Intro[x]</a><br/>
+- <a href="how">How does it work?[.]</a><br/>
+<!-- NAVIGATION MOVED TO HOW PAGE
+&nbsp;&nbsp;* <a href="how_intro">Intro[x]</a><br/>
 &nbsp;&nbsp;* <a href="how_threatmodel">Threat model[x]</a><br/>
 &nbsp;&nbsp;* <a href="how_tunnelrouting">Tunnel routing[ ]</a><br/>
 &nbsp;&nbsp;* <a href="how_garlicrouting">Garlic routing[ ]</a><br/>
diff --git a/pages/how.html b/pages/how.html
new file mode 100644
index 00000000..c2ee46d4
--- /dev/null
+++ b/pages/how.html
@@ -0,0 +1,12 @@
+<h1>How does it work?</h1>
+<ul>
+<li><a href="how_intro">Intro[x]</a></li>
+<li><a href="how_threatmodel">Threat model[x]</a></li>
+<li><a href="how_tunnelrouting">Tunnel routing[ ]</a></li>
+<li><a href="how_garlicrouting">Garlic routing[ ]</a></li>
+<li><a href="how_networkdatabase">Network database[ ]</a></li>
+<li><a href="how_peerselection">Peer selection[ ]</a></li>
+<li><a href="how_cryptography">Cryptography[ ]</a><br/>
+&nbsp;&nbsp;&gt; <a href="how_elgamalaes">ElGamal / AES+SessionTag[x]</a></li>
+<li><a href="how_networkcomparisons">Network comparisons[ ]</a></li>
+</ul>
diff --git a/pages/i2ptunnel.html b/pages/i2ptunnel.html
new file mode 100644
index 00000000..aed1ceaf
--- /dev/null
+++ b/pages/i2ptunnel.html
@@ -0,0 +1,6 @@
+<h1>I2PTunnel</h1>
+<ul>
+<li><a href="i2ptunnel_services">Setting up services[ ]</a></li>
+<li><a href="i2ptunnel_tuning">Tuning[ ]</a></li>
+<li><a href="i2ptunnel_lan">LAN setup[ ]</a></li>
+</ul>