diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
index 1e005d02185..2e32866c9a3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
@@ -244,6 +244,7 @@ public class RaceBoardPanel extends AbstractRootPerspectiveComposite<RaceBoardPe
         raceMap.getLeftHeaderPanel().add(raceInformationHeader);
         raceMap.getRightHeaderPanel().add(regattaAndRaceTimeInformationHeader);
         raceMap.getRightHeaderPanel().add(userManagementMenuView);
+        addChildComponent(raceMap);
 
         // Determine if the screen is large enough to initially display the leaderboard panel on the left side of the
         // map based on the initial screen width. Afterwards, the leaderboard panel visibility can be toggled as usual.
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java
index 54f733fc0ff..58683377489 100755
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java
@@ -23,4 +23,7 @@ public interface StringMessages extends Messages {
     String settings();
     String settingsForComponent(String localizedShortName);
     String pleaseSelect();
+    //TODO add to properties files
+    @DefaultMessage("Make default")
+    String makeDefault();
 }
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_de.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_de.properties
index 65e12845d73..a98d26ef452 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_de.properties
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_de.properties
@@ -24,4 +24,5 @@ error=Fehler
 configuration=Konfiguration
 settings=Einstellungen
 settingsForComponent=Einstellungen für {0}
-pleaseSelect=Bitte auswählen
\ No newline at end of file
+pleaseSelect=Bitte auswählen
+makeDefault=Als Standard verwenden
\ No newline at end of file
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/dialog/DataEntryDialog.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/dialog/DataEntryDialog.java
index 4e97527f76f..ca66904e52b 100755
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/dialog/DataEntryDialog.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/dialog/DataEntryDialog.java
@@ -22,6 +22,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.DialogBox;
+import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.DoubleBox;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.FocusWidget;
@@ -63,7 +64,9 @@ public abstract class DataEntryDialog<T> {
     private final Button cancelButton;
     private final Label statusLabel;
     private final FlowPanel panelForAdditionalWidget;
-    private final FlowPanel buttonPanel;
+    private final DockPanel buttonPanel;
+    private final FlowPanel rightButtonPanel;
+    private final FlowPanel leftButtonPanel;
 
     public static interface Validator<T> {
         /**
@@ -126,14 +129,20 @@ public abstract class DataEntryDialog<T> {
         panelForAdditionalWidget = new FlowPanel();
         panelForAdditionalWidget.setWidth("100%");
         dialogFPanel.add(panelForAdditionalWidget);
-        buttonPanel = new FlowPanel();
+        buttonPanel = new DockPanel();
+        buttonPanel.setWidth("100%");
         dialogFPanel.add(buttonPanel);
-        buttonPanel.setStyleName("additionalWidgets");
-        buttonPanel.add(okButton);
+        rightButtonPanel = new FlowPanel();
+        leftButtonPanel = new FlowPanel();
+        leftButtonPanel.setStyleName("additionalWidgetsLeft");
+        rightButtonPanel.setStyleName("additionalWidgetsRight");
+        rightButtonPanel.add(okButton);
+        buttonPanel.add(rightButtonPanel, DockPanel.EAST);
+        buttonPanel.add(leftButtonPanel, DockPanel.WEST);
         cancelButton = new Button(cancelButtonName);
         cancelButton.getElement().getStyle().setMargin(3, Unit.PX);
         cancelButton.ensureDebugId("CancelButton");
-        buttonPanel.add(cancelButton);
+        rightButtonPanel.add(cancelButton);
         cancelButton.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
@@ -591,7 +600,11 @@ public abstract class DataEntryDialog<T> {
         dateEntryDialog.addAutoHidePartner(element);
     }
     
-    protected FlowPanel getButtonPannel() {
-        return buttonPanel;
+    protected FlowPanel getLeftButtonPannel() {
+        return leftButtonPanel;
+    }
+    
+    protected FlowPanel getRightButtonPannel() {
+        return rightButtonPanel;
     }
 }
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/SettingsDialog.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/SettingsDialog.java
index 2aaad1129be..55965c69859 100755
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/SettingsDialog.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/SettingsDialog.java
@@ -73,10 +73,10 @@ public class SettingsDialog<SettingsType extends Settings> extends DataEntryDial
                     });
         this.settingsDialogComponent = dialogComponent;
         
-        Button makeDefaultButton = new Button("");
+        Button makeDefaultButton = new Button(stringMessages.makeDefault());
         makeDefaultButton.getElement().getStyle().setMargin(3, Unit.PX);
         makeDefaultButton.ensureDebugId("MakeDefaultButton");
-        getButtonPannel().add(makeDefaultButton);
+        getLeftButtonPannel().add(makeDefaultButton);
         makeDefaultButton.addClickHandler(new ClickHandler() {
             public void onClick(ClickEvent event) {
                 //TODO send notification
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/css/CommonControls.css b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/css/CommonControls.css
index ae26656e121..8f461d353dc 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/css/CommonControls.css
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/css/CommonControls.css
@@ -811,10 +811,13 @@ body ::-webkit-scrollbar-track {
 	float: right;
 }
 
-.gwt-DialogBox .additionalWidgets {
+.gwt-DialogBox .additionalWidgetsRight {
 	padding: 5px 0 0 0;
 	text-align: right;
 }
+.gwt-DialogBox .additionalWidgetsLeft {
+    padding: 5px 0 0 0;
+}
 
 .gwt-DialogBox .gwt-Label {
 	line-height: 1.4;