diff --git a/apps/routerconsole/jsp/help-advancedsettings.jsi b/apps/routerconsole/jsp/help-advancedsettings.jsi
index 33723fdb26e6605ef40eb787ee64355e0ccb3efc..a27438b56cece91cfda548c7c55daffbc4093943 100644
--- a/apps/routerconsole/jsp/help-advancedsettings.jsi
+++ b/apps/routerconsole/jsp/help-advancedsettings.jsi
@@ -9,7 +9,7 @@
 
 <tr><th>routerconsole.advanced={true|false}</th></tr>
 <tr><td class="infowarn">Only set this to true if you know what you are doing!</td></tr>
-<tr><td>When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on the <a href="/configadvanced">Advanced Configuration page</a>. Extra display options are provided in the <a href="/netdb">Network Database section</a>, including the Sybil Analysis tool, and there are additional configuration options on the <a href="/configclients">Clients Configuration page</a>. This will also enable the installation of unsigned updates, manual configuration of the news URL, and the installation of plugins. You may also wish to enable the "Advanced" sidebar section on the <a href="/configsidebar">Summary Bar Configuration page</a>.</td></tr>
+<tr><td>When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on the <a href="/configadvanced">Advanced Configuration page</a>. Extra display options are provided in the <a href="/netdb">Network Database section</a>, including the <a href="/netdb?f=3">Sybil Analysis tool</a>, and there are additional configuration options on the <a href="/configclients">Clients Configuration page</a>. This will also enable the installation of unsigned updates, manual configuration of the news URL, and the installation of plugins. You may also wish to enable the "Advanced" sidebar section on the <a href="/configsidebar">Summary Bar Configuration page</a>.</td></tr>
 
 <tr><th>routerconsole.browser={/path/to/browser}</th></tr>
 <tr><td>This setting allows the manual selection of the browser which I2P will launch on startup (if the console is <a href="/configservice#browseronstart">configured</a> to launch a browser on startup), overriding the OS default browser.</td></tr>
@@ -21,7 +21,7 @@
 <tr><td>This setting allows you to configure the update url for the unsigned update feature, if enabled. The url should end with <code>/i2pupdate.zip</code>. Note: do not install unsigned updates unless you trust the source of the update!</td></tr>
 
 <tr><th>routerconsole.enablePluginInstall={true|false}</th></tr>
-<tr><td>When set to true, this enables plugin installation on the <a href="/configplugins">Plugin Configuration page</a>. Setting <code>routerconsole.advanced=true</code> will also enable this feature.</td></tr>
+<tr><td>When set to true, this enables plugin installation on the <a href="/configplugins">Plugin Configuration page</a>. Setting <code>routerconsole.advanced=true</code> will also enable this feature. [Enabled by default]</td></tr>
 
 <tr><th>routerconsole.allowUntrustedPlugins={true|false}</th></tr>
 <tr><td>Plugins signed with the cryptographic key of the developer are the recommended format, but if you wish to install unsigned plugins you can set this to true. Note that you may still encounter issues attempting to install an unsigned plugin if the developer has included additional checks in the plugin build process.</td></tr> 
@@ -30,7 +30,7 @@
 <tr><td>When set to true, a configurable search bar will appear on the <a href="/home">console homepage</a>. Additional searches may then be added on the <a href="/confighome">home configuration page</a>.</td></tr>
 
 <tr><th>router.buildHandlerThreads={n}</th></tr>
-<tr><td>Allocate number of processor threads for building tunnels. If your processor supports hyperthreading, you may multiply the number of processor cores by 2 to get the maximum number of threads to allocate, otherwise number of processor cores = maximum number of threads available. Note that you may wish to allocate less than the theoretical maximum to ensure you have headroom for other tasks.</td></tr>
+<tr><td>Allocate number of processor threads for building tunnels. If your processor supports hyperthreading or simultaneous multithreading, you may multiply the number of processor cores by 2 to get the maximum number of threads to allocate, otherwise number of processor cores = maximum number of threads available. Note that you may wish to allocate less than the theoretical maximum to ensure you have headroom for other tasks.</td></tr>
 
 <tr><th>router.maxParticipatingTunnels={n}</th></tr>
 <tr><td>Determines the maximum number of participating tunnels the router can build. To disable participation completely, set to 0.</td></tr>
