2 files changed, 33 insertions, 9 deletions

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 04685c64..527b0abd 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,6 +1,31 @@
 <footer>
-  <div class="container">
-  <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016, 2017</p>
-  <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
+  <div class="container-fluid cushion-below">
+    <div class="container">
+      <div class="row">
+        <div class="col-xs-12 col-sm-4">
+          <ul class="footer-list">
+            <li><p><a href="about.html">About</a></p></li>
+            <li><p><a href="investors.html">For Investors</a></p></li>
+          </ul>
+        </div>
+        <div class="col-xs-12 col-sm-4">
+          <ul class="footer-list">
+            <li><p><a href="governments.html">Governments</a></p></li>
+            <li><p><a href="merchants.html">Merchants</a></p></li>
+            <li><p><a href="citizens.html">Citizens</a></p></li>
+          </ul>
+        </div>
+        <div class="col-xs-12 col-sm-4">
+          <ul class="footer-list">
+            <li><p><a href="developers.html">Developer Resources</a></p></li>
+            <li><p><a href="faq.html">FAQ</a></p></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="container text-center">
+    <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016, 2017</p>
+    <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
   </div>
 </footer>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index c9019167..762eab69 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,19 +1,18 @@
 <nav class="navbar navbar-inverse">
   <div class="container-fluid">
     <ul class="nav navbar-nav">
-      <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">taler</a></li>
-      <li class="{{ 'active' if filename == 'investors.html' else '' }}"><a href="investors.html">Investors</a></li>
+      <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li>
+      <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">Citizens</a></li>
+      <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">Merchants</a></li>
+      <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">Governments</a></li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Resources <span class="caret"></span></a>
         <ul class="dropdown-menu">
           <li><a href="architecture.html">System Architecture</a></li>
           <li><a href="faq.html">FAQ</a></li>
-          <li><a href="governments.html">Taler for Governments</a></li>
-          <li><a href="developers.html">Taler for Developers</a></li>
-          <li><a href="merchants.html">Taler for Merchants</a></li>
+          <li><a href="developers.html">Developer Introduction</a></li>
         </ul>
       </li>
-      <li class="{{ 'active' if filename == 'about.html' else '' }}"><a href="about.html">Team</a></li>
     </ul>
     <ul class="nav navbar-right navbar-form">
       <li>