diff --git a/website/index.html b/website/index.html
index 109e9bd30..1a2f30ed2 100644
--- a/website/index.html
+++ b/website/index.html
@@ -24,15 +24,26 @@
     <div id="menu">
         <p>C++ evolutionary computation components framework</p>
         <script type="text/javascript" src="http://www.ohloh.net/p/16924/widgets/project_thin_badge.js"></script>
-        <ul class="shortcuts">
+
+        <div class="shortcuts">
+        <p>Shortcuts:</p>
+        <ul>
             <li><a href="http://sourceforge.net/project/showfiles.php?group_id=9775">Download</a></li>
             <li><a href="http://eodev.sourceforge.net/eo/tutorial/html/eoTutorial.html">Tutorial</a></li>
             <li><a href="http://eodev.sourceforge.net/eo/doc/html/index.html">API documentation</a></li>
             <li><a href="http://sourceforge.net/project/?group_id=9775">Project page</a></li>
             <li>see also <a href="http://paradiseo.gforge.inria.fr/">ParadisEO</a></li>
         </ul>
-        <ul class="badges">
 
+        <p>Jump to section:</p>
+        <ul>
+            <li><a href="#Features">Features</a></li>
+            <li><a href="#Code">Code</a></li>
+            <li><a href="#Development">Development</a></li>
+        </ul>
+    </div><!-- class=shortcuts -->
+
+        <ul class="badges">
 <li>
 <!-- ++Begin Dynamic Feed Wizard Generated Code++ -->
   <!--
@@ -94,7 +105,8 @@
 <div id="main">
 
 
-    <h1>Evolving Objects (EO): an Evolutionary Computation Framework</h1>
+<h1><a name="Plan"></a>Evolving Objects (EO): an Evolutionary Computation Framework</h1>
+
     <p>EO is <em>a template-based, ANSI-C++ evolutionary computation library</em> which helps you to write your own stochastic optimization algorithms insanely fast.</p>
 
     <div style="font-size:1.5em;color:red;border:thin solid red; background-color:#fee;margin:1em;padding:2em;text-align:center;">We have lost all the mailing-list subscriptions in a crash, please subscribe again on the <a href="https://lists.sourceforge.net/lists/listinfo/eodev-main">eodev-main subscription page</a>.</div>
@@ -113,14 +125,8 @@
     </p>
 
     <p>With the help of EO, you can easily design evolutionary algorithms that will find solutions to virtually all kind of hard optimization problems, from continuous to combinatorial ones.</p>
-
-    <p><a name="Plan"></a>Jump to section:</p>
-    <ul>
-        <li><a href="#Features">Features</a></li>
-        <li><a href="#Code">Code</a></li>
-        <li><a href="#Development">Development</a></li>
-    </ul>
-
+    
+    
 <h1><a name="Features"></a>Features <a href="#Plan">⤒</a></h1>
 
     <h2>Component-based framework</h2>
diff --git a/website/lightblue.css b/website/lightblue.css
index 67442f4c6..94736d474 100644
--- a/website/lightblue.css
+++ b/website/lightblue.css
@@ -35,17 +35,27 @@ body {
     margin-right:5%;
 }
 
-ul.shortcuts {
+.shortcuts {
     text-align:left;
 }
 
+.shortcuts p {
+    margin-top:2em;
+    margin-bottom:0em;
+}
+
+.shortcuts ul {
+    margin-top:0em;
+}
+
 ul.badges {
     list-style-type:none;
+    margin-top:2em;
 }
 
 ul.badges li {
     margin-left:0px;
-    margin-top:0.1em;
+    margin-top:0.5em;
 }
 
 #menu {