diff --git a/apps/routerconsole/jsp/help-faq.jsi b/apps/routerconsole/jsp/help-faq.jsi
new file mode 100644
index 0000000000000000000000000000000000000000..2b8b021917d72bd35677423b80154cc74c28935b
--- /dev/null
+++ b/apps/routerconsole/jsp/help-faq.jsi
@@ -0,0 +1,80 @@
+<h2>Abridged I2P FAQ</h2>
+
+<p class="infohelp">This is a shortened version of the official FAQ. For the full version, please visit <a href="https://geti2p.net/faq" target="_blank">https://geti2p.net/faq</a> or <a href="http://i2p-projekt.i2p/faq" target="_blank">http://i2p-projekt.i2p/faq</a>.
+
+<h3>My router has been up for several minutes and has zero or very few connections</h3>
+
+<p>If after a few minutes of uptime your router is indicating 0 Active Peers and 0 Known Peers, with a notification in the sidebar that you need to check your network connection, verify that you can access the internet. If your internet connection is functional, you may need to unblock Java in your firewall. Otherwise, you may need to reseed your I2P router. Visit the <a href="/configreseed#reseedconfig">Reseed Configuration page</a> and click the <i>Save Changes and Reseed Now</i> button.</p>
+
+<h3>My router has very few active peers, is this OK?</h3>
+
+<p>If your router has 10 or more active peers, everything is fine. The router should maintain connections to a few peers at all times. The best way to stay "better-connected" to the network is to <a href="/config">share more bandwidth</a>.</p>
+
+<h3 id="addressbooksubs">I'm missing lots of hosts in my addressbook. What are some good subscription links?</h3>
+
+<p>The default subscription is to <code>http://i2p-projekt.i2p/hosts.txt</code> which is seldom updated. If you don't have another subscription, you may often have to use "jump" links which is much slower but ensures that your addressbook is only populated by sites you use (in addition to the default subscription addresses). To speed up browsing on I2P, it's a good idea to add some addressbook subscriptions.</p>
+
+<p>Here are some other public addressbook subscription links. You may wish to add one or two to your <a href="/susidns/subscriptions">susidns subscription list</a>. In the event that addresses conflict in the subscriptions, the lists placed at the top of your susidns configuration will take precedence over those placed further down.</p>
+
+<ul>
+<li><code>http://stats.i2p/cgi-bin/newhosts.txt</code></li>
+<li><code>http://no.i2p/export/alive-hosts.txt</code></li>
+<li><code>http://identiguy.i2p/hosts.txt</code></li>
+</ul>
+
+<p>Note that subscribing to a hosts.txt service is an act of trust, as a malicious subscription could give you incorrect addresses, so be careful subscribing to lists from unknown sources. The operators of these services may have various policies for listing hosts. Presence on this list does not imply endorsement.</p>
+
+<h3>How do I access IRC, BitTorrent, or other services on the regular Internet?</h3>
+
+<p>Unless an outproxy has been set up for the service you want to connect to, this is not possible. There are only three types of outproxies running right now: HTTP, HTTPS, and email. Note that there is currently no publicly listed SOCKS outproxy. If this type of service is required, try <a href="https://torproject.org/" target="_blank">Tor</a>.</p>
+
+<h3>How do I configure my browser to access .i2p websites?</h3>
+<p>You will need to configure your browser to use the HTTP proxy server (by default on host: <code>127.0.0.1</code> port: <code>4444</code>). See the <a href="https://geti2p.net/en/about/browser-config" target="_blank">Browser Proxy Configuration Guide</a> for a more detailed explanation.</p>
+
+<h3>What is an eepsite?</h3>
+
+<p>An eepsite is a website that is hosted anonymously on the I2P network - you can access it by configuring your web browser to use I2P's HTTP proxy (see above) and browsing to the <code>.i2p</code> suffixed website (e.g. <a href="http://i2p-projekt.i2p" target="_blank">http://i2p-projekt.i2p</a>). Also ensure your browser is configured to resolve DNS remotely when using the proxy to avoid DNS leaks.</p>
+
+<h3>Most of the eepsites are down?</h3>
+
+<p>If you consider every eepsite that has ever been created, yes, most of them are down. People and eepsites come and go. A good way to get started in I2P is check out a list of eepsites that are currently up. <a href="http://identiguy.i2p" target="_blank">http://identiguy.i2p</a> tracks active eepsites.</p>
+
+<h3>How do I connect to IRC within I2P?</h3>
+
+<p>A tunnel to the main IRC server network within I2P, Irc2P, is created when I2P is installed (see the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>), and is automatically started when the I2P router starts. To connect to it, tell your IRC client to connect to server: <code>127.0.0.1</code> port: <code>6668</code>.</p>
+
+<p>XChat-like client users can create a new network with the server <code>127.0.0.1/6668</code> (remember to tick <i>Bypass proxy server</i> if you have a proxy server configured), or you can connect with the command <code>/server 127.0.0.1 6668</code>. Different IRC clients may vary the syntax.</p>
+
+<h3>What ports does I2P use?</h3>
+
+<table id="portfaq">
+<tr><th colspan="3">LOCAL PORTS</th></tr>
+<tr><td colspan="3" class="infohelp">These are the local I2P port mappings, listening only to local connections by default, except where noted. Unless you require access from other machines, they should only be accessible from localhost.</td></tr>
+<tr><th>Port</th><th>Function</th><th>Notes</th></tr>
+<tr><td>1900</td><td>UPnP SSDP UDP multicast listener</td><td>Cannot be changed. Binds to all interfaces. Can be disabled on the <a href="/confignet">Network Configuration page</a>.</td></tr>
+<tr><td>2827</td><td>BOB bridge</td><td>A higher level socket API for clients. Can be enabled/disabled on the <a href="/configclients">Client Configuration page</a>. Can be changed in the <code>bob.config</code> file. [Disabled by default]</td></tr>
+<tr><td>4444</td><td>HTTP proxy</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces.</td></tr>
+<tr><td>4445</td><td>HTTPS proxy</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces.</td></tr>
+<tr><td>6668</td><td>IRC proxy</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces.</td></tr>
+<tr><td>7652</td><td>UPnP HTTP TCP event listener</td><td>Binds to the LAN address. Can be changed with advanced config <code>i2np.upnp.HTTPPort=nnnn</code>. Can be disabled on the <a href="/confignet">Network Configuration page</a>.</td></tr>
+<tr><td>7653</td><td>UPnP SSDP UDP search response listener</td><td>Binds to all interfaces. Can be changed with advanced config <code>i2np.upnp.SSDPPort=nnnn</code>. Can be disabled on the <a href="/configclients">Client Configuration page</a>.</td></tr>
+<tr><td>7654</td><td>I2P Client Protocol port</td><td>Used by client apps. Can be changed to a different port on the <a href="/configclients">Client Configuration page</a> but this is not recommended. Can be bound to a different interface or all interfaces, or disabled, on the <a href="/configclients">Client Configuration page</a>.</td></tr>
+<tr><td>7655</td><td>UDP for SAM bridge</td><td>A higher level socket API for clients. Only opened when a SAM V3 client requests a UDP session. Can be enabled/disabled on the <a href="/configclients"> Client Configuration page</a>. Can be changed in the <code>clients.config</code> file with the SAM command line option <code>sam.udp.port=nnnn</code>.</td></tr>
+<tr><td>7656</td><td>SAM bridge</td><td>A higher level socket API for clients. Can be enabled/disabled on the <a href="/configclients">Client Configuration page</a>. Can be changed in the <code>clients.config</code> file. [Disabled by default]</td></tr>
+<tr><td>7657</td><td>I2P Router Console (Web interface)</td><td>Can be disabled in the <code>clients.config</code> file. Can also be configured to bind to a specific interface or all interfaces in that file. If you make the Router Console available over the network, you might wish to <a href="/configui#passwordheading">enforce an access password</a> to prevent unauthorized access.</td></tr>
+<tr><td>7658</td><td>I2P Web Server</td><td>Can be disabled in the <code>clients.config</code> file. Can also be configured to bind to a specific interface or all interfaces in the <code>jetty.xml</code> file.</td>
+</tr>
+<tr><td>7659</td><td>Outgoing mail to smtp.postman.i2p</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces.</td></tr>
+<tr><td>7660</td><td>Incoming mail from pop.postman.i2p</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces.</td></tr>
+<tr><td>8998</td><td>mtn.i2p2.i2p (I2P's Monotone DVCS)</td><td>Can be disabled or changed in the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>. Can also be configured to bind to a specific interface or all interfaces. [Disabled by default]</td></tr>
+<tr><td>31000</td><td>Local connection to wrapper control channel port</td><td>Outbound to 32000 only, does not listen on this port. Starts at 31000 and will increment until 31999 looking for a free port. To change, see the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-port.html" target="_blank">wrapper documentation</a>.</td></tr>
+<tr><td>32000</td><td>Local control channel for the service wrapper</td><td>To change, see the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-port.html" target="_blank">wrapper documentation</a>.</td></tr>
+<tr><th colspan="3">INTERNET FACING PORTS</th></tr>
+<tr><td colspan="3" class="infohelp">I2P selects a random port between 9000 and 31000 to communicate with other routers when the program is run for the first time, or when your external IP address changes when running in <a href="/confignet#ipchange">Laptop Mode</a>. The <a href="/confignet#udpconfig">selected port</a> is shown on the <a href="/confignet">Network Configuration page</a>.</td></tr>
+<tr><td colspan="3">Outbound UDP from the <a href="/confignet#udpconfig">random port</a> noted on the Network Configuration page to arbitrary remote UDP ports, allowing replies.</td></tr>
+<tr><td colspan="3">Outbound TCP from random high ports to arbitrary remote TCP ports.</td></tr>
+<tr><td colspan="3">Inbound UDP to the <a href="/confignet#udpconfig">port</a> noted on the Network Configuration page from arbitrary locations (optional, but recommended).</td></tr>
+<tr><td colspan="3">Inbound TCP to the <a href="/confignet#externaltcp">port</a> noted on the Network Configuration page from arbitrary locations (optional, but recommended). <a href="/confignet#tcpconfig">Inbound TCP</a> may be disabled on the Network Configuration page.</td></tr>
+<tr><td colspan="3">Outbound UDP on port 123, allowing replies: this is necessary for I2P's internal time sync (via SNTP - querying a random SNTP host in <code>pool.ntp.org</code> or another server you specify).</td></tr></td></tr>
+</table>
+
diff --git a/apps/routerconsole/jsp/help-legal.jsi b/apps/routerconsole/jsp/help-legal.jsi
index c2b31bd68f4784f3b341937447d7452f8428ed13..b243607220a82ad3893d5d1c2b9183f07640dbf0 100644
--- a/apps/routerconsole/jsp/help-legal.jsi
+++ b/apps/routerconsole/jsp/help-legal.jsi
@@ -1,38 +1,34 @@
 <h2>Legal stuff</h2>
-<p>The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
-a few notable exceptions:</p>
+<p>The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with a few notable exceptions:</p>
+
 <ul>
 <li class="tidylist">ElGamal and DSA code, under the BSD license, written by TheCrypto</li>
-<li class="tidylist">SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle</li>
-<li class="tidylist">AES code, under the Cryptix (MIT) license, written by the Cryptix team</li>
-<li class="tidylist">SNTP code, under the BSD license, written by Adam Buckley</li>
-<li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo,
-    ugha, duck, shendaras, and others.</li>
+<li class="tidylist">SHA256 and HMAC-SHA256, under the MIT license, written by the <a href="https://www.bouncycastle.org/" target="_blank">Legion of the Bouncycastle</a></li>
+<li class="tidylist">AES code, under the Cryptix (MIT) license, written by the <a href="http://www.cryptix.org/" target="_blank">Cryptix team</a></li>
+<li class="tidylist"><a href="http://support.ntp.org/bin/view/Support/JavaSntpClient" target="_blank">SNTP code</a>, under the BSD license, written by Adam Buckley</li>
+<li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.</li>
 </ul>
 
-<p>On top of the I2P router are a series of client applications, each with their own set of
-licenses and dependencies.  This webpage is being served as part of the I2P routerconsole
-client application, which is built off a trimmed down <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a>
-instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration),
-allowing you to deploy standard JSP/Servlet web applications into your router.  Jetty in turn makes use of
-Apache's javax.servlet (javax.servlet.jar) implementation.
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).</p>
+<p>On top of the I2P router are a series of client applications, each with their own set of licenses and dependencies:
 
