diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/AutoPlayController.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/AutoPlayController.java
index e0b830c2155..2ddc9370f22 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/AutoPlayController.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/AutoPlayController.java
@@ -8,7 +8,6 @@ import java.util.Map;
 
 import com.google.gwt.dom.client.Style.FontWeight;
 import com.google.gwt.dom.client.Style.TextAlign;
-import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.css
index d90af30a97a..68d7ebdf85f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.css
@@ -7,21 +7,37 @@
   line-height: 4em;
   width: 100%;
   overflow: hidden;
+  text-align:center;
 }
+
+.siteheaderLeft {
+    float:left;
+	width: 25%;
+	text-align: left;
+}
+
+.siteheaderCentered {
+	width: 50%;
+    display: inline-block;
+    margin:0 auto;
+}
+
+.siteheaderRight {
+    float:right;
+	width: 25%;
+	text-align: right;
+}
+
 .logo {
-  margin: 0.8em 0;
+  margin: 0.8em 10px;
   float: left;
 }
 .logotitle {
   display: inline;
-  height: 4.33em;
-  line-height: 4.33em;
   color: #f6f9fc;
 }
 .pagetitle {
-  display: inline;
-  height: 4.33em;
-  line-height: 4.33em;
   color: #ffffff;
+  font-size: 1.5rem;
   font-weight: bold;
 }
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.java
index c4e427804f3..b33b345869d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.java
@@ -1,7 +1,7 @@
 package com.sap.sailing.gwt.autoplay.client.shared.header;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.ParagraphElement;
+import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
@@ -13,13 +13,13 @@ public class SAPHeader extends Composite {
     interface SAPHeaderUiBinder extends UiBinder<Widget, SAPHeader> {
     }
 
-    @UiField ParagraphElement pageTitleParagraph;
+    @UiField DivElement pageTitleDiv;
     
     public SAPHeader(String pageTitle) {
         SAPHeaderResources.INSTANCE.css().ensureInjected();
         
         initWidget(uiBinder.createAndBindUi(this));
         
-        pageTitleParagraph.setInnerText(pageTitle);
+        pageTitleDiv.setInnerText(pageTitle);
     }
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.ui.xml
index c94edb6c657..34a108aff5f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeader.ui.xml
@@ -6,15 +6,16 @@
     <ui:with field="local_res" type="com.sap.sailing.gwt.autoplay.client.shared.header.SAPHeaderResources" />
 	<g:HTMLPanel>
 		<header class="{local_res.css.siteheader}">
-		  <div class="{res.mainCss.grid}">
-		    <div class="{res.mediaCss.small2} {res.mediaCss.large3} {res.mediaCss.columns}">
+		    <div class="{local_res.css.siteheaderLeft}">
 				<g:Image resource="{local_res.logo}" pixelSize="80, 40" altText="SAP Sailing Analytics" styleName="{local_res.css.logo}"/>
 				<p class="{local_res.css.logotitle}">Sailing Analytics</p>
+			</div>
+		    <div class="{local_res.css.siteheaderCentered}">
+		    	<div ui:field="pageTitleDiv" class="{local_res.css.pagetitle}"></div>
 		    </div>
-		    <div class="{res.mediaCss.small9} {res.mediaCss.medium7} {res.mediaCss.large6} {res.mediaCss.columns}">
-		        <p ui:field="pageTitleParagraph" class="{local_res.css.pagetitle}"></p>
-		    </div>
-		  </div>
+		    <div class="{local_res.css.siteheaderRight}">
+		        &nbsp;
+			</div>		        
 		</header>
 		    <!-- 
 			<div class="{res.mainCss.grid}">
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java
index 0aa13412005..e283365c099 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java
@@ -13,6 +13,9 @@ public interface SAPHeaderResources extends ClientBundle {
 
     public interface LocalCss extends CssResource {
         String siteheader();
+        String siteheaderLeft();
+        String siteheaderCentered();
+        String siteheaderRight();
         String logo();
         String logotitle();
         String pagetitle();