diff --git a/index.html b/index.html
index 1f178399..5439355f 100644
--- a/index.html
+++ b/index.html
@@ -111,6 +111,15 @@
           rich, see the <i>Documentation</i> section for details.</p>
 
           <h2>Getting GPXSee</h2>
+
+          <ul id="download">
+            <li><a href="https://sourceforge.net/projects/gpxsee/files/Windows/">Windows installer</a></li>
+            <li><a href="https://sourceforge.net/projects/gpxsee/files/Mac%20OS%20X/">Mac OS X bundle</a></li>
+            <li><a href="https://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&amp;package=gpxsee">
+                Linux repos/packages</a></li>
+            <li><a href="https://github.com/tumic0/GPXSee">Sources</a></li>
+          </ul>
+
           <p>Additionally to the source codes, GPXSee is available as a Windows
           installer and an OS X dmg from the project's Sourceforge page and in
           form of various Linux packages from the project's openSUSE Build Service
@@ -122,14 +131,6 @@
           <p>On OS X you can also use the MacPorts or Homebrew packaging systems
           to install GPXSee.</p>
 
-          <ul id="download">
-            <li><a href="https://github.com/tumic0/GPXSee">Sources</a></li>
-            <li><a href="https://sourceforge.net/projects/gpxsee/files/Windows/">Windows installer</a></li>
-            <li><a href="https://sourceforge.net/projects/gpxsee/files/Mac%20OS%20X/">Mac OS X bundle</a></li>
-            <li><a href="https://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&amp;package=gpxsee">
-                Linux repos/packages</a></li>
-          </ul>
-
           <p><i>The official Windows &amp; OS X installers are always signed using
           <a href="https://github.com/tumic0/GPXSee/tree/master/cert">certificates</a>
           available at the GitHub project page. As the certificates are non-commercial
@@ -141,6 +142,11 @@
           time.</i></p>
 
           <h2 id="maps">Online maps</h2>
+
+          <ul>
+            <li><a href="https://tumic0.github.io/GPXSee-maps/">GPXSee online maps</a></li>
+          </ul>
+
           <p>GPXSee supports most tile server based online maps out there, but the
           <a href="https://github.com/tumic0/GPXSee/tree/master/pkg/maps">list
           of map definitions</a> distributed with the official packages is limited
@@ -152,10 +158,6 @@
           on GitHub where you can find a lot of additional map definitions for various
           map services, usually run by some state geographic institution or a non-profit
           organization.</p>
-          
-          <ul>
-            <li><a href="https://tumic0.github.io/GPXSee-maps/">GPXSee online maps</a></li>
-          </ul>
 
           <h2 id="bugreports">Reporting bugs</h2>
           <p>If you have found a bug in GPXSee, please report it using the