-<p>Another application you can see on this webpage is <a href="http://i2p-projekt.i2p/i2ptunnel">I2PTunnel</a>
-(your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
-lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).  There is also a
-<a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on
-the console, which is a GPL'ed application written by susi23.  The addressbook application, written by
-<a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
-more information).</p>
+<ul>
+<li class="tidylist"><a href="http://i2p-projekt.i2p/i2ptunnel" target="_blank">I2PTunnel</a> - a GPL'ed application written by mihi
+that lets you tunnel normal TCP/IP traffic over I2P (such as the http proxy and the irc proxy), with a <a href="/i2ptunnelmgr">browser-based front end.</a></li>
+<li class="tidylist"><a href="/webmail">Susimail</a>, a GPL'ed browser based mail client written by susi23.</li>
+<li class="tidylist">The <a href="http://i2p-projekt.i2p/en/docs/naming#addressbook" target="_blank">addressbook application</a>,
+written by Ragnarok helps maintain your hosts.txt files, with a <a href="/dns">front end</a> written by susi23.</li>
+<li class="tidylist">The <a href="http://i2p-projekt.i2p/en/docs/api/samv3" target="_blank">SAM</a> bridge by human (public domain), an API
+which other client applications (such the <a href="http://i2pwiki.i2p/index.php?title=Tahoe-LAFS" target="_blank">I2P Tahoe-LAFS cloud filesystem</a>) can use to interface with I2P.</li>
+<li class="tidylist"><a href="http://i2p-projekt.i2p/en/misc/jbigi" target="_blank">jbigi</a> - an optimized library for doing large number calculations which uses the
+LGPL licensed <a href="http://swox.com/gmp/" target="_blank">GMP</a> library, tuned for various PC architectures.</li>
+<li class="tidylist">Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/" target="_blank">Launch4J</a>,
+and the installer is built with  <a href="http://www.izforge.com/izpack/" target="_blank">IzPack</a>.</li>
+<li class="tidylist">The <a href="/">I2P Router Console</a>, built from a streamlined <a href="http://jetty.mortbay.com/jetty/index.html" target="_blank">Jetty Web Server</a> instance
+which allows you to deploy standard JSP/Servlet web applications in your router.</li>
+<li class="tidylist">Jetty makes use of Apache's <a href="https://docs.oracle.com/javaee/7/api/javax/servlet/package-summary.html" target="_blank">javax.servlet</a>
+(javax.servlet.jar) implementation. This product includes software developed by the <a href="http://www.apache.org/" target="_blank">Apache Software Foundation</a>.</li>
+<li class="tidylist">Source for the I2P code and most bundled client applications can be found on our <a href="http://i2p-projekt.i2p/download" target="_blank">download page</a>.</li>
+</ul>
 
-<p>The router by default also includes human's public domain <a href="http://i2p-projekt.i2p/sam">SAM</a> bridge,
-which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.
-There is also an optimized library for doing large number calculations - jbigi - which in turn uses the
-LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  Launchers for windows users 
-are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and the installer is built with 
-<a href="http://www.izforge.com/izpack/">IzPack</a>.  For
-details on other applications available, as well as their licenses, please see the
-<a href="http://i2p-projekt.i2p/licenses">license policy</a>.  Source for the I2P code and most bundled
-client applications can be found on our <a href="http://i2p-projekt.i2p/download">download page</a>.</p>
+<p>For details on other applications available, as well as their licenses, please see the <a href="http://i2p-projekt.i2p/licenses" target="_blank">
+license policy</a>. Additional licenses can be found in the <code>licenses</code> sub-directory of your I2P installation.</p>
diff --git a/apps/routerconsole/jsp/help.jsi b/apps/routerconsole/jsp/help.jsi
index 0c06c21f4a195941f1a492cbfdccd3118a9dde03..5bfa202b817c0dc035d84a61598bcc6004f5a053 100644
--- a/apps/routerconsole/jsp/help.jsi
+++ b/apps/routerconsole/jsp/help.jsi
@@ -1,11 +1,9 @@
 <h2>Further Assistance</h2>
