diff --git a/src/index.html b/src/index.html
index ae9e7d4c..c5e2b2c0 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,15 +23,15 @@
   <strong class="large">{{ sage }}</strong> is a free <a href=
   "https://github.com/sagemath/sage/">open-source</a>
   mathematics software system licensed under the GPL.
-It builds on top of many existing 
+It builds on top of many existing
 open-source packages:
-<a href="https://numpy.org/">NumPy</a>, 
-<a href="https://scipy.org/">SciPy</a>, 
+<a href="https://numpy.org/">NumPy</a>,
+<a href="https://scipy.org/">SciPy</a>,
 <a href="https://matplotlib.org/">matplotlib</a>,
-<a href="https://www.sympy.org/">Sympy</a>, 
-<a href="http://maxima.sourceforge.net/">Maxima</a>, 
-<a href="https://www.gap-system.org/">GAP</a>, 
-<a href="http://www.flintlib.org/">FLINT</a>, 
+<a href="https://www.sympy.org/">Sympy</a>,
+<a href="http://maxima.sourceforge.net/">Maxima</a>,
+<a href="https://www.gap-system.org/">GAP</a>,
+<a href="http://www.flintlib.org/">FLINT</a>,
 <a href="http://www.r-project.org/">R</a>
 <a href="https://doc.sagemath.org/html/en/reference/spkg">and many more</a>.
 Access their combined power through a common, Python-based language
@@ -53,7 +53,7 @@
   <div class="narrow txt announce center">
       {{ sage }} is searching for students for this summer's <b>Google Summer of Code</b>!<br/>
       We have many exciting project ideas for students to work over the summer
-      and to get mentored by experts in the field: 
+      and to get mentored by experts in the field:
       <a href="https://summerofcode.withgoogle.com/organizations/5443521142063104/">{{ sage }} Organization</a>
       (<a href="https://wiki.sagemath.org/GSoC/2016">ideas list</a>)
   </div>
@@ -121,15 +121,14 @@
   </colgroup>
 
   <tbody>
-   <tr>
+    <tr>
     <td class="right">
       <h2>
-        <a href="https://cocalc.com/features/sage?utm_source=sagemath.org&amp;utm_medium=landingpage">Sage on CoCalc</a>
-      </h2>
-     <div class="small">
-       or:
        <a href="https://sagecell.sagemath.org/">{{ sage }}Cell</a><br/>
-     </div>
+      </h2>
+      <div class="small">
+        <a href="https://cocalc.com/features/sage?utm_source=sagemath.org&amp;utm_medium=landingpage">Sage on CoCalc</a>
+      </div>
     </td>
 
     <td><a class="index-menu round raised"
@@ -140,35 +139,33 @@ <h2>
        id="index-download" href="https://doc.sagemath.org/html/en/installation/index.html"></a></td>
 
     <td class="left">
-        <h2><a href="https://doc.sagemath.org/html/en/installation/index.html">Install {{version}}</a></h2>
+        <h2><a href="https://doc.sagemath.org/html/en/installation/index.html">Install {{ version }}</a>
+        &middot; <a href="https://github.com/sagemath/sage/wiki/Sage-{{ version }}-Release-Tour">Release Tour</a></h2>
 
      <div class="small">
        <span class="nowrap"><a href="https://github.com/sagemath/sage/releases">Releases</a>
          &middot; </span>
-         <span class="nowrap"><a href=""https://github.com/sagemath/sage/wiki/Release-Tours>Release Tours</a>
+         <span class="nowrap"><a href="https://github.com/sagemath/sage/wiki/Release-Tours">Release Tours</a>
        &middot; </span>
-	 <span class="nowrap"><a href=""https://github.com/sagemath/sage/wiki/Sage-{{version}}-Release-Tour>Release Tour for {{version}}</a>
+
+         <span class="nowrap"><a href="changelogs/index.html">Changelogs</a>
        &middot; </span>
-         {#<span class="nowrap"><a href="changelogs/index.html">Changelogs</a>
-       &middot; </span>#}
-         {#<span class="nowrap"><a href="download-source.html">Source tarball {{ version_src }}</a>
-       &middot; </span>#}
-         <span class="nowrap"><a href="https://github.com/sagemath/sage/">Clone from GitHub</a></span>
+         <span class="nowrap"><a href="download-source.html">Source tarball</a></span>
      </div>
     </td>
    </tr>
 
    <tr>
     <td class="right">
-     <h2><a href="./help.html">Help</a>/<a href="{{ docroot }}">Documentation</a> </h2>
+     <h2><a href="./help.html">Help</a> &middot; <a href="{{ docroot }}">Documentation</a> </h2>
 
      <div class="small">
-      <span class="nowrap"><a href="./help-video.html"><strong>Video</strong></a> &middot; </span>
+      <span class="nowrap"><a href="./help-video.html">Video</a> &middot; </span>
       <span class="nowrap"><a href="https://sagemath.zulipchat.com/">Zulip Chat</a> &middot; </span>
-      <span class="nowrap"><a href="./help-groups.html">Forums</a>  &middot; </span> 
+      <span class="nowrap"><a href="./help-groups.html">Forums</a> &middot; </span>
       <a href="{{ docroot }}/html/en/tutorial/index.html">Tutorial</a>
       &middot; <a href="{{ docroot }}/html/en/faq/">FAQ</a>
-      &middot; <a href="https://ask.sagemath.org/"><strong>Questions?</strong></a>
+      &middot; <a href="https://ask.sagemath.org/">Questions?</a>
      </div>
     </td>
 
@@ -196,7 +193,7 @@ <h2><a href="./tour.html">Feature Tour</a></h2>
      <h2><a href="./library.html">Library</a></h2>
 
      <div class="small">
-      <a href="./library-stories.html">Testimonials</a>  
+      <a href="./library-stories.html">Testimonials</a>
        &middot;  <a href="./library-publications.html#books">Books</a>
        &middot;  <a href="./library-publications.html">Publications</a>
        &middot;  <a href="./library-press.html">Press Kit</a>