diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 08806dcc..b220edd0 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -16,7 +16,7 @@
   </li>
   <li class="has-sub"><a href="#"><span>Support</span></a>
     <ul>
-      <li><a href="faq.html"><span>FAQ</span></a></li>
+      <li><a href="{{ site_url('support/faq') }}"><span>FAQ</span></a></li>
       <li><a href="http://forum.i2p2.de/"><span>Forums</span></a></li>
     </ul>
   </li>
diff --git a/www.i2p2/pages/faq.html b/i2p2www/pages/site/support/faq.html
similarity index 99%
rename from www.i2p2/pages/faq.html
rename to i2p2www/pages/site/support/faq.html
index f0b3f451..882cd86a 100644
--- a/www.i2p2/pages/faq.html
+++ b/i2p2www/pages/site/support/faq.html
@@ -1,7 +1,6 @@
-{% extends "_layout.html" %}
-{% block title %}FAQ{% endblock %}
+{% extends "global/layout.html" %}
+{% block title %}Frequently Asked Questions{% endblock %}
 {% block content %}
-<h1>I2P - FREQUENTLY ASKED QUESTIONS</h1>
 <h3 id="index"> Index </h3>
 <ol>
 <li style="list-style: none; display: inline">
@@ -276,7 +275,7 @@ The best way to stay "better-connected" to the network is to <a href="http://loc
 <span class="permalink">(<a href="#proxy_safe">link</a>)</span></h3>
 <p>
    This is a question that only you can answer because the correct answer depends on your behaviours, your
-   <a href="how_threatmodel.html">threat model</a>, and how much you trust the outproxy operator.
+   <a href="{{ site_url('docs/how/threatmodel') }}">threat model</a>, and how much you trust the outproxy operator.
 </p><p>
    Like Tor, I2P does not magically encrypt the Internet.
    You are vulnerable to snooping by the outproxy operators.