diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
index a1930a00422..8b0e462628b 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch	
@@ -19,7 +19,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8886 -Dmongo.port=10200"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8886 -Dmongo.port=10200 -Xmx1500m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="target_bundles" value="javax.servlet.jsp@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.el@default:default,org.apache.commons.logging@default:default,org.apache.jasper@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.common@2:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default"/>
diff --git a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js
index b8961c8f56a..19750ad02ac 100644
--- a/python/src/sailing.web/sailing/web/browser/moderator-static/app.js
+++ b/python/src/sailing.web/sailing/web/browser/moderator-static/app.js
@@ -1,7 +1,6 @@
 
 var global_sortkey = 'current_rank';
 var global_direction = 'asc';
-var global_race = '1:3';
 var global_competitors = '1:20';
 
 var loader_image = "<img style='margin: 3px 0px 3px 3px' src='/static/images/ajax-loader-greybg.gif'/>";
diff --git a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt
index bff9b5a8ad0..d3ffcd85d4d 100644
--- a/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt
+++ b/python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt
@@ -13,7 +13,8 @@
       <div id='header'>
         <ul class='systeminfo'>
           <li id="eventline" class='message-0 active' style="font-size: 16px;">
-            Kiel Week 2011, ${event.boatclass}
+          Kiel Week 2011, ${event.boatclass}<br/>
+          <div id="Racenames" style="padding: 3px 0px 0px 0px;">${','.join(racebundles[int(request.params.get('r', 0))]).replace(event.boatclass, '').replace(' ', '').replace(',', ', ')}</div>
           </li>
           <li>
               <div class='function-btn-wrapper'>
@@ -267,6 +268,7 @@
 
   <script>
       global_colmode = 'LEADERBOARD-${request.params.get('c', 'F1')}';
+      global_race = '${(int(request.params.get('r', 0))*3)+1}:${((int(request.params.get('r', 3))*3)+1)+2}';
   </script>
 
   <script src='/moderator-static/jquery.js' type='text/javascript'></script>
diff --git a/python/src/sailing.web/sailing/web/browser/templates/map-overview.pt b/python/src/sailing.web/sailing/web/browser/templates/map-overview.pt
index e8bf6d7d4d3..fb65fb8fb01 100644
--- a/python/src/sailing.web/sailing/web/browser/templates/map-overview.pt
+++ b/python/src/sailing.web/sailing/web/browser/templates/map-overview.pt
@@ -5,14 +5,14 @@
 <form>
     <br/>
     Event: 
-    <select name="event">
+    <select name="mapevent">
         <tal:for repeat="event view.allEvents()">
         <option value="${event.name}">${event.name}</option>
         </tal:for>
     </select>
     &nbsp;
     Race: 
-    <select name="racename">
+    <select name="mapracename">
         <tal:for repeat="racename view.allRacesFor()">
         <option value="${racename}">${racename}</option>
         </tal:for>
@@ -28,8 +28,8 @@
         function loadMap() {
             displayLoader('#map-data');
             GET('saveEventRace', {template: 'map-overview-details', 
-                eventname: $('select[name=event] option:selected').val(), 
-                racename: $('select[name=racename] option:selected').val()}, 
+                eventname: $('select[name=mapevent] option:selected').val(), 
+                racename: $('select[name=mapracename] option:selected').val()}, 
             function(data) {
                 $('#map-data').html(data)
             });
diff --git a/python/src/sailing.web/sailing/web/browser/templates/wind-settings.pt b/python/src/sailing.web/sailing/web/browser/templates/wind-settings.pt
index 53e8898de08..651674a5bb1 100644
--- a/python/src/sailing.web/sailing/web/browser/templates/wind-settings.pt
+++ b/python/src/sailing.web/sailing/web/browser/templates/wind-settings.pt
@@ -5,14 +5,14 @@
 <form>
     <br/>
     Event: 
-    <select name="event">
+    <select name="windevent">
         <tal:for repeat="event view.allEvents()">
         <option value="${event.name}">${event.name}</option>
         </tal:for>
     </select>
     &nbsp;
     Race: 
-    <select name="racename">
+    <select name="windracename">
         <tal:for repeat="racename view.allRacesFor()">
         <option value="${racename}">${racename}</option>
         </tal:for>
@@ -28,8 +28,8 @@
         function loadWind() {
             displayLoader('#wind-data');
             GET('saveEventRace', {template: 'wind-settings-info', 
-                eventname: $('select[name=event] option:selected').val(), 
-                racename: $('select[name=racename] option:selected').val(),
+                eventname: $('select[name=windevent] option:selected').val(), 
+                racename: $('select[name=windracename] option:selected').val(),
                 ignore_exceptions: '1'}, 
             function(data) {
                 $('#wind-data').html(data)