diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/HikePoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/HikePoint.java
new file mode 100644
index 0000000..6cadbd1
--- /dev/null
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/HikePoint.java
@@ -0,0 +1,64 @@
+/**
+ * This file is part of MountainNavigation.
+ *
+ * MountainNavigation is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MountainNavigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MountainNavigation.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @copyright Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+ *
+ * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+ */
+
+package de.apps4ics.mountainnavigation;
+
+import android.location.Location;
+
+import org.osmdroid.util.GeoPoint;
+
+public class HikePoint {
+    private long timestamp;
+    private GeoPoint location;
+
+    public HikePoint(Location location, long timestamp) {
+        this(new GeoPoint(location.getLatitude(), location.getLongitude(), location.getAltitude()), timestamp);
+    }
+
+    public HikePoint(GeoPoint geoPoint, long timestamp) {
+        this.location = geoPoint;
+        this.timestamp = timestamp;
+    }
+
+    public HikePoint(GeoPoint geoPoint) {
+        this(geoPoint, System.currentTimeMillis());
+    }
+
+    public HikePoint(Location location) {
+        this(new GeoPoint(location.getLatitude(), location.getLongitude(), location.getAltitude()));
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public GeoPoint getLocation() {
+        return location;
+    }
+
+    public void setLocation(GeoPoint location) {
+        this.location = location;
+    }
+}
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index d098e7c..dbf9004 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -21,7 +21,9 @@
 
 package de.apps4ics.mountainnavigation;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -43,11 +45,16 @@
 import android.support.v7.app.AppCompatActivity;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.support.v4.widget.DrawerLayout;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -58,6 +65,7 @@
 
 import org.osmdroid.api.IMapController;
 import org.osmdroid.bonuspack.overlays.Marker;
+import org.osmdroid.bonuspack.overlays.Polyline;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
@@ -70,6 +78,7 @@
 
 import de.apps4ics.mountainnavigation.adapters.ImageListAdapter;
 import de.apps4ics.mountainnavigation.handlers.DatabaseHandler;
+import de.apps4ics.mountainnavigation.handlers.HikeHandler;
 import de.apps4ics.mountainnavigation.handlers.PoiHandler;
 import de.apps4ics.mountainnavigation.handlers.WeatherHandler;
 import de.apps4ics.mountainnavigation.pois.AddPoiDialog;
@@ -88,7 +97,7 @@
     private CharSequence mTitle;
     private CharSequence mDrawerTitle;
     private static final int GPS_MIN_TIME = 5000;
-    private static final int GPS_MIN_DIST = 5;
+    private static final int GPS_MIN_DIST = 10;
     private static final int MIN_WEATHER_RELOAD_TIME = 3600000; //1hour, in ms
     private static final int MIN_WEATHER_RELOAD_DIST = 5000; //5km, in m
     private static final int MIN_POI_RELOAD_TIME = 300000; //5min, in ms
@@ -112,6 +121,7 @@
     private DatabaseHandler dbHandler;
     private static PoiHandler poiHandler;
     private static WeatherHandler weatherHandler;
+    private static HikeHandler hikeHandler;
 
     private long lastWeatherInformation;
     private long lastPoiInformation;
@@ -123,6 +133,7 @@
     private ActionBarDrawerToggle drawerToggle;
     private DrawerLayout drawerLayout;
     private LinearLayout poiView;
+    private LinearLayout hikeView;
     private LinearLayout menuView;
     private ImageView weatherSymbol;
     private TextView weatherCity;
@@ -134,6 +145,7 @@
 
     public static ArrayList<OverlayItem> pathMarkers;
     public static OverlayItem imageMarker;
+    private Polyline hikeOverlay;
 
     private String provider;
     private static Location mLocation;
@@ -172,16 +184,21 @@
         mapController.setZoom(ZOOM_LEVEL);
         mapController.setCenter(new GeoPoint(48.52, 9.055));
 
+        hikeOverlay = new Polyline(this);
+        hikeOverlay.setColor(res.getColor(R.color.polyline_color));
+        mapView.getOverlays().add(hikeOverlay);
+
         dbHandler = new DatabaseHandler(this);
         poiHandler = new PoiHandler(this, res, mapView);
         weatherHandler = new WeatherHandler(this);
+        hikeHandler = new HikeHandler(hikeOverlay);
 
         lastWeatherInformation = lastPoiInformation = 0;
 
         foundLocations = new ArrayList<>();
 
         currentPosition = new Marker(mapView);
-        currentPosition.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
+        currentPosition.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER);
         currentPosition.setTitle(getString(R.string.osm_marker_title));
         currentPosition.setIcon(res.getDrawable(R.drawable.ic_currency_96, null));
 
