diff --git a/www.i2p2/i2p2www/pages/global/layout.html b/www.i2p2/i2p2www/pages/global/layout.html
index 82cd27a9..5a8b5dca 100644
--- a/www.i2p2/i2p2www/pages/global/layout.html
+++ b/www.i2p2/i2p2www/pages/global/layout.html
@@ -10,7 +10,7 @@
   <body>
     <div class="hide"><a href="#content" title="Skip navigation" accesskey="2">Skip navigation</a></div>
     <div id="branding">
-      <h1 id="logo"><a href="/"><img src="{{ url_for('static', filename='images/logo_medium.png') }}" alt="I2P" /></a></h1>
+      <h1 id="logo"><a href="{{ url_for('site_show', lang=g.lang) }}"><img src="{{ url_for('static', filename='images/logo_medium.png') }}" alt="I2P" /></a></h1>
       <div class="title">{{ self.title() }}</div>
     </div>
     <div class="navigation">
diff --git a/www.i2p2/i2p2www/pages/global/nav.html b/www.i2p2/i2p2www/pages/global/nav.html
index d51055d6..7a839d29 100644
--- a/www.i2p2/i2p2www/pages/global/nav.html
+++ b/www.i2p2/i2p2www/pages/global/nav.html
@@ -1,6 +1,6 @@
 <ul class="sections nav">
-  <li><a href="index.html">Home</a></li>
-  <li><a href="download.html">Download</a></li>
+  <li><a href="{{ url_for('site_show', lang=g.lang) }}">Home</a></li>
+  <li><a href="{{ url_for('downloads_list', lang=g.lang) }}">Download</a></li>
   <li><a href="#">Docs</a>
     <ul>
       <li><a href="how.html">&nbsp;How does it work?</a></li>
@@ -18,10 +18,10 @@
     </ul>
   </li>
   <li><a href='#'>Volunteer</a></li>
-  <li><a href="news.html">News</a>
+  <li><a href="#">News</a>
     <ul class="leftbutton">
-      <li><a href="announcements.html">&nbsp;Announcements</a></li>
-      <li><a href="meetings.html">&nbsp;Meetings</a></li>
+      <li><a href="{{ url_for('blog_index', lang=g.lang) }}">&nbsp;Announcements</a></li>
+      <li><a href="{{ url_for('meetings_index', lang=g.lang) }}">&nbsp;Meetings</a></li>
       <li><a href="roadmap.html">&nbsp;Roadmap</a></li>
       <li><a href="todo.html">&nbsp;Task list</a></li>
     </ul>
diff --git a/www.i2p2/i2p2www/pages/site/index.html b/www.i2p2/i2p2www/pages/site/index.html
index c7647ddd..d1204bcc 100644
--- a/www.i2p2/i2p2www/pages/site/index.html
+++ b/www.i2p2/i2p2www/pages/site/index.html
@@ -4,7 +4,7 @@
 <div class="main">
   <h1>What does I2P do for you?</h1>
   <p>The I2P network provides strong privacy protections for communication over the Internet. Many activities that would risk your privacy on the public Internet can be conducted anonymously on I2P.</p>
-  <a class="get-i2p" href="download.html">Get I2P 0.9.1</a>
+  <a class="get-i2p" href="{{ url_for('downloads_list', lang=g.lang) }}">Get I2P 0.9.1</a>
 </div>
 <div class="aside-wrap">
   <div class="aside">
