diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_transparent.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_transparent.xml
new file mode 100644
index 00000000000..63b593b17d3
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_transparent.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#00FFFFFF" />
+
+    <stroke
+        android:width="0.5dip"
+        android:color="#ffffff" />
+
+    <corners
+        android:bottomLeftRadius="5dip"
+        android:bottomRightRadius="5dip"
+        android:topLeftRadius="5dip"
+        android:topRightRadius="5dip" />
+
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml
new file mode 100644
index 00000000000..8cb9519d520
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp">
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        android:id="@+id/mark_header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="left"
+        android:background="@color/black_transparent"
+        android:gravity="center"
+        android:paddingBottom="7dp"
+        android:paddingLeft="10dp"
+        android:paddingTop="7dp"
+        android:textColor="@color/white"
+        android:textSize="10sp" />
+
+    <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/map"
+        android:name="com.google.android.gms.maps.MapFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <!-- Begin of detailed mark information -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="15dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="7dp"
+        android:paddingTop="15dp">
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/signal_accuracy_indicator_view_description"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+        <!-- Empty view to right align the following element -->
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:id="@+id/marker_gps_accuracy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <View style="@style/Divider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="15dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="7dp"
+        android:paddingTop="15dp">
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/longitude"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+        <!-- Empty view to right align the following element -->
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:id="@+id/marker_gps_longitude"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <View style="@style/Divider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="15dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="7dp"
+        android:paddingTop="15dp">
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/latitude"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+        <!-- Empty view to right align the following element -->
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            android:id="@+id/marker_gps_latitude"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <View style="@style/Divider" />
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+        android:id="@+id/marker_set_position_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/rounded_btn_yellow"
+        android:text="@string/set_position"
+        android:textSize="14sp"
+        android:textStyle="bold" />
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+        android:id="@+id/marker_reset_position_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/rounded_btn_transparent"
+        android:text="@string/reset_position"
+        android:textSize="14sp"
+        android:textStyle="bold" />
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml
new file mode 100644
index 00000000000..5f2c966cd93
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="18dp"
+        android:text="@string/course_type"
+        android:textSize="18sp" />
+
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="@string/marks"
+        android:textSize="18sp" />
+
+    <View
+        style="@style/Divider"
+    />
+    <ListView
+        android:id="@+id/listMarks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml
new file mode 100644
index 00000000000..df113e90046
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/empty"
+        android:src="@drawable/yellow_arrow_right"
+        android:textColor="@color/white" />
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        android:id="@+id/mark_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="15dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:singleLine="true"
+        android:textColor="@color/white" />
+
+    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        android:id="@+id/mark_set"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/mark_name"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="15dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:singleLine="true"
+        android:textColor="@color/white" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
index 47694fc704a..98ef7fde61d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
@@ -59,6 +59,8 @@
     <string name="days">Tage</string>
     <string name="hour">Stunde</string>
     <string name="day">Tag</string>
+    <string name="longitude">Breitengrad</string>
+    <string name="latitude">Längengrad</string>
     <string name="please_listen_to_announcements">Bitte achten Sie auf die Durchsagen</string>
     <string name="no_qr_code">Sie haben keinen QR-Code?</string>
     <string name="scan_qr">QR-Code scannen</string>
@@ -85,6 +87,10 @@
 	<string name="info_already_checked_in_this_qr_code">Bereits für diese Regatta eingecheckt</string>
 	<string name="warning">Warnung</string>
 	<string name="gps_turned_off">GPS ist nicht aktiviert. Bitte aktivieren Sie den Standortzugriff (GPS) in Ihren Android-Einstellungen!</string>
-	<string name="knots">Knoten</string>
+    <string name="set_position">Position setzen</string>
+    <string name="reset_position">Position zurücksetzen</string>
+    <string name="knots">Knoten</string>
 	<string name="preferences">Einstellungen</string>
+    <string name="course_type">Kurstyp</string>
+    <string name="marks">Kursmarkierungen</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
index 379ddeaf326..3bcb07e8f1c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
@@ -46,6 +46,8 @@
 	<string name="hour">Hour</string>
 	<string name="minute">Minute</string>
 	<string name="day">Day</string>
+    <string name="longitude">Longitude</string>
+    <string name="latitude">Latitude</string>
 	<string name="please_listen_to_announcements">Please listen to the announcements</string>
 	<string name="your_regattas">Your Regattas:</string>
 	<string name="close">Close</string>
@@ -67,8 +69,12 @@
 	<string name="info_already_checked_in_this_qr_code">Already checked in to this regatta</string>
 	<string name="warning">Warning</string>
 	<string name="gps_turned_off">GPS is turned off. Please turn on location access (GPS) in your Android Settings!</string>
+    <string name="set_position">Set Position</string>
+    <string name="reset_position">Reset Position</string>
 	<string name="knots">knots</string>
 	<string name="preferences">Preferences</string>
+    <string name="course_type">Course Type</string>
+    <string name="marks">Marks</string>
 	
 	<string name="initial_timer_text_zerozero" translatable="false">00:00:00</string>
 	<string name="initial_hyphen" translatable="false">-</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
index 4f40f4af956..46b85a80ded 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
@@ -44,4 +44,11 @@
         <item name="android:layout_marginLeft">6dp</item>
         <item name="android:layout_marginRight">6dp</item>
     </style>
+
+    <style name="Divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">?android:attr/listDivider</item>
+    </style>
+
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java
new file mode 100644
index 00000000000..d6d47de4a5c
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java
@@ -0,0 +1,24 @@
+package com.sap.sailing.android.tracking.app.adapter;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v4.widget.ResourceCursorAdapter;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.sap.sailing.android.tracking.app.R;
+
+public class MarkAdapter extends ResourceCursorAdapter {
+
+    public MarkAdapter(Context context, int layout, Cursor cursor, int flags) {
+        super(context, layout, cursor, flags);
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        TextView markName = (TextView) view.findViewById(R.id.mark_name);
+        TextView markSet = (TextView) view.findViewById(R.id.mark_set);
+
+    }
+}