-If you'd like to help improve or translate the documentation, or
-help with other aspects of the project, please see the documentation for
-<a href="http://i2p-projekt.i2p/en/get-involved">volunteers.</a>
+<p>If you'd like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for <a href="http://i2p-projekt.i2p/en/get-involved" target="_blank">volunteers.</a></p>
 <p>Further assistance is available here:</p>
 <ul class="links">
-<li class="tidylist"><a href="http://i2p-projekt.i2p/en/faq">FAQ on i2p-projekt.i2p</a></li>
-<li class="tidylist"><a href="http://i2pwiki.i2p/">I2PWiki</a></li>
-<li class="tidylist"><a href="http://forum.i2p/">I2P forum</a></li></ul>
-<p>You may also try <a href="http://zzz.i2p">zzz's developer forum</a>,
+<li class="tidylist"><a href="http://i2p-projekt.i2p/en/faq" target="_blank">FAQ on i2p-projekt.i2p</a></li>
+<li class="tidylist"><a href="http://i2pwiki.i2p/" target="_blank">I2PWiki</a></li>
+<li class="tidylist"><a href="http://forum.i2p/" target="_blank">I2P forum</a></li></ul>
+<p>You may also try <a href="http://zzz.i2p" target="_blank">zzz's developer forum</a>,
 or <a href="irc://127.0.0.1:6668/i2p">I2P's IRC network</a>.</p>
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 8a609eb855a59535c9d2aefa816cb0bff1e7e0dd..035938f8baf42b19407b365f7e09b9a5e6c5b8b8 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -14,13 +14,24 @@
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1>I2P Router Help &amp; Support</h1>
-<div class="main" id="help"><p>
+<div class="main" id="help">
+
+<div class="confignav">
+<span class="tab"><a href="#sidebarhelp">Sidebar</a></span>
+<span class="tab"><a href="#configurationhelp">Configuration</a></span>
+<span class="tab"><a href="#reachabilityhelp">Reachability</a></span>
+<span class="tab"><a href="#advancedsettings">Advanced Settings</a></span>
+<span class="tab"><a href="#faq">FAQ</a></span>
+<span class="tab"><a href="#legal">Legal</a></span>
+<span class="tab"><a href="#changelog">Change Log</a></span>
+</div>
 
 <div id="volunteer"><%@include file="help.jsi" %></div>
 <div id="sidebarhelp"><%@include file="help-sidebar.jsi" %></div>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div>
+<div id="faq"><%@include file="help-faq.jsi" %></div>
 <div id="legal"><%@include file="help-legal.jsi" %></div>
 <div id="changelog">
 <h2>Change Log</h2>
diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp
index d605d61fa8ad13bbbfa6ed50551b1397b06baa20..13dfb4590615a3819cbfd7893c34c64fd8df9210 100644
--- a/apps/routerconsole/jsp/help_ar.jsp
+++ b/apps/routerconsole/jsp/help_ar.jsp
@@ -14,16 +14,30 @@
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1>I2P مساعدة لوحة التحكم</h1>
-<div class="main" id="help" dir="rtl" lang="ar"><p>
-اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله
 
-<a href="http://i2p-projekt.i2p/ar/get-involved">تطوع</a>
-</p>المزيد من المساعدة هنا:
+<div class="main" id="help" dir="rtl" lang="ar">
+
+<div class="confignav">
+<span class="tab"><a href="#sidebarhelp">Sidebar</a></span>
+<span class="tab"><a href="#configurationhelp">Configuration</a></span>
+<span class="tab"><a href="#reachabilityhelp">Reachability</a></span>
+<span class="tab"><a href="#advancedsettings">Advanced Settings</a></span>
+<span class="tab"><a href="#faq">FAQ</a></span>
+<span class="tab"><a href="#legal">Legal</a></span>
+<span class="tab"><a href="#changelog">Change Log</a></span>
+</div>
+
+<div id="volunteer">
+<h2>مساعدة إضافية</h2>
+<p>اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله <a href="http://i2p-projekt.i2p/ar/get-involved">تطوع</a></p>
+<p>المزيد من المساعدة هنا:</p>
 <ul class="links">
-<li class="tidylist"><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a>
-<br>يمكن ايضا<a href="http://forum.i2p/">I2P منتدى</a>
-او بالدردشة على  IRC.</li></ul>
+<li class="tidylist"><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a></li>
+<li>يمكن ايضا<a href="http://forum.i2p/">I2P منتدى</a></li>
+<li>او بالدردشة على IRC.</li></ul>
+</div>
 
+<div id="sidebarhelp">
 <h2>شريط المعلومات</h2><p>
 يمكن للاحصائات أن
 <a href="configstats.jsp">تتغير</a> لكي تظهر على شكل
@@ -66,20 +80,19 @@ The full hash is shown on your <a href="netdb.jsp?r=.">صفحة معلومات 
 هذا العدد ليس حجم الاجمالي للشبكة، 
 يمكنه ان بتغيير حسب سرعة الاتصال.
 </li>
-</ul><h3>سرعة الاتصال الداخلي/خارجي</h3><div align="justify">
-السرعة ب بايت في الثانية
+</ul>
+<h3>سرعة الاتصال الداخلي/خارجي</h3>
+<p>السرعة ب بايت في الثانية
 غير السرعة في <a href="confignet#help">صفحة الاعدادات</a>.
-السرعة <a href="graphs.jsp">مرسومة</a> </div>
-<h3>الوجهات الداخلية</h3><div align="justify">
-الاتصالات الداخلية 
-البرامج المحلية المتصلة عبر الموجه
-<a href="i2ptunnel/index.jsp">I2PTunnel</a>
-او برامج خارجية متصلة SAM, BOB, او مباشرة بـ I2CP.
-</div><h3>الأنفاق الداخلة/خارجة</h3><div align="justify">
-الأنفاق الحالية موجودة في <a href="tunnels.jsp">صفحة الأنفاق</a>.</div><ul>
-<li class="tidylist"><div align="justify"><b>تصفح</b>
+السرعة <a href="graphs.jsp">مرسومة</a> </p>
+<h3>الوجهات الداخلية</h3>
+<p>الاتصالات الداخلية  البرامج المحلية المتصلة عبر الموجه <a href="i2ptunnel/index.jsp">I2PTunnel</a></p>
+<p>او برامج خارجية متصلة SAM, BOB, او مباشرة بـ I2CP.</p>
+<h3>الأنفاق الداخلة/خارجة</h3>
+<p>الأنفاق الحالية موجودة في <a href="tunnels.jsp">صفحة الأنفاق</a>.</p><ul>
+<li class="tidylist"><b>تصفح</b>
 الأنفاق المستخدمة من طرف الموجه تستعمل في الاتصال مع النظائر، انشاء انفاق جديدة.
