--- a/templates/sat_website/base.html	Mon Jan 19 21:22:40 2015 +0100
+++ b/templates/sat_website/base.html	Wed Jan 21 20:07:20 2015 +0100
@@ -28,7 +28,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet">
+    <link rel="stylesheet" href="{% static "bootstrap/css/bootstrap.min.css" %}">
     <link rel="stylesheet" href="{% static "css/sat_website.css" %}">
     <link rel="icon" type="image/png" href="{% static "images/sat_logo_32.png" %}">
     <title>{% block title %}{% trans "Salut à Toi: the multi-frontends, multi-purposes communication tool" %}{% endblock %}</title>
@@ -49,17 +49,8 @@
                 </a>
             </div>
             <div id="navbar" class="collapse navbar-collapse">
-                <ul class="nav navbar-nav">
-                    {% for cat_url,cat_name in categories.items %}
-                        <li><a href="{{ cat_url }}.html">{{ cat_name }}</a></li>
-                    {% endfor %}
-                </ul>
-                <ul class="nav navbar-nav pull-right">
-                    <li><a href="https://www.libervia.org"><strong>{% trans "Try online demo" %}</strong></a> </li>
-                    {% if latest_dl_path and latest_version %}
-                        <li><a href="{{ latest_dl_path }}"><strong>{% trans "Download SàT" %} {{ latest_version }}</strong></a> </li>
-                    {% endif %}
-                </ul>
+                {% include "sat_website/menu.html" with style="nav navbar-nav" categories=categories %}
+                {% include "sat_website/menu.html" with style="nav navbar-nav pull-right" categories=categories_right %}
             </div>
         </div>
     </nav>