diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
old mode 100755
new mode 100644
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java
index bc49b940586..8296c674418 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java
@@ -57,15 +57,6 @@ public class Regatta extends Composite {
     @UiField SpanElement racesCount;
     @UiField SpanElement trackedRacesCount;
     @UiField DivElement isLiveDiv;
-//    @UiField TableElement isLiveDiv2;
-//    @UiField DivElement isFinishedDiv;
-//    @UiField DivElement isFinishedDiv2;
-//    @UiField DivElement isScheduledDiv;
-//    @UiField AnchorElement leaderboardLink;
-//    @UiField DivElement liveRaceInfosPerFleetPanel;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank1;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank2;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank3;
 
     @UiField Anchor regattaDetailsLink;
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java
index e8648ac8ee5..0fd6f0f92ba 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java
@@ -60,13 +60,13 @@ public class EventRegattaList extends Composite {
         leaderboardGroupFilterAnchors = new ArrayList<AnchorElement>();
         boolean hasMultipleLeaderboardGroups = presenter.getCtx().getLeaderboardGroups().size() > 1;
         
-        if(event.getType() == EventType.SERIES_EVENT) {
+        if (event.getType() == EventType.SERIES_EVENT) {
             regattaListNavigationDiv.getStyle().setDisplay(Display.NONE);
         } else {
-            if(hasMultipleLeaderboardGroups) {
+            if (hasMultipleLeaderboardGroups) {
                 // fill the navigation panel
                 registerFilterLeaderboardGroupEvent(filterNoLeaderboardGroupsAnchor, null);
-                for(LeaderboardGroupDTO leaderboardGroup: presenter.getCtx().getLeaderboardGroups()) {
+                for (LeaderboardGroupDTO leaderboardGroup: presenter.getCtx().getLeaderboardGroups()) {
                     AnchorElement filterLeaderboardGroupAnchor = Document.get().createAnchorElement();
                     filterLeaderboardGroupAnchor.addClassName(EventRegattaListResources.INSTANCE.css().item());
                     filterLeaderboardGroupAnchor.setHref("javascript:;");
@@ -126,8 +126,10 @@ public class EventRegattaList extends Composite {
             for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) {
                 boolean isVisible = leaderboardGroup.getName().equals(lg.getName());
                 List<Regatta> regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName());
-                for (Regatta regatta : regattaElements) {
-                    regatta.setVisible(isVisible);
+                if (regattaElements != null) {
+                    for (Regatta regatta : regattaElements) {
+                        regatta.setVisible(isVisible);
+                    }
                 }
             }
         } else {
@@ -135,8 +137,10 @@ public class EventRegattaList extends Composite {
             filterNoLeaderboardGroupsAnchor.addClassName(EventRegattaListResources.INSTANCE.css().selectedItem());
             for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) {
                 List<Regatta> regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName());
-                for (Regatta regatta : regattaElements) {
-                    regatta.setVisible(true);
+                if (regattaElements != null) {
+                    for (Regatta regatta : regattaElements) {
+                        regatta.setVisible(true);
+                    }
                 }
             }
         }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
index c8dfe53f38d..cae32ef4ee1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
@@ -697,6 +697,11 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                                 for (int i = 0; i < availableLeaderboardGroups.size(); i++) {
                                     LeaderboardGroupDTO group = availableLeaderboardGroups.get(i);
                                     if (oldGroupName.equals(group.getName())) {
+                                        // if the leaderboard is selected, de-select equality/hashCode may change) and select again when done
+                                        final boolean wasSelected = Util.equalsWithNull(groupToUpdate, getSelectedGroup());
+                                        if (wasSelected) {
+                                            groupsSelectionModel.setSelected(groupToUpdate, false);
+                                        }
                                         groupToUpdate.setName(updateDescriptor.getName());
                                         groupToUpdate.description = updateDescriptor.getDescription();
                                         groupToUpdate.setDisplayName(updateDescriptor.getDisplayName());
@@ -708,6 +713,9 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                                         if (displayedIndex != -1) {
                                             groupsProvider.getList().set(displayedIndex, groupToUpdate);
                                         }
+                                        if (wasSelected) {
+                                            groupsSelectionModel.setSelected(groupToUpdate, true);
+                                        }
                                     }
                                 }
                                 groupsFilterablePanel.updateAll(availableLeaderboardGroups);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png
index 44535cc1794..9b5de172ffe 100644
Binary files a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png and b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png differ
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java
index 8b3181d0920..9c058aa723e 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java
@@ -44,7 +44,7 @@ import com.sap.sailing.selenium.core.SeleniumFieldDecorator;
  *   D049941
  */
 public class PageObject {
-    public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 60;
+    public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 120;
     
     public static final int DEFAULT_POLLING_INTERVAL = 5;