-</div></li>
+</li>
 <li class="tidylist"><b>المستخدمين</b>
 الأنفاق المستخدمة من طرف الموجه </li>
 <li class="tidylist"><b>المشاركة</b>
@@ -93,8 +106,9 @@ the <a href="configadvanced.jsp">صفحة الاعدادات المتقدمة</a
 عدد أكبر من 1.00 يعني انك تساهم في الشبكة بعدد اكبر مما تستهلك.</li>
 </ul>
 
-<h3>ازدحام</h3><div align="justify">
-بعض مشرات ازدحام الموجه</div><ul>
+<h3>ازدحام</h3>
+<p>بعض مشرات ازدحام الموجه</p>
+<ul>
 <li class="tidylist"><b>Job lag:</b>
 How long jobs are waiting before execution. The job queue is listed on the <a href="jobs.jsp">jobs page</a>.
 Unfortunately, there are several other job queues in the router that may be congested,
@@ -131,15 +145,22 @@ Your router may accept all requests, accept or reject a percentage of requests,
 or reject all requests for a number of reasons, to control
 the bandwidth and CPU demands and maintain capacity for
 local clients.</li></ul>
+</div>
+
+<% /* untranslated */ %>
+<div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
+<div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
+<div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
+<div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 
+<div id="legal">
 <h2>Legal stuff</h2><p>The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
 a few notable exceptions:</p><ul>
 <li class="tidylist">ElGamal and DSA code, under the BSD license, written by TheCrypto</li>
 <li class="tidylist">SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle</li>
 <li class="tidylist">AES code, under the Cryptix (MIT) license, written by the Cryptix team</li>
 <li class="tidylist">SNTP code, under the BSD license, written by Adam Buckley</li>
-<li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo,
-    ugha, duck, shendaras, and others.</li>
+<li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.</li>
 </ul>
 
 <p>On top of the I2P router are a series of client applications, each with their own set of
@@ -169,7 +190,9 @@ details on other applications available, as well as their licenses, please see t
 <a href="http://i2p-projekt.i2p/ar/get-involved/develop/licenses">license policy</a>.  Source for the I2P code and most bundled
 client applications can be found on our <a href="http://i2p-projekt.i2p/ar/download">download page</a>.
 .</p>
+</div>
 
+<div id="changelog">
 <h2>Change Log</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
@@ -178,5 +201,7 @@ client applications can be found on our <a href="http://i2p-projekt.i2p/ar/downl
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
 
- <p><a href="/history.txt">View the full change log</a>
- </p><hr></div></body></html>
+ <p id="fullhistory"><a href="/history.txt">View the full change log</a></p>
+</div>
+
+</div></body></html>
diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp
index 37583fdba74099c3c4417868cec0f174f90d2f45..f76c2f62378859de6b37da6d42ca41ade28d8ebb 100644
--- a/apps/routerconsole/jsp/help_fr.jsp
+++ b/apps/routerconsole/jsp/help_fr.jsp
@@ -15,16 +15,31 @@
 <%@include file="summary.jsi" %>
 <!-- Traduction de mars 2011 (magma@mail.i2p) -->
 <h1>Aide et assistance du routeur I2P</h1>
-<div class="main" id="help"><p>
-Si vous souhaitez améliorer ou traduire la documentation ou d'autres versants du projet, merci de vous reporter à 
+<div class="main" id="help">
+
+<div class="confignav">
+<span class="tab"><a href="#sidebarhelp">Barre latérale</a></span>
+<span class="tab"><a href="#configurationhelp">Configuration</a></span>
+<span class="tab"><a href="#reachabilityhelp">Joignabilité</a></span>
+<span class="tab"><a href="#advancedsettings">Réglages avancés</a></span>
+<span class="tab"><a href="#faq">FAQ</a></span>
+<span class="tab"><a href="#legal">Légal</a></span>
+<span class="tab"><a href="#changelog">Historique</a></span>
+</div>
+
+<div id="volunteer">
+<h2>Assistance Supplémentaire</h2>
+<p>Si vous souhaitez améliorer ou traduire la documentation ou d'autres versants du projet, merci de vous reporter à 
 la page consacrée aux <a href="http://i2p-projekt.i2p/fr/get-involved">volontaires</a>.
 </p>D'autres détails sont disponibles ici:
 <ul class="links">
 <li class="tidylist"><a href="http://i2p-projekt.i2p/en/faq">FAQ en anglais sur i2p-projekt.i2p</a></li>
-<li class="tidylist"><a href="http://i2p-projekt.i2p/fr/faq">les FAQ en français</a>.</li></ul>
-<br>Il y a aussi le <a href="http://forum.i2p/">forum I2P</a>
-et l'IRC.
+<li class="tidylist"><a href="http://i2p-projekt.i2p/fr/faq">les FAQ en français</a>.</li>
+<li>Il y a aussi le <a href="http://forum.i2p/">forum I2P</a> et l'IRC.</li>
+</ul><br>
+</div>
 
+<div id="sidebarhelp">
 <h2>Informations du panneau de surveillance</h2><p>
 Plusieurs des statistiques affichées dans le panneau de surveillance peuvent être 
 <a href="configstats.jsp">configurées</a> pour être affichées sous forme de <a href="graphs.jsp">graphiques</a> pour 
@@ -64,19 +79,20 @@ diffusion ("floodfill"). Vos pairs "bien intégrés" sont affichés en bas de la
 page <a href="netdb.jsp">base de données du réseau</a>. De moins de 100 à 1000 ou plus. Ce nombre ne représente pas la 
 taille totale du réseau; il varie en fonction de votre bande passante totale et son rapport de partage, et du trafic 
 local. I2P n'a pas besoin que chaque routeur connaisse tous les autres.
-</li></ul><h3>Bande passante entrée/sortie</h3><div align="justify"> 
-Ça parle tout seul. Toutes les valeurs sont en octets par seconde (o/s), pas en bits par seconde (b/s). Modifiez vos 
+</li></ul><h3>Bande passante entrée/sortie</h3>
+<p>Ça parle tout seul. Toutes les valeurs sont en octets par seconde (o/s), pas en bits par seconde (b/s). Modifiez vos 
 limites de bande passante sur la page de <a href="confignet#help">configuration</a>.
-Le <a href="graphs.jsp">graphique de bande passante</a> est activé par défaut.</div>
+Le <a href="graphs.jsp">graphique de bande passante</a> est activé par défaut.</p>
 
-<h3>Destinations locales</h3><div align="justify">
-C'est le nom I2P des applications qui se connectent par votre routeur. Elles peuvent être des clients lancés depuis 
+<h3>Destinations locales</h3>
+<p>C'est le nom I2P des applications qui se connectent par votre routeur. Elles peuvent être des clients lancés depuis 
 <a href="i2ptunnel/index.jsp">I2PTunnel</a> ou des programmes tiers qui se connectent via SAM, BOB ou directement à 
