diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/course_marks_waypoint_new_item.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/course_marks_waypoint_new_item.xml
index f33139989bc..cf0ae749e82 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/course_marks_waypoint_new_item.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/course_marks_waypoint_new_item.xml
@@ -10,7 +10,7 @@
     <FrameLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="4">
+        android:layout_weight="1">
 
         <ImageView
             android:id="@+id/add_item"
@@ -20,16 +20,17 @@
             android:layout_gravity="center_horizontal" />
     </FrameLayout>
 
-    <Space
-        android:layout_width="50dp"
-        android:layout_height="wrap_content" />
-
-    <Space
+    <TextView
+        android:id="@+id/hint_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="4" />
+        android:text="@string/add_waypoint"
+        android:textAppearance="?attr/textXSmall"
+        android:textColor="?attr/white"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"/>
 
     <Space
-        android:layout_width="42dp"
+        android:layout_width="92dp"
         android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_course_marks_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_course_marks_normal.xml
index cbd9f3310b0..8113136d144 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_course_marks_normal.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_course_marks_normal.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
     <include
         android:id="@+id/header"
-        layout="@layout/race_schedule_course_header"/>
+        layout="@layout/race_schedule_course_header" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -25,7 +24,7 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/chooser"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -53,7 +52,7 @@
                     android:paddingLeft="@dimen/side_padding"
                     android:paddingRight="@dimen/side_padding"
                     android:text="@string/take_previous_short"
-                    android:textSize="@dimen/textSize_18"/>
+                    android:textSize="@dimen/textSize_18" />
             </FrameLayout>
 
             <android.support.v7.widget.RecyclerView
@@ -61,8 +60,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@id/load_prev"
-                android:layout_margin="@dimen/side_padding"
-                android:gravity="center"/>
+                android:layout_marginLeft="@dimen/side_padding"
+                android:layout_marginRight="@dimen/side_padding"
+                android:gravity="center" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -94,7 +94,7 @@
                         android:layout_height="@dimen/default_button_height"
                         android:layout_marginBottom="@dimen/side_padding"
                         android:text="@string/publish"
-                        android:textSize="@dimen/textSize_18"/>
+                        android:textSize="@dimen/textSize_18" />
 
                     <Button
                         android:id="@+id/unpublishCourse"
@@ -102,7 +102,7 @@
                         android:layout_width="@dimen/default_button_width"
                         android:layout_height="@dimen/default_button_height"
                         android:text="@string/unpublish"
-                        android:textSize="@dimen/textSize_18"/>
+                        android:textSize="@dimen/textSize_18" />
                 </LinearLayout>
             </FrameLayout>
 
@@ -110,7 +110,9 @@
                 android:id="@+id/new_course"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_above="@id/bottom_bar"/>
+                android:layout_above="@id/bottom_bar"
+                android:layout_marginLeft="@dimen/side_padding"
+                android:layout_marginRight="@dimen/side_padding" />
         </RelativeLayout>
     </FrameLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
index d2b44fe76f7..b814f016338 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
@@ -450,5 +450,6 @@
     <string name="prev_course">Vorheriger Kurs</string>
     <string name="layout_course">Kurs Layout</string>
     <string name="wind_degree">°</string>
+    <string name="add_waypoint">Wegpunkt hinzufügen</string>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
index 2d5ff0c6209..4ffbe497d9b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -476,5 +476,6 @@
     <string name="prev_course">Previous Course</string>
     <string name="layout_course">Course Layout</string>
     <string name="wind_degree">°</string>
+    <string name="add_waypoint">Press plus to add waypoint</string>
 
 </resources>
\ No newline at end of file