diff --git a/html/get-frama-c.html b/html/get-frama-c.html
index b387b809c9d4db4c69ae6bcf2cdbfc9819bce06f..38d415690c3bb82415b67303ad43942f4c225de5 100644
--- a/html/get-frama-c.html
+++ b/html/get-frama-c.html
@@ -78,11 +78,11 @@ opam depext --install -y frama-c</pre>
             For detailed installation instructions, <a target="_blank" href="https://git.frama-c.com/pub/frama-c/blob/master/INSTALL.md">click here</a>
             <br>Previous Frama-C versions are available <a href="/html/framac-versions.html">from this page</a>
           </div>
-          {% for version in site.fc-versions %}{% if version.beta %}
+          {% if site.fc-versions.last.beta %}
           <div class="otherVersion">
-            The bêta version of the next Frama-C release is available <a href="{{ version.url }}">here</a>
+            The bêta version of the next Frama-C release is available <a href="{{ site.fc-versions.last.url }}">here</a>
           </div>
-          {% endif %}{% endfor %}
+          {% endif %}
           <h1 class="pageTitle">Manuals</h1>
           <div class="tileWrapper" size="big">
             <div class="tile">
diff --git a/index.html b/index.html
index bbbcc9e1b72dde20885bd04ce65c81e0d92edf4c..f4fb6d1c347fa65d26fdb2eee13e1a0754c69289 100755
--- a/index.html
+++ b/index.html
@@ -220,8 +220,20 @@ title: Frama-C
             <div class="head">
               <h3 tabindex="0">Get Frama-C</h3>
 
+              {% for version in site.fc-versions reversed %}
+                {% unless version.beta %}
+                   {% assign latest = version %}
+                   {% break %}
+                {% endunless %}
+              {% endfor %}
+              {% if site.fc-versions.last.beta %}
+                {% assign beta = site.fc-versions.last %}
+              {% endif %}
+
               <nav>
-                <span class="currentVersion">Latest Version</span><a role="button" href="/html/get-frama-c.html">{{ site.fc-versions.last.name }}</a><a href="/html/framac-versions.html" class="previousVersion">Previous Versions</a>
+                <span class="currentVersion">Latest Version</span><a role="button" href="/html/get-frama-c.html">{{ latest.name }}</a>
+                {% if beta %}<br><span class="currentVersion">Next Version</span><a role="button" href="{{ beta.url }}">{{ beta.name }}-&beta;</a>{% endif %}
+                <br><a href="/html/framac-versions.html" class="previousVersion">All Versions</a>
               </nav>
             </div>