diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
index fc8c5d6d93e..9076e07c9b4 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
@@ -202,7 +202,7 @@ public class DesktopStartView extends Composite implements StartView {
     private void createPerspectiveSettingsUI(final Perspective<?> perspective, FlowPanel perspectiveSettingsPanel) {
         perspectiveSettingsPanel.clear();
 
-        Button perspectiveSettingsButton = new Button("General Settings");
+        Button perspectiveSettingsButton = new Button("Page settings");
         perspectiveSettingsButton.getElement().getStyle().setMarginRight(10, Unit.PX);
         perspectiveSettingsPanel.add(perspectiveSettingsButton);
         perspectiveSettingsButton.setEnabled(perspective.hasSettings());
@@ -213,7 +213,7 @@ public class DesktopStartView extends Composite implements StartView {
             }
         });
 
-        Button perspectiveComponentSettingsButton = new Button("Component settings");
+        Button perspectiveComponentSettingsButton = new Button("Page component settings");
         perspectiveSettingsPanel.add(perspectiveComponentSettingsButton);
         perspectiveComponentSettingsButton.addClickHandler(new ClickHandler() {
             @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.ui.xml
index c52d12ba7ce..3adf9371cf3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.ui.xml
@@ -48,7 +48,7 @@
         
         <div ui:field="screenConfigurationUi">
 			<div class="{res.mediaCss.grid} {style.row} {style.headline}">
-				<div class="{res.mediaCss.columns}">Screen size and zoom</div>
+				<div class="{res.mediaCss.columns}">Player settings</div>
 			</div>			
 			<div class="{res.mediaCss.grid} {style.row}">
 				<div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large3} {res.mediaCss.columns}">
@@ -58,9 +58,6 @@
 					<g:CheckBox ui:field="startInFullscreenModeBox" />
 		        </div>
 			</div>
-			<div class="{res.mediaCss.grid} {style.row} {style.headline}">
-				<div class="{res.mediaCss.columns}">Screen switching</div>
-			</div>			
 			<div class="{res.mediaCss.grid} {style.row}">
 				<div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large3} {res.mediaCss.columns}">
 				    <span>Switch automatically to live race:</span>
@@ -78,11 +75,11 @@
 		        </div>
 			</div>
 			<div class="{res.mediaCss.grid} {style.row} {style.headline}">
-				<div class="{res.mediaCss.columns}">Viewer Settings</div>
+				<div class="{res.mediaCss.columns}">Page settings</div>
 			</div>
 			<div class="{res.mediaCss.grid} {style.row}">
 				<div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large3} {res.mediaCss.columns}">
-				    <span>Leaderboard Viewer:</span>
+				    <span>Leaderboard page:</span>
 		        </div>
 			    <div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large9} {res.mediaCss.columns}">
 					<g:FlowPanel ui:field="leaderboardPerspectiveSettingsPanel" />
@@ -90,7 +87,7 @@
 			</div>
 			<div class="{res.mediaCss.grid} {style.row}">
 				<div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large3} {res.mediaCss.columns}">
-				    <span>Race Viewer:</span>
+				    <span>Race player page:</span>
 		        </div>
 			    <div class="{res.mediaCss.small12} {res.mediaCss.medium6} {res.mediaCss.large9} {res.mediaCss.columns}">
 					<g:FlowPanel ui:field="raceboardPerspectiveSettingsPanel" />