-I2CP.
-</div><h3>TUNNELS:</h3><div align="justify">
-Les tunnels actuels sont affichés sur la page <a href="tunnels.jsp">tunnels</a>.</div><ul>
-<li class="tidylist"><div align="justify"><b>Exploratoires:</b> tunnels créés par votre routeur et utilisés avec les 
-pairs diffuseurs pour la création des nouveaux tunnels et le test des tunnels existants.</div></li>
+I2CP.</p>
+<h3>TUNNELS:</h3>
+<p>Les tunnels actuels sont affichés sur la page <a href="tunnels.jsp">tunnels</a>.</p>
+<ul>
+<li class="tidylist"><b>Exploratoires:</b> tunnels créés par votre routeur et utilisés avec les 
+pairs diffuseurs pour la création des nouveaux tunnels et le test des tunnels existants.</li>
 <li class="tidylist"><b>Clients:</b> tunnels créés par votre routeur pour chaque utilisation cliente.</li>
 <li class="tidylist"><b>Participants:</b> les tunnels créés par d'autres routeurs et qui passent par le votre. Leur 
 nombre dépend largement de la demande du réseau, de votre part de bande passante partagée, et du trafic local. 
@@ -87,10 +103,12 @@ La méthode recommandée pour limiter leur nombre est de diminuer le rapport de
 <li class="tidylist"><b>Rapport de partage:</b> le nombre de tunnels participants que vous routez pour les autres, 
 divisé par le nombre total de sauts dans tous vos tunnels exploratoires et clients. S'il est supérieur à 1, cela 
 signifie que vous contribuez à plus de tunnels que vous n'en utilisez.
-</li></ul>
+</li>
+</ul>
 
-<h3>ENCOMBREMENT</h3><div align="justify">
-Indications de base sur la charge du routeur:</div><ul>
+<h3>ENCOMBREMENT</h3>
+<p>Indications de base sur la charge du routeur:</p>
+<ul>
 <li class="tidylist"><b>Retard de tâches:</b> temps d'attente des tâches avant exécution. La file d'attente est 
 présentée la pages des <a href="jobs.jsp">tâches</a>. Malheureusement, il y a dans le routeur plusieurs autres files 
 d'attentes qui ne peuvent être affichées dans la console. Le retard de tâches devrait rester à zéro en permamence. s'il 
@@ -112,7 +130,14 @@ limite de bande passante partagée.</li>
 des demandes de création de tunnels participants provenant d'autres routeurs. Votre routeur peut accepter ou refuser 
 tout ou partie des requêtes, ou les refuser en totalité pour des raisons prévues telles que le contrôle de la bande 
 passante et des ressources CPU en vue de préserver les performances des clients locaux.</li></ul>
+</div>
+
+<div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
+<div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
+<div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
+<div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 
+<div id="legal">
 <h2>Informations légales</h2><p>Le routeur I2P (router.jar) et le SDK (i2p.jar) sont presque entièrement dans le 
 domaine public, à quelques notobles exceptions près:</p><ul>
 <li class="tidylist">Le code ElGamal et DSA, sous licence BSD, écrits par TheCrypto</li>
@@ -148,7 +173,9 @@ leurs licences respectives, référez-vous à notre <a href="http://i2p-projekt.
 Les sources du code I2P et de la plupart des applications jointes est sur notre page de 
 <a href="http://i2p-projekt.i2p/fr/download">téléchargements</a>.
 .</p>
+</div>
 
+<div id="changelog">
 <h2>Historique des évolutions</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
@@ -157,5 +184,7 @@ Les sources du code I2P et de la plupart des applications jointes est sur notre
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
 
- <p><a href="/history.txt">Historique complet</a>
- </p><hr></div></body></html>
+ <p id="fullhistory"><a href="/history.txt" target="_blank">Historique complet</a>
+ </p>
+</div>
+</div></body></html>
diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp
index 28164f4c8ec97a350d19b14422df3f59e045ae49..27f35184f604564411af4860faf5ed371b3df118 100644
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@@ -14,17 +14,31 @@
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1>I2P Router Help &amp; Support</h1>
-<div class="main" id="help"><p>
-Als je wilt helpen om de documentatie te verbeteren of vertalen, of wilt helpen
+<div class="main" id="help">
+
+<div class="confignav">
+<span class="tab"><a href="#sidebarhelp">Summary Bar</a></span>
+<span class="tab"><a href="#configurationhelp">Configuratie</a></span>
+<span class="tab"><a href="#reachabilityhelp">Bereikbaarheid</a></span>
+<span class="tab"><a href="#advancedsettings">Geavanceerde Instellingen</a></span>
+<span class="tab"><a href="#faq">FAQ</a></span>
+<span class="tab"><a href="#legal">Juridische</a></span>
+<span class="tab"><a href="#changelog">Geschiedenis</a></span>
+</div>
+
+<div id="volunteer">
+<h2>Verdere Assistentie</h2>
+<p>Als je wilt helpen om de documentatie te verbeteren of vertalen, of wilt helpen
 met andere aspecten van het project, zie dan de documentatie voor 
 <a href="http://i2p-projekt.i2p/nl/get-involved">vrijwilligers.</a>
-</p>Verdere ondersteuning is hier beschikbaar:
+</p><p>Verdere ondersteuning is hier beschikbaar:</p>
 <ul class="links">
 <li class="tidylist"><a href="http://i2p-projekt.i2p/nl/faq">FAQ op i2p-projekt.i2p</a></li>
-</ul>
-<br>Je kunt ook het <a href="http://forum.i2p/">I2P forum</a>
-of IRC proberen.
+<li class="tidylist">Je kunt ook het <a href="http://forum.i2p/">I2P forum</a> of IRC proberen.</li>
+</ul><br>
+</div>
 
+<div id="sidebarhelp">
 <h2>Informatie over de Summary Bar</h2><p>
 Veel van de statistieken op de summary bar kunnen
 <a href="configstats.jsp">geconfigureerd</a> worden om te worden
@@ -79,16 +93,17 @@ gedeelde bandbreedte en lokaal gegenereerd verkeer.
 Voor I2P is het niet nodig dat een router alle andere routers kent.
 </li></ul>
 
-<h3>Bandbreedte in/out</h3><div align="justify">
-Dit zou zichzelf moeten verklaren. Alle waarden zijn in bytes per seconde, niet in bits per seconde.
+<h3>Bandbreedte in/out</h3>
+<p>Dit zou zichzelf moeten verklaren. Alle waarden zijn in bytes per seconde, niet in bits per seconde.
 Wijzig je bandbreedte limieten op de <a href="confignet#help">configuratie pagina</a>.
-Bandbreedte wordt standaard <a href="graphs.jsp">geplot</a>.</div>
+Bandbreedte wordt standaard <a href="graphs.jsp">geplot</a>.</p>
 
