diff --git a/java/com.sap.sailing.gwt.ui/RaceBoard.css b/java/com.sap.sailing.gwt.ui/RaceBoard.css
index 456c3890b36..82e94955551 100644
--- a/java/com.sap.sailing.gwt.ui/RaceBoard.css
+++ b/java/com.sap.sailing.gwt.ui/RaceBoard.css
@@ -81,7 +81,7 @@ table {
 }
 
 .RaceBoardHeaderPanel {
-	
+	margin: 0 12px 18px 12px;
 }
 
 .sapLogo {
@@ -98,7 +98,7 @@ table {
 	color: #fff;
 	font-size: 14px;
 	font-weight: bold;
-	margin: 25px 0 0 0;
+	margin: 15px 0 0 0;
 }
 
 .leaderboardLabel {
@@ -181,11 +181,10 @@ input.magnifier {
 }
 
 .collapsablePanel-content {
-	border: none;
-	padding: 0;
-	margin: 0;
-	background: #b6b6b6;
-	position: inherit !important;
+	background: #fff;
+	margin: 12px;
+	border-radius: 10px;
+	width: auto !important;
 }
 
 .collapsablePanel-header {
@@ -213,10 +212,27 @@ input.magnifier {
 }
 
 .raceBoardNavigation {
-	vertical-align:baseline;
-	text-align: right;	
+	float: right;
+	margin: 26px 0 0 0;
 }
 
 .raceBoardNavigation-navigationitem {
-	padding:3px;
+	color: #dddcdc;
+	text-transform: uppercase;
+	font-weight: 500;
+	margin: 0 12px 0 0;
+	padding: 0 0 5px 0;
 }
+
+.raceBoardNavigation-navigationitem:hover {
+	border-bottom: 4px solid #f0ab00;
+	color: #dddcdc;
+	text-decoration: none;
+}
+
+.raceBoardNavigation-navigationitem:active {
+	border-bottom: 4px solid #f0ab00;
+	color: #dddcdc;
+	text-decoration: none;
+}
+