@@ -210,6 +227,7 @@
         });
         drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         menuView = (LinearLayout) findViewById(R.id.menuList);
+        hikeView = (LinearLayout) findViewById(R.id.hikeList);
         poiView = (LinearLayout) findViewById(R.id.poiList);
         weatherSymbol = (ImageView) findViewById(R.id.weather_symbol);
         weatherCity = (TextView) findViewById(R.id.weather_city);
@@ -233,6 +251,101 @@
             poiView.addView(row);
         }
 
+        final String[] hikeEntries = res.getStringArray(R.array.hikeEntries);
+        ArrayAdapter<String> hikeAdapter = new ArrayAdapter<>(MainActivity.this, R.layout.drawer_list_simple, hikeEntries);
+        for(int i=0; i<hikeAdapter.getCount(); i++) {
+            final int position = i;
+            final TextView view = (TextView) hikeAdapter.getView(i, null, hikeView);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    String key = res.getStringArray(R.array.hikeEntriesKeys)[position];
+                    if(key.equals(getString(R.string.hike_title_record_key))) {
+                        //TODO Show dialog (Do you want to start a hike?)
+                        if(hikeHandler.isRecording()) {
+                            ArrayList<HikePoint> hikePoints = (ArrayList) hikeHandler.getPoints();
+                            if(hikePoints.size() < 2) return;
+
+                            LayoutInflater inflater = getLayoutInflater();
+                            View hikeDialog = inflater.inflate(R.layout.hike_dialog, null, true);
+                            final EditText input = (EditText) hikeDialog.findViewById(R.id.hike_name);
+                            TextView lengthView = (TextView) hikeDialog.findViewById(R.id.hike_length);
+                            final TextView timeView = (TextView) hikeDialog.findViewById(R.id.hike_time);
+
+                            int lengthRest = hikeHandler.getTime();
+                            int hours = lengthRest / 3600;
+                            lengthRest %= 3600;
+                            int minutes = lengthRest / 60;
+                            int seconds = lengthRest % 60;
+
+                            lengthView.setText(String.format(Locale.getDefault(), "Length so far: %.02fm", hikeHandler.getLength()));
+                            timeView.setText(String.format(Locale.getDefault(), "Time so far: %02d:%02d:%02d", hours, minutes, seconds));
+
+                            AlertDialog.Builder saveHikeBuilder = new AlertDialog.Builder(MainActivity.this);
+                            saveHikeBuilder.setTitle("Save your hike")
+                                    .setView(hikeDialog)
+                                    .setPositiveButton("Save hike", new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            String name = input.getText().toString().trim();
+                                            if(!name.equals("")) {
+                                                hikeHandler.stopRecording();
+                                                view.setText(hikeEntries[position]);
+                                            }
+                                        }
+                                    })
+                                    .setNegativeButton("Keep hiking", new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                        }
+                                    });
+                            final AlertDialog saveHikeDialog = saveHikeBuilder.create();
+                            saveHikeDialog.show();
+                            final Button saveHikeDialogButton = saveHikeDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+                            saveHikeDialogButton.setEnabled(false);
+
+                            input.addTextChangedListener(new TextWatcher() {
+                                @Override
+                                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                                }
+                                @Override
+                                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                                    if(s.length() > 0) saveHikeDialogButton.setEnabled(true);
+                                    else saveHikeDialogButton.setEnabled(false);
+                                }
+                                @Override
+                                public void afterTextChanged(Editable s) {
+                                }
+                            });
+                        } else {
+                            AlertDialog.Builder startHikeBuilder = new AlertDialog.Builder(MainActivity.this);
+                            startHikeBuilder
+                                    .setTitle("Do you want to start a hike?")
+                                    .setMessage("This will record a new hike. From now on your locations will be recorded and you can save it afterwards.")
+                                    .setPositiveButton("Start hike", new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            hikeHandler.startRecording();
+                                            view.setText(res.getString(R.string.hike_title_stop_rec));
+                                            Toaster(res.getString(R.string.hike_is_recording), true);
+                                        }
+                                    })
+                                    .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                        }
+                                    });
+                            AlertDialog startHikeDialog = startHikeBuilder.create();
+                            startHikeDialog.show();
+                        }
+                    } else if(key.equals(getString(R.string.hike_title_show_key))) {
+                        //TODO Open dialog with all hikes around current position (or enter position)
+                    }
+                }
+            });
+            menuView.addView(view);
+        }
+
         String[] menuEntries = res.getStringArray(R.array.menuEntries);
         ArrayAdapter<String> menuAdapter = new ArrayAdapter<>(MainActivity.this, R.layout.drawer_list_simple, menuEntries);
         for(int i=0; i<menuAdapter.getCount(); i++) {
@@ -547,6 +660,8 @@
         if(mLocation == null) return;
         foundLocations.add(location);
 
+        if(hikeHandler.isRecording()) hikeHandler.addLocation(mLocation);
+
         double lat = location.getLatitude();
         double lon = location.getLongitude();
         GeoPoint gp = new GeoPoint(lat, lon);
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java
new file mode 100644
index 0000000..40ddec3
--- /dev/null
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java
@@ -0,0 +1,112 @@
+/**
+ * This file is part of MountainNavigation.
+ *
+ * MountainNavigation is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MountainNavigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MountainNavigation.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @copyright Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+ *
+ * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+ */
+
+package de.apps4ics.mountainnavigation.handlers;
+
+import android.location.Location;
+
+import org.osmdroid.bonuspack.overlays.Polyline;
+import org.osmdroid.util.GeoPoint;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.apps4ics.mountainnavigation.HikePoint;
+
+public class HikeHandler {
+    private boolean isRecording;
+    private List<Long> timestamps;
+    private List<GeoPoint> geopoints;
+    private Polyline path;
+    private int time;
+    private float length;
+    private boolean needsUpdate;
+
+    public HikeHandler(Polyline path) {
+        timestamps = new ArrayList<>();
+        geopoints = new ArrayList<>();
+        this.path = path;
+        needsUpdate = false;
+    }
+
+    public boolean isRecording() {
+        return isRecording;
+    }
+
+    public void startRecording() {
+        isRecording = true;
+    }
+
+    public void stopRecording() {
+        isRecording = false;
+        updateProperties();
+        path.setPoints(new ArrayList<GeoPoint>());
+    }
+
+    private void updateProperties() {
+        if(!needsUpdate) return;
+        needsUpdate = false;
+        if(timestamps.size() < 2) return;
+        time = (int) (timestamps.get(timestamps.size()-1) - timestamps.get(0)) / 1000;
+        GeoPoint first;
+        GeoPoint second = null;
+        float[] results = new float[3];
+        for(GeoPoint p : geopoints) {
+            first = p;
+            if(second != null) {
+                Location.distanceBetween(first.getLatitude(), first.getLongitude(), second.getLatitude(), second.getLongitude(), results);
+                length += results[0];
+            }
+            second = first;
+        }
+    }
+
+    public void addLocation(Location location) {
+        if(!isRecording) return;
+        needsUpdate = true;
+        geopoints.add(new GeoPoint(location.getLatitude(), location.getLongitude(), location.getAltitude()));
+        timestamps.add(System.currentTimeMillis());
+        path.setPoints(geopoints);
+    }
+
+    public List<HikePoint> getPoints() {
+        if(geopoints.size() != timestamps.size()) return null;
+        List<HikePoint> points = new ArrayList<>();
+        for(int i=0; i<geopoints.size(); i++) {
+            points.add(new HikePoint(geopoints.get(i), timestamps.get(i)));
+        }
+        return points;
+    }
+
+    public int getTime() {
+        updateProperties();
+        return time;
+    }
+
+    public float getLength() {
+        updateProperties();
+        return length;
+    }
+
+    public Polyline getPath() {
+        return path;
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c677a1c..3d44e45 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -79,76 +79,95 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:background="#ffff">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_margin="12dp">
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="21dp"
+                    android:id="@+id/weather_symbol"/>
                 <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_margin="12dp">
-                    <ImageView
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_marginTop="21dp"
-                        android:id="@+id/weather_symbol"/>
-                    <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="72dp"
+                    android:orientation="vertical"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp">
+                    <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="72dp"
-                        android:orientation="vertical"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/weather_city"
-                            android:gravity="center_vertical"
-                            android:textSize="16sp"
-                            android:textColor="@color/text_color"
-                            android:fontFamily="sans-serif-medium"
-                            android:text="@string/no_weather_data_available"/>
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="6dp"
-                            android:layout_marginStart="6dp"
-                            android:id="@+id/weather_desc"
-                            android:textSize="12sp"
-                            android:textColor="@color/text_color"
-                            android:fontFamily="sans-serif-medium" />
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="6dp"
-                            android:layout_marginStart="6dp"
-                            android:id="@+id/weather_min_temp"
-                            android:textSize="12sp"
-                            android:textColor="@color/text_color"
-                            android:fontFamily="sans-serif-medium"
-                            android:textStyle="italic"/>
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="6dp"
-                            android:layout_marginStart="6dp"
-                            android:id="@+id/weather_max_temp"
-                            android:textSize="12sp"
-                            android:textColor="@color/text_color"
-                            android:fontFamily="sans-serif-medium"
-                            android:textStyle="italic"/>
-                    </LinearLayout>
+                        android:layout_height="wrap_content"
+                        android:id="@+id/weather_city"
+                        android:gravity="center_vertical"
+                        android:textSize="16sp"
+                        android:textColor="@color/text_color"
+                        android:fontFamily="sans-serif-medium"
+                        android:text="@string/no_weather_data_available"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:id="@+id/weather_desc"
+                        android:textSize="12sp"
+                        android:textColor="@color/text_color"
+                        android:fontFamily="sans-serif-medium" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:id="@+id/weather_min_temp"
+                        android:textSize="12sp"
+                        android:textColor="@color/text_color"
+                        android:fontFamily="sans-serif-medium"
+                        android:textStyle="italic"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:id="@+id/weather_max_temp"
+                        android:textSize="12sp"
+                        android:textColor="@color/text_color"
+                        android:fontFamily="sans-serif-medium"
+                        android:textStyle="italic"/>
                 </LinearLayout>
-                <LinearLayout
-                    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-                    android:name="de.apps4ics.mountainnavigation.NavigationDrawerFragment"
-                    android:layout_height="wrap_content" android:choiceMode="singleChoice"
-                    android:divider="@android:color/transparent" android:dividerHeight="0dp"
-                    android:background="#ffff" tools:context=".NavigationDrawerFragment"
-                    android:id="@+id/poiList"
-                    android:orientation="vertical" />
-                <LinearLayout android:layout_width="match_parent"
-                    android:layout_height="wrap_content" android:choiceMode="singleChoice"
-                    android:divider="@android:color/transparent" android:dividerHeight="0dp"
-                    android:background="#ffff" tools:context=".NavigationDrawerFragment"
-                    android:id="@+id/menuList"
-                    android:orientation="vertical" />
+            </LinearLayout>
+            <LinearLayout
+                xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+                android:name="de.apps4ics.mountainnavigation.NavigationDrawerFragment"
+                android:layout_height="wrap_content" android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent" android:dividerHeight="0dp"
+                android:background="#ffff" tools:context=".NavigationDrawerFragment"
+                android:id="@+id/poiList"
+                android:orientation="vertical" />
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:drawable/divider_horizontal_bright"
+                android:paddingBottom="2dp"
+                android:paddingTop="2dp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent" android:dividerHeight="0dp"
+                android:background="#ffff" tools:context=".NavigationDrawerFragment"
+                android:id="@+id/hikeList"
+                android:orientation="vertical" />
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:drawable/divider_horizontal_bright"
+                android:paddingBottom="2dp"
+                android:paddingTop="2dp" />
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content" android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent" android:dividerHeight="0dp"
+                android:background="#ffff" tools:context=".NavigationDrawerFragment"
+                android:id="@+id/menuList"
+                android:orientation="vertical" />
         </LinearLayout>
     </ScrollView>
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/hike_dialog.xml b/app/src/main/res/layout/hike_dialog.xml
new file mode 100644
index 0000000..91d53bf
--- /dev/null
+++ b/app/src/main/res/layout/hike_dialog.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	* This file is part of MountainNavigation.
+	*
+	* MountainNavigation is free software: you can redistribute it and/or modify
+	* it under the terms of the GNU General Public License as published by
+	* the Free Software Foundation, either version 3 of the License, or
+	* (at your option) any later version.
+	*
+	* MountainNavigation is distributed in the hope that it will be useful,
+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	* GNU General Public License for more details.
+	*
+	* You should have received a copy of the GNU General Public License
+	* along with MountainNavigation. If not, see <http://www.gnu.org/licenses/>.
+	*
+	* Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+	*
+	* Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:labelFor="@+id/hike_name"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="Set a name for your hike"/>
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/hike_name"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:inputType="text"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/hike_length"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/hike_time"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 07e705f..19d9d67 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -76,6 +76,8 @@
     <string name="osm_marker_title">Dein Standort</string>
     <string name="osm_marker_snippet">Latitude: %1$.03f&lt;br/&gt;Longitude: %2$.03f&lt;br/&gt;Höhe: %3$dm&lt;br/&gt;Hinzugefügt: %4$s</string>
     <string name="no_weather_data_available">Keine Wetterdaten verfügbar</string>
+    <string name="hike_is_recording">Nehme auf…</string>
+    <string name="hike_title_stop_rec">Aufnahme stoppen</string>
 
     <string name="lang_identifier">de</string>
     <string name="date_format_hm">H:m</string>
@@ -130,6 +132,10 @@
         <item>Einstellungen</item>
         <item>Über</item>
     </string-array>
+    <string-array name="hikeEntries">
+        <item>Wanderung aufnehmen</item>
+        <item>Wanderungen anzeigen</item>
+    </string-array>
     <string-array name="fountain_size_dialog_options">
         <item>Klein</item>
         <item>Mittel</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 376ea89..77296f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,4 +24,5 @@
     <color name="text_color_light">#AA000000</color>
     <color name="text_color_selected">#FF000000</color>
     <color name="icon_unselected_gray">#AFB9B9B9</color>
+    <color name="polyline_color">#AA0E84F1</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96182bf..609637d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,6 +78,8 @@
     <string name="osm_marker_snippet">Latitude: %1$.03f&lt;br/&gt;Longitude: %2$.03f&lt;br/&gt;Altitude: %3$d meters&lt;br/&gt;Added: %4$s</string>
     <string name="weather_city_display" translatable="false">%1$s, %2$s</string>
     <string name="no_weather_data_available">No weather data available</string>
+    <string name="hike_is_recording">Recording…</string>
+    <string name="hike_title_stop_rec">Stop recording</string>
 
     <string name="lang_identifier">en</string>
     <string name="date_format_hm">h:m a</string>
@@ -119,6 +121,8 @@
     <string name="menu_title_about_key" translatable="false">about</string>
     <string name="menu_title_settings_key" translatable="false">settings</string>
     <string name="menu_title_download_key" translatable="false">download</string>
+    <string name="hike_title_show_key" translatable="false">showHikes</string>
+    <string name="hike_title_record_key" translatable="false">recordHike</string>
     <string name="settings_hint_key" translatable="false">hints</string>
     <string name="settings_hint_enable_key" translatable="false">dispHints</string>
     <string name="settings_hint_min_hot_temp_key" translatable="false">maxHotTemp</string>
@@ -160,6 +164,14 @@
         <item>@string/menu_title_settings_key</item>
         <item>@string/menu_title_about_key</item>
     </string-array>
+    <string-array name="hikeEntries">
+        <item>Record hike</item>
+        <item>Show hikes</item>
+    </string-array>
+    <string-array name="hikeEntriesKeys" translatable="false">
+        <item>@string/hike_title_record_key</item>
+        <item>@string/hike_title_show_key</item>
+    </string-array>
     <string-array name="contributors" translatable="false">
         <item>- OpenStreetMap: https://www.openstreetmap.org/</item>
         <item>- OpenWeatherMap: https://openweathermap.org/</item>