diff --git a/www.i2p2/i2p2www/pages/global/layout.html b/www.i2p2/i2p2www/pages/global/layout.html
index 82cd27a923a206c5884b644933967a7fc26dfdd0..5a8b5dca50668c80b1d267168db991091855add2 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 d51055d6ca9a4b39ffce12dc64ea931f8cbc681c..7a839d29186cffa8163d0551cdb2bb8273838d86 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"> 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"> Announcements</a></li>
- <li><a href="meetings.html"> Meetings</a></li>
+ <li><a href="{{ url_for('blog_index', lang=g.lang) }}"> Announcements</a></li>
+ <li><a href="{{ url_for('meetings_index', lang=g.lang) }}"> Meetings</a></li>
<li><a href="roadmap.html"> Roadmap</a></li>
<li><a href="todo.html"> Task list</a></li>
</ul>
diff --git a/www.i2p2/i2p2www/pages/site/index.html b/www.i2p2/i2p2www/pages/site/index.html
index c7647dddf90d11c16bb09c5dd9ec6869b159ef80..d1204bcc32b1f3aaea15e71d98caa400844e5047 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">