diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index dcb0324b..3b12e6fa 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -1,7 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Frequently Asked Questions') }}{% endblock %}
-{% block content %}
-<h3 id="index">{{ _('Index') }}</h3>
+{% block content_nav %}
 <ol>
 <li style="list-style: none; display: inline">
 <h4>{{ _('General') }}</h4>
@@ -47,7 +46,9 @@
 <li><a href="#compat6x">{% trans %}I'm using FreeBSD and when I start I2P I receive an error about <code>libm.so.4</code>!{% endtrans %}</a></li>
 <li><a href="#protocolfamily">{% trans %}In <code>wrapper.log</code> I see an error stating <code>Protocol family unavailable</code> when I2P is loading{% endtrans %}</a></li>
 </ol>
+{% endblock %}
 
+{% block content %}
 <h3 id="systems">{% trans %}What systems will I2P run on?{% endtrans %}
 <span class="permalink">(<a href="#systems">{{ _('link') }}</a>)</span></h3>
 <p>{% trans chart='https://trac.i2p2.de/wiki/java' -%}
diff --git a/i2p2www/pages/site/get-involved/develop/applications.html b/i2p2www/pages/site/get-involved/develop/applications.html
index d23578d4..c1d977a7 100644
--- a/i2p2www/pages/site/get-involved/develop/applications.html
+++ b/i2p2www/pages/site/get-involved/develop/applications.html
@@ -2,17 +2,16 @@
 {% block title %}{{ _('Application Development') }}{% endblock %}
 {% block lastupdated %}{% trans %}May 2013{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.6{% endblock %}
-{% block content %}
-<h1>{{ _('Application Development Guide') }}</h1>
-
-<h2>{{ _('Contents') }}</h2>
+{% block content_nav %}
 <ul>
     <li><a href="#why">{{ _('Why write I2P-specific code?') }}</a></li>
     <li><a href="#concepts">{{ _('Important concepts') }}</a></li>
     <li><a href="#options">{{ _('Development options') }}</a></li>
     <li><a href="#start"><b>{{ _('Start developing - a simple guide') }}</b></a></li>
 </ul>
+{% endblock %}
 
+{% block content %}
 <h2 id="why">{{ _('Why write I2P-specific code?') }}</h2>
 
 <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html
index 910a350f..fdb8bc3b 100644
--- a/i2p2www/pages/site/get-involved/guides/new-developers.html
+++ b/i2p2www/pages/site/get-involved/guides/new-developers.html
@@ -1,17 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}New Developer's Guide{% endtrans %}{% endblock %}
-{% block content %}
-<p>{% trans %}
-So you want to start work on I2P? Great!
-Here's a quick guide to getting started
-on contributing to the website or the software, doing development or creating translations.
-{%- endtrans %}</p>
-<p>{% trans volunteer=site_url('get-involved') %}
-Not quite ready for coding?
-Try <a href="{{ volunteer }}">getting involved</a> first.
-{%- endtrans %}</p>
-
-<div id="TOC">
+{% block content_nav %}
   <ol>
     <li><a href="#basic-study">{% trans %}Basic study{% endtrans %}</a></li>
     <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a></li>
@@ -22,7 +11,18 @@ Try <a href="{{ volunteer }}">getting involved</a> first.
     <li><a href="#translations">{% trans %}Translations{% endtrans %}</a></li>
     <li><a href="#tools">{% trans %}Tools{% endtrans %}</a></li>
   </ol>
-</div>
+{% endblock %}
+
+{% block content %}
+<p>{% trans %}
+So you want to start work on I2P? Great!
+Here's a quick guide to getting started
+on contributing to the website or the software, doing development or creating translations.
+{%- endtrans %}</p>
+<p>{% trans volunteer=site_url('get-involved') %}
+Not quite ready for coding?
+Try <a href="{{ volunteer }}">getting involved</a> first.
+{%- endtrans %}</p>
 
 <h2 id="basic-study">{% trans %}Basic study{% endtrans %}</h2>