-<h3>Tunnels</h3><div align="justify">
-De tunnels zelf worden getoond op de <a href="tunnels.jsp">tunnels pagina</a>.</div><ul>
-<li class="tidylist"><div align="justify"><b>Onderzoekend:</b>
+<h3>Tunnels</h3>
+<p>De tunnels zelf worden getoond op de <a href="tunnels.jsp">tunnels pagina</a>.</p>
+<ul>
+<li class="tidylist"><b>Onderzoekend:</b>
 Tunnels gebouwd door je router en gebruikt om te communiceren met de floodfill peers,
-voor het bouwen van nieuwe tunnels en testen van bestaande tunnels.</div></li>
+voor het bouwen van nieuwe tunnels en testen van bestaande tunnels.</li>
 <li class="tidylist"><b>Client:</b>
 Tunnels gebouwd door je router voor het gebruik door elke client.</li>
 <li class="tidylist"><b>Deelnemend:</b>
@@ -102,10 +117,12 @@ de <a href="configadvanced.jsp">geavanceerde configuratie pagina</a>. <a href="c
 <li class="tidylist"><b>Share rato:</b>
 Het aantal deelnemende tunnels dat je voor andere routeert, gedeeld door het totale aantal hops in al je onderzoekende en client tunnels.
 Een aantal groter dan 1.00 betekent dat je meer tunnels aan het netwerk bijdraagt dan je gebruikt.
-</li></ul>
+</li>
+</ul>
 
-<h3>Verstopping</h3><div align="justify">
-Een aantal basis indicatoren voor een router overbelasting:</div><ul>
+<h3>Verstopping</h3>
+<p>Een aantal basis indicatoren voor een router overbelasting:</p>
+<ul>
 <li class="tidylist"><b>Taak vertraging:</b>
 Hoe lang taken moeten wachten voordat ze uitgevoerd worden. De taak wachtrij wordt getoond op de <a href="jobs.jsp">taken pagina</a>.
 Helaas zijn er ook verschillende andere taak wachtrijen in de router die verstopt kunnen raken,
@@ -141,19 +158,26 @@ Je router kan alle aanvragen accepteren, een percentage accepteren of weigeren,
 of alle aanvragen weigeren om verschillende redenen, om de bandbreedte en CPU
 gebruik te beheren en capaciteit te houden voor lokale clients.</li></ul>
 
-<h3>Lokale bestemmingen</h3><div align="justify">
-De lokale applicaties die door je router verbinden.
+<h3>Lokale bestemmingen</h3>
+<p>De lokale applicaties die door je router verbinden. 
 Dit kunnen clients zijn die gestart zijn door <a href="i2ptunnel/index.jsp">I2PTunnel</a>
-of externe programma's die verbinden via SAM, BOB of direct met I2CP.
+of externe programma's die verbinden via SAM, BOB of direct met I2CP.</p>
 </div>
 
-<h2>Juridische zaken</h2><p>De I2P router (router.jar) en SDK (i2p.jar) zijn bijna geheel in het publieke domein, met een aantal noemenswaardige uitzonderingen:</p><ul>
+<div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
+<div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
+<div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
+<div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
+
+<div id="legal">
+<h2>Juridische zaken</h2>
+<p>De I2P router (router.jar) en SDK (i2p.jar) zijn bijna geheel in het publieke domein, met een aantal noemenswaardige uitzonderingen:</p>
+<ul>
 <li class="tidylist">ElGamal en DSA code, valt onder de BSD licentie, geschreven door TheCrypto</li>
 <li class="tidylist">SHA256 en HMAC-SHA256, valt onder de MIT licentie, geschreven door the Legion of the Bouncycastle</li>
 <li class="tidylist">AES code, valt onder de MIT licentie, geschreven door het Cryptix team</li>
 <li class="tidylist">SNTP code, valt onder de BSD licentie, geschreven door Adam Buckley</li>
-<li class="tidylist">De rest is helemaal public domain, geschreven door jrandom, mihi, hypercubus, oOo,
-    ugha, duck, shendaras, en anderen.</li>
+<li class="tidylist">De rest is helemaal public domain, geschreven door jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, en anderen.</li>
 </ul>
 
 <p>Bovenop de I2P router zijn een aantal client applicaties gemaakt, elk met
@@ -187,10 +211,12 @@ architecturen.  Opstarters voor windows gebruikers zijn gemaakt met <a
 href="http://launch4j.sourceforge.net/">Launch4J</a>, en de installer is
 gemaakt met <a href="http://www.izforge.com/izpack/">IzPack</a>.  Voor details
 over andere beschikbare applicaties, en hun licenties, zie het <a
-href="http://i2p-projekt.i2p/nl/get-involved/develop/licenses">licentie beleid</a>.  Broncode voor I2P en
+href="http://i2p-projekt.i2p/nl/get-involved/develop/licenses">licentie beleid</a>. Broncode voor I2P en
 de meeste gebundelde client applicaties kan gevonden worden op onze <a
 href="http://i2p-projekt.i2p/nl/download">download pagina</a>.</p>
+</div>
 
+<div id="changelog">
 <h2>Release geschiedenis</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
@@ -199,6 +225,6 @@ href="http://i2p-projekt.i2p/nl/download">download pagina</a>.</p>
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
 
- <p>Een completere lijst met wijzigingen is te vinden
- in het history.txt bestand in je i2p directory.
- </p><hr></div></body></html>
+ <p id="fullhistory"><a href="/history.txt" target="_blank">Completere lijst met wijzigingen</a></p>
+</div>
+</div></body></html>
diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp
index 37405d53eb7f2ae9ce2dde4e3a1543c99f098d6c..8159ed17dd66c19f56382a6684d81cbabc7dcd99 100644
--- a/apps/routerconsole/jsp/help_ru.jsp
+++ b/apps/routerconsole/jsp/help_ru.jsp
@@ -18,13 +18,29 @@
 
 <div class="main" id="help">
 
+<div class="confignav">
+<span class="tab"><a href="#sidebarhelp">Боковая панель</a></span>
+<span class="tab"><a href="#configurationhelp">Конфигурация</a></span>
+<span class="tab"><a href="#reachabilityhelp">Достижимость</a></span>
+<span class="tab"><a href="#advancedsettings">Расширенная конфигурация</a></span>
+<span class="tab"><a href="#faq">Вопросы-Ответы</a></span>
+<span class="tab"><a href="#legal">Юридический</a></span>
+<span class="tab"><a href="#changelog">История компании</a></span>
+</div>
+
+<div id="volunteer">
+<h2>дальнейшая помощь</h2>
+
 <p> Если Вы хотите помочь в улучшении или переводе документации, если у Вас есть идеи, как еще помочь проекту, пожалуйста, загляните в раздел документации 
 <a href="http://i2p-projekt.i2p/ru/get-involved">как стать участником</a>. </p>
 
-<p>Дальнейшие инструкции доступны в <a href="http://i2p-projekt.i2p/ru/faq">FAQ на i2p-projekt.i2p</a>
+<p>Дальнейшие инструкции доступны в <a href="http://i2p-projekt.i2p/ru/faq">FAQ на i2p-projekt.i2p</a></p>
 
