diff --git a/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml b/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
index 0acb7069680..0ec6eec9dbd 100644
--- a/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
@@ -39,7 +39,7 @@
         <activity
             android:name=".ui.activities.StartActivity"
             android:label="@string/app_name"
-            android:screenOrientation="unspecified">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -65,7 +65,7 @@
 
         <activity
             android:name=".ui.activities.RegattaActivity"
-            android:screenOrientation="unspecified">
+            android:screenOrientation="portrait">
 
         </activity>
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
index dde12307695..2deb136e39b 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
@@ -2,35 +2,41 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black_transparent"
-    android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
+    android:orientation="vertical">
 
     <View
         android:layout_width="fill_parent"
         android:layout_height="4dp"
         android:background="@color/sap_yellow" />
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:text="@string/course_type"
-        android:textSize="20sp" />
-
-
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="@string/marks"
-        android:textSize="20sp" />
-
-    <View style="@style/Divider" />
-    
-    <ListView
-        android:id="@+id/listMarks"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
+        android:layout_height="match_parent"
+        android:background="@color/black_transparent"
+        android:orientation="vertical"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:text="@string/course_type"
+            android:textSize="20sp" />
+
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="@string/marks"
+            android:textSize="20sp" />
+
+        <View style="@style/Divider" />
+
+        <ListView
+            android:id="@+id/listMarks"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+</LinearLayout>