-<br>Также, имеет смысл зайти на <a href="http://forum.i2p/">форум I2P</a> и IRC-каналы проекта.</p>
+<p>Также, имеет смысл зайти на <a href="http://forum.i2p/">форум I2P</a> и IRC-каналы проекта.</p>
+
+</div>
 
+<div id="sidebarhelp">
 <h2>Описание статусной панели</h2>
 
 <p>
@@ -78,25 +94,21 @@
 
 <h3>Трафик (входящий/исходящий)</h3>
 
-<div align="justify">
-Все значения показаны в байтах/секунду. Настроить ограничения трафика можно на странице <a href="config.jsp">сетевых настроек</a>.
-Для трафика по умолчанию включено <a href="graphs.jsp">построение графиков</a>.</div>
+<p>Все значения показаны в байтах/секунду. Настроить ограничения трафика можно на странице <a href="config.jsp">сетевых настроек</a>.
+Для трафика по умолчанию включено <a href="graphs.jsp">построение графиков</a>.</p>
 
 <h3>Локальные туннели</h3>
 
-<div align="justify">
-Локальные приложения, выходящие в I2P сеть через Ваш маршрутизатор. Это могут быть клиенты, запущенные через <a href="i2ptunnel/index.jsp">менеджер туннелей</a>, внешние программы, подключающиеся через интерфейсы SAM, BOB или напрямую через I2CP.    
-</div>
+<p>Локальные приложения, выходящие в I2P сеть через Ваш маршрутизатор. Это могут быть клиенты, запущенные через <a href="i2ptunnel/index.jsp">менеджер туннелей</a>, внешние программы, подключающиеся через интерфейсы SAM, BOB или напрямую через I2CP.</p>
 
 <h3>Туннели (входящие/исходящие)</h3>
 
-<div align="justify">
-Список туннелей можно посмотреть на странице <a href="tunnels.jsp">обзор туннелей</a>.</div>
+<p>Список туннелей можно посмотреть на странице <a href="tunnels.jsp">обзор туннелей</a>.</p>
 
 <ul>
 
-<li class="tidylist"><div align="justify"><b>Зондирующие:</b>
-Туннели, созданные Вашим маршрутизатором для связи с floodfill-пирами, тестирования уже существующих туннелей и построения новых.</div> 
+<li class="tidylist"><b>Зондирующие:</b>
+Туннели, созданные Вашим маршрутизатором для связи с floodfill-пирами, тестирования уже существующих туннелей и построения новых.
 </li>
 <li class="tidylist"><b>Клиентские:</b>
 Туннели, созданные Вашим маршрутизатором для каждого локального клиента.
@@ -115,7 +127,7 @@
 
 <h3>Занятость</h3>
 
-<div align="justify">Некоторые базовые индикаторы перегруженности маршрутизатора:</div>
+<p>Некоторые базовые индикаторы перегруженности маршрутизатора:</p>
 <ul>
 
 <li class="tidylist"><b>Задержка заданий:</b>
@@ -145,7 +157,14 @@
 Состояние Вашего маршрутизатора по приему или отклонению запросов от других маршрутизаторов о построении туннелей. Ваш маршрутизатор может принимать все запросы, принимать/отклонять часть запросов или отклонять все запросы, в зависимости от сетевой загрузки, нагрузки на процессор и необходимости резервировать полосу пропускания для локальных клиентов. 
 </li>
 </ul>
+</div>
+
+<div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
+<div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
+<div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
+<div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 
+<div id="legal">
 <h2>Лицензии</h2>
 
 <p>Код I2P-маршрутизатора (router.jar) и его SDK (i2p.jar) находятся в общественном достоянии с некоторыми исключениями:</p>
@@ -164,8 +183,9 @@
 <p>Ещё одно приложение на этой странице — <a href="http://i2p-projekt.i2p/ru/docs/api/i2ptunnel">I2PTunnel</a> (а тут <a href="i2ptunnel/" target="_blank">его вебинтерфейс</a>).  Автор mihi, лицензия GPL. I2PTunnel занимается туннелированнием обычного TCP/IP трафика через I2P (может применяться для eepproxy и irc-прокси). <a href="http://susi.i2p/">susimail</a> — почтовый клиент с <a href="susimail/susimail">вебинтерфейсом</a>, автор susi23, лицензия  GPL. Адресная книга помогает управлять содержимым Ваших hosts.txt файлов (подробнее см. ./addressbook/), автор <a href="http://ragnarok.i2p/">Ragnarok</a>.</p> 
 
 <p>В поставку маршрутизатора включен <a href="http://i2p-projekt.i2p/ru/docs/api/sam">SAM</a> интерфейс, автор human, приложение в общественном достоянии. SAM предназначен для использования приложениями-клиентами, такими как <a href="http://duck.i2p/i2p-bt/">bittorrent-клиенты</a>. Маршрутизатором используется оптимизированная под разные PC-архитектуры библиотека для вычислений с большими числами – jbigi, которая в свою очередь использует библиотеку <a href="http://swox.com/gmp/">GMP</a> (LGPL лицензия). Вспомогательные приложения для Windows созданы с использованием <a href="http://launch4j.sourceforge.net/">Launch4J</a>, а инсталлятор собран при помощи <a href="http://www.izforge.com/izpack/">IzPack</a>. Подробнее о других доступных приложениях и их лицензиях смотрите на странице <a href="http://i2p-projekt.i2p/ru/get-involved/develop/licenses">I2P Software Licenses</a>. Исходный код I2P маршрутизатора и идущих в комплекте приложений можно найти на нашей <a href="http://i2p-projekt.i2p/ru/download">странице загрузки</a>. </p> 
+</div>
 
-
+<div id="changelog">
 <h2>История версий</h2>
 
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
@@ -175,5 +195,7 @@
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
 
- <p>Более подробный список изменений можно найти в файле history.txt, который находится в директории установки I2P.
- </p><hr></div></body></html>
+ <p id="fullhistory"><a href="/history" target="_blank">Просмотр полной версии</a>
+ </p>
+ </div>
+ </div></body></html>
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index 00e14bda1ed6de36fc719e9d8115b275ce3eba6d..e26be175e25ff7537e2120aa86c611fe886860f9 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -85,7 +85,7 @@
 <%=intl._t("Those URLs refer to published hosts.txt files.")%>
 <%=intl._t("The default subscription is the hosts.txt from {0}, which is updated infrequently.", "i2p-projekt.i2p")%>
 <%=intl._t("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%>
-<a href="http://i2p-projekt.i2p/faq.html#subscriptions" target="_top"><%=intl._t("See the FAQ for a list of subscription URLs.")%></a>
+<a href="/help#addressbooksubs" target="_top"><%=intl._t("See the FAQ for a list of subscription URLs.")%></a>
 </p>
 </div>
 <div id="footer">