From 6c346e0e7ba72dcfae10b2b494f964857c9a14d4 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 9 Jun 2013 17:42:00 +0200
Subject: refactoring: use activity names for layouts

---
 main/res/layout-land/compass_activity.xml        | 123 ++++
 main/res/layout-land/coordinatesinput_dialog.xml | 183 +++++
 main/res/layout-land/coords.xml                  | 183 -----
 main/res/layout-land/navigate.xml                | 123 ----
 main/res/layout/addresses.xml                    |  19 -
 main/res/layout/addresses_item.xml               |  39 --
 main/res/layout/addresslist_activity.xml         |  19 +
 main/res/layout/addresslist_item.xml             |  39 ++
 main/res/layout/cachedetail_activity.xml         |  32 +
 main/res/layout/cachedetail_description_page.xml | 140 ++++
 main/res/layout/cachedetail_details_page.xml     | 273 ++++++++
 main/res/layout/cachedetail_images_page.xml      |  15 +
 main/res/layout/cachedetail_inventory_page.xml   |   7 +
 main/res/layout/cachedetail_logs_page.xml        |  13 +
 main/res/layout/cachedetail_waypoints_page.xml   |  26 +
 main/res/layout/caches.xml                       |  44 --
 main/res/layout/caches_footer.xml                |  16 -
 main/res/layout/caches_images.xml                |  15 -
 main/res/layout/caches_item.xml                  | 172 -----
 main/res/layout/cacheslist_activity.xml          |  44 ++
 main/res/layout/cacheslist_footer.xml            |  16 +
 main/res/layout/cacheslist_item.xml              | 172 +++++
 main/res/layout/cacheview.xml                    |  32 -
 main/res/layout/cacheview_description.xml        | 140 ----
 main/res/layout/cacheview_details.xml            | 273 --------
 main/res/layout/cacheview_inventory.xml          |   7 -
 main/res/layout/cacheview_logs.xml               |  13 -
 main/res/layout/cacheview_waypoints.xml          |  26 -
 main/res/layout/compass_activity.xml             | 115 +++
 main/res/layout/coordinatesinput_dialog.xml      | 175 +++++
 main/res/layout/coords.xml                       | 175 -----
 main/res/layout/edit_waypoint_activity.xml       | 112 ---
 main/res/layout/editwaypoint_activity.xml        | 112 +++
 main/res/layout/images_activity.xml              |  12 +
 main/res/layout/imageselect_activity.xml         | 115 +++
 main/res/layout/init.xml                         | 853 -----------------------
 main/res/layout/logcache_activity.xml            | 179 +++++
 main/res/layout/logcache_trackable_item.xml      |  62 ++
 main/res/layout/logtrackable_activity.xml        |  95 +++
 main/res/layout/main.xml                         | 209 ------
 main/res/layout/main_activity.xml                | 209 ++++++
 main/res/layout/map_static.xml                   |  23 -
 main/res/layout/map_static_item.xml              |  10 -
 main/res/layout/navigate.xml                     | 115 ---
 main/res/layout/navigateanypoint_activity.xml    |  19 +
 main/res/layout/navigateanypoint_header.xml      |  76 ++
 main/res/layout/point.xml                        |  19 -
 main/res/layout/point_controls.xml               |  76 --
 main/res/layout/search.xml                       | 178 -----
 main/res/layout/search_activity.xml              | 178 +++++
 main/res/layout/settings_activity.xml            | 853 +++++++++++++++++++++++
 main/res/layout/spoilers.xml                     |  12 -
 main/res/layout/star.xml                         |   9 -
 main/res/layout/star_image.xml                   |   9 +
 main/res/layout/staticmaps_activity.xml          |  23 +
 main/res/layout/staticmaps_activity_item.xml     |  10 +
 main/res/layout/touch.xml                        |  95 ---
 main/res/layout/useful_apps_activity.xml         |  23 -
 main/res/layout/useful_apps_item.xml             |  50 --
 main/res/layout/usefulapps_activity.xml          |  23 +
 main/res/layout/usefulapps_item.xml              |  50 ++
 main/res/layout/visit.xml                        | 179 -----
 main/res/layout/visit_image.xml                  | 115 ---
 main/res/layout/visit_trackable.xml              |  62 --
 64 files changed, 3417 insertions(+), 3417 deletions(-)
 create mode 100644 main/res/layout-land/compass_activity.xml
 create mode 100644 main/res/layout-land/coordinatesinput_dialog.xml
 delete mode 100644 main/res/layout-land/coords.xml
 delete mode 100644 main/res/layout-land/navigate.xml
 delete mode 100644 main/res/layout/addresses.xml
 delete mode 100644 main/res/layout/addresses_item.xml
 create mode 100644 main/res/layout/addresslist_activity.xml
 create mode 100644 main/res/layout/addresslist_item.xml
 create mode 100644 main/res/layout/cachedetail_activity.xml
 create mode 100644 main/res/layout/cachedetail_description_page.xml
 create mode 100644 main/res/layout/cachedetail_details_page.xml
 create mode 100644 main/res/layout/cachedetail_images_page.xml
 create mode 100644 main/res/layout/cachedetail_inventory_page.xml
 create mode 100644 main/res/layout/cachedetail_logs_page.xml
 create mode 100644 main/res/layout/cachedetail_waypoints_page.xml
 delete mode 100644 main/res/layout/caches.xml
 delete mode 100644 main/res/layout/caches_footer.xml
 delete mode 100644 main/res/layout/caches_images.xml
 delete mode 100644 main/res/layout/caches_item.xml
 create mode 100644 main/res/layout/cacheslist_activity.xml
 create mode 100644 main/res/layout/cacheslist_footer.xml
 create mode 100644 main/res/layout/cacheslist_item.xml
 delete mode 100644 main/res/layout/cacheview.xml
 delete mode 100644 main/res/layout/cacheview_description.xml
 delete mode 100644 main/res/layout/cacheview_details.xml
 delete mode 100644 main/res/layout/cacheview_inventory.xml
 delete mode 100644 main/res/layout/cacheview_logs.xml
 delete mode 100644 main/res/layout/cacheview_waypoints.xml
 create mode 100644 main/res/layout/compass_activity.xml
 create mode 100644 main/res/layout/coordinatesinput_dialog.xml
 delete mode 100644 main/res/layout/coords.xml
 delete mode 100644 main/res/layout/edit_waypoint_activity.xml
 create mode 100644 main/res/layout/editwaypoint_activity.xml
 create mode 100644 main/res/layout/images_activity.xml
 create mode 100644 main/res/layout/imageselect_activity.xml
 delete mode 100644 main/res/layout/init.xml
 create mode 100644 main/res/layout/logcache_activity.xml
 create mode 100644 main/res/layout/logcache_trackable_item.xml
 create mode 100644 main/res/layout/logtrackable_activity.xml
 delete mode 100644 main/res/layout/main.xml
 create mode 100644 main/res/layout/main_activity.xml
 delete mode 100644 main/res/layout/map_static.xml
 delete mode 100644 main/res/layout/map_static_item.xml
 delete mode 100644 main/res/layout/navigate.xml
 create mode 100644 main/res/layout/navigateanypoint_activity.xml
 create mode 100644 main/res/layout/navigateanypoint_header.xml
 delete mode 100644 main/res/layout/point.xml
 delete mode 100644 main/res/layout/point_controls.xml
 delete mode 100644 main/res/layout/search.xml
 create mode 100644 main/res/layout/search_activity.xml
 create mode 100644 main/res/layout/settings_activity.xml
 delete mode 100644 main/res/layout/spoilers.xml
 delete mode 100644 main/res/layout/star.xml
 create mode 100644 main/res/layout/star_image.xml
 create mode 100644 main/res/layout/staticmaps_activity.xml
 create mode 100644 main/res/layout/staticmaps_activity_item.xml
 delete mode 100644 main/res/layout/touch.xml
 delete mode 100644 main/res/layout/useful_apps_activity.xml
 delete mode 100644 main/res/layout/useful_apps_item.xml
 create mode 100644 main/res/layout/usefulapps_activity.xml
 create mode 100644 main/res/layout/usefulapps_item.xml
 delete mode 100644 main/res/layout/visit.xml
 delete mode 100644 main/res/layout/visit_image.xml
 delete mode 100644 main/res/layout/visit_trackable.xml

(limited to 'main/res')

diff --git a/main/res/layout-land/compass_activity.xml b/main/res/layout-land/compass_activity.xml
new file mode 100644
index 0000000..e433814
--- /dev/null
+++ b/main/res/layout-land/compass_activity.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/destination"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="false"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:gravity="center_horizontal"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/cacheinfo"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="false"
+                android:layout_alignParentTop="false"
+                android:layout_below="@+id/destination"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:gravity="center_horizontal"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/heading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="left"
+                android:layout_marginLeft="3dip"
+                android:text="@null"
+                android:textColor="?text_color"
+                android:textSize="26sp" />
+
+            <TextView
+                android:id="@+id/distance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="right"
+                android:layout_marginRight="3dip"
+                android:text="@null"
+                android:textColor="?text_color"
+                android:textSize="26sp" />
+
+            <TextView
+                android:id="@+id/nav_location"
+                style="@style/location_current"
+                android:layout_above="@+id/status"
+                android:layout_alignParentBottom="false"
+                android:layout_alignParentLeft="false"
+                android:layout_alignParentTop="false"
+                android:layout_marginLeft="0dp"
+                android:layout_marginTop="95dp"
+                android:text="@string/loc_trying" />
+
+            <RelativeLayout
+                android:id="@+id/status"
+                android:layout_width="fill_parent"
+                android:layout_height="16dip"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="false"
+                android:layout_alignParentTop="false"
+                android:longClickable="true" >
+
+                <TextView
+                    android:id="@+id/nav_type"
+                    style="@style/location_current_type"
+                    android:textColor="?text_color_grey" />
+
+                <TextView
+                    android:id="@+id/nav_accuracy"
+                    style="@style/location_current_accuracy"
+                    android:textColor="?text_color_grey" />
+
+                <TextView
+                    android:id="@+id/nav_satellites"
+                    style="@style/location_current_satellites"
+                    android:textColor="?text_color_grey" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <view
+            android:id="@+id/rose"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginTop="6dip"
+            android:layout_weight="1"
+            class="cgeo.geocaching.ui.CompassView"
+            android:gravity="center"
+            android:keepScreenOn="true"
+            android:padding="4dip" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout-land/coordinatesinput_dialog.xml b/main/res/layout-land/coordinatesinput_dialog.xml
new file mode 100644
index 0000000..88e5e76
--- /dev/null
+++ b/main/res/layout-land/coordinatesinput_dialog.xml
@@ -0,0 +1,183 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linearLayout1"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <TextView
+            style="@style/action_bar_title"
+            android:text="@string/cache_coordinates" />
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/scroller"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fillViewport="true" >
+
+        <LinearLayout
+            android:id="@+id/scroller_child"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <Spinner
+                android:id="@+id/spinnerCoordinateFormats"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <TableLayout
+                android:id="@+id/coordTable"
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:stretchColumns="0,1,3,5,7" >
+
+                <TableRow android:id="@+id/tableRow1" >
+
+                    <Button
+                        android:id="@+id/ButtonLat"
+                        style="@style/button_full" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatDeg"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator1"
+                        android:text="°"
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatMin"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator2"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatSec"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator3"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatSecFrac"
+                        style="@style/edittext_full"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+                </TableRow>
+
+                <TableRow android:id="@+id/tableRow2" >
+
+                    <Button
+                        android:id="@+id/ButtonLon"
+                        style="@style/button_full" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonDeg"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator1"
+                        android:text="°"
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonMin"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator2"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonSec"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator3"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonSecFrac"
+                        style="@style/edittext_full"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+                </TableRow>
+            </TableLayout>
+
+            <EditText
+                android:id="@+id/latitude"
+                style="@style/edittext_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/latitude" />
+
+            <EditText
+                android:id="@+id/longitude"
+                style="@style/edittext_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/longitude" />
+
+            <LinearLayout
+                android:id="@+id/linearLayout2"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <Button
+                    android:id="@+id/current"
+                    style="@style/button_full"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/waypoint_my_coordinates" />
+
+                <Button
+                    android:id="@+id/cache"
+                    style="@style/button_full"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/waypoint_cache_coordinates" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/done"
+                style="@style/button_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_done" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
deleted file mode 100644
index 88e5e76..0000000
--- a/main/res/layout-land/coords.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout1"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <TextView
-            style="@style/action_bar_title"
-            android:text="@string/cache_coordinates" />
-    </LinearLayout>
-
-    <ScrollView
-        android:id="@+id/scroller"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true" >
-
-        <LinearLayout
-            android:id="@+id/scroller_child"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Spinner
-                android:id="@+id/spinnerCoordinateFormats"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <TableLayout
-                android:id="@+id/coordTable"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:stretchColumns="0,1,3,5,7" >
-
-                <TableRow android:id="@+id/tableRow1" >
-
-                    <Button
-                        android:id="@+id/ButtonLat"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-
-                <TableRow android:id="@+id/tableRow2" >
-
-                    <Button
-                        android:id="@+id/ButtonLon"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-            </TableLayout>
-
-            <EditText
-                android:id="@+id/latitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/latitude" />
-
-            <EditText
-                android:id="@+id/longitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/longitude" />
-
-            <LinearLayout
-                android:id="@+id/linearLayout2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <Button
-                    android:id="@+id/current"
-                    style="@style/button_full"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/waypoint_my_coordinates" />
-
-                <Button
-                    android:id="@+id/cache"
-                    style="@style/button_full"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/waypoint_cache_coordinates" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/done"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_done" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml
deleted file mode 100644
index d07f047..0000000
--- a/main/res/layout-land/navigate.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal" >
-
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/destination"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="false"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center"
-                android:gravity="center_horizontal"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/cacheinfo"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="false"
-                android:layout_alignParentTop="false"
-                android:layout_below="@+id/destination"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center"
-                android:gravity="center_horizontal"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/heading"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="left"
-                android:layout_marginLeft="3dip"
-                android:text="@null"
-                android:textColor="?text_color"
-                android:textSize="26sp" />
-
-            <TextView
-                android:id="@+id/distance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="right"
-                android:layout_marginRight="3dip"
-                android:text="@null"
-                android:textColor="?text_color"
-                android:textSize="26sp" />
-
-            <TextView
-                android:id="@+id/nav_location"
-                style="@style/location_current"
-                android:layout_above="@id/status"
-                android:layout_alignParentBottom="false"
-                android:layout_alignParentLeft="false"
-                android:layout_alignParentTop="false"
-                android:layout_marginLeft="0dp"
-                android:layout_marginTop="95dp"
-                android:text="@string/loc_trying" />
-
-            <RelativeLayout
-                android:id="@+id/status"
-                android:layout_width="fill_parent"
-                android:layout_height="16dip"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="false"
-                android:layout_alignParentTop="false"
-                android:longClickable="true" >
-
-                <TextView
-                    android:id="@+id/nav_type"
-                    style="@style/location_current_type"
-                    android:textColor="?text_color_grey" />
-
-                <TextView
-                    android:id="@+id/nav_accuracy"
-                    style="@style/location_current_accuracy"
-                    android:textColor="?text_color_grey" />
-
-                <TextView
-                    android:id="@+id/nav_satellites"
-                    style="@style/location_current_satellites"
-                    android:textColor="?text_color_grey" />
-            </RelativeLayout>
-        </RelativeLayout>
-
-        <view
-            android:id="@+id/rose"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="1dip"
-            android:layout_marginLeft="1dip"
-            android:layout_marginRight="1dip"
-            android:layout_marginTop="6dip"
-            android:layout_weight="1"
-            class="cgeo.geocaching.ui.CompassView"
-            android:gravity="center"
-            android:keepScreenOn="true"
-            android:padding="4dip" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresses.xml
deleted file mode 100644
index c48c28f..0000000
--- a/main/res/layout/addresses.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_margin="0dip"
-        android:background="?background_color"
-        android:cacheColorHint="?background_color"
-        android:dividerHeight="1dip"
-        android:padding="0dip" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresses_item.xml b/main/res/layout/addresses_item.xml
deleted file mode 100644
index dac1768..0000000
--- a/main/res/layout/addresses_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/button_map"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="3dip"
-    android:background="?background_color"
-    android:orientation="vertical"
-    android:paddingBottom="7dip"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip"
-    android:paddingTop="7dip" >
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:gravity="left"
-        android:scrollHorizontally="true"
-        android:singleLine="false"
-        android:textColor="?text_color"
-        android:textIsSelectable="false"
-        android:textSize="22sp" />
-
-    <TextView
-        android:id="@+id/distance"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:gravity="left"
-        android:lines="1"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textColor="?text_color"
-        android:textIsSelectable="false"
-        android:textSize="12sp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml
new file mode 100644
index 0000000..c48c28f
--- /dev/null
+++ b/main/res/layout/addresslist_activity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_margin="0dip"
+        android:background="?background_color"
+        android:cacheColorHint="?background_color"
+        android:dividerHeight="1dip"
+        android:padding="0dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresslist_item.xml b/main/res/layout/addresslist_item.xml
new file mode 100644
index 0000000..dac1768
--- /dev/null
+++ b/main/res/layout/addresslist_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_map"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="3dip"
+    android:background="?background_color"
+    android:orientation="vertical"
+    android:paddingBottom="7dip"
+    android:paddingLeft="5dip"
+    android:paddingRight="5dip"
+    android:paddingTop="7dip" >
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:gravity="left"
+        android:scrollHorizontally="true"
+        android:singleLine="false"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textSize="22sp" />
+
+    <TextView
+        android:id="@+id/distance"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:gravity="left"
+        android:lines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textSize="12sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_activity.xml b/main/res/layout/cachedetail_activity.xml
new file mode 100644
index 0000000..3afe5f6
--- /dev/null
+++ b/main/res/layout/cachedetail_activity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <include layout="@layout/actionbar_title" />
+
+        <include layout="@layout/actionbar_button_compass" />
+    </LinearLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <com.viewpagerindicator.TitlePageIndicator
+        android:id="@+id/pager_indicator"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/actionbar_background"
+        app:footerColor="#ff888888"
+        app:footerIndicatorHeight="3dp"
+        app:footerIndicatorStyle="underline"
+        app:textSize="16sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_description_page.xml b/main/res/layout/cachedetail_description_page.xml
new file mode 100644
index 0000000..5c05c20
--- /dev/null
+++ b/main/res/layout/cachedetail_description_page.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <!-- Short description -->
+
+        <TextView
+            android:id="@+id/shortdesc"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:layout_marginTop="12dip"
+            android:linksClickable="true"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <!-- Long description -->
+
+        <TextView
+            android:id="@+id/longdesc"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:layout_marginTop="12dip"
+            android:linksClickable="true"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/show_description"
+            style="@style/button_small"
+            android:layout_marginBottom="36dip"
+            android:layout_marginTop="12dip"
+            android:text="@string/cache_description_long"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:id="@+id/loading"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" >
+
+            <ProgressBar
+                style="?progressSpinnerLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:indeterminate="true"
+                android:indeterminateOnly="true" />
+        </RelativeLayout>
+
+        <!-- Hint and spoiler-images box -->
+
+        <LinearLayout
+            android:id="@+id/hint_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/cache_hint" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/hint"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:linksClickable="true"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/hint_spoilerlink"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginTop="6dip"
+                android:drawableLeft="?log_img_icon"
+                android:drawablePadding="3dip"
+                android:text="@string/cache_menu_spoilers"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <!-- Personal note box -->
+
+        <LinearLayout
+            android:id="@+id/personalnote_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:orientation="vertical" >
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/cache_personal_note" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/personalnote"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:linksClickable="true"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/edit_personalnote"
+                style="@style/button_small"
+                android:text="@string/cache_personal_note_edit" />
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_details_page.xml b/main/res/layout/cachedetail_details_page.xml
new file mode 100644
index 0000000..484385e
--- /dev/null
+++ b/main/res/layout/cachedetail_details_page.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scrollbars="none" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <!-- Details list -->
+
+        <LinearLayout
+            android:id="@+id/details_list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <!-- Attributes box -->
+
+        <LinearLayout
+            android:id="@+id/attributes_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <View
+                style="@style/separator_horizontal"
+                android:layout_marginBottom="9dp"
+                android:layout_marginTop="9dp" />
+
+            <!-- innerbox is only needed to define the paddings easily -->
+
+            <LinearLayout
+                android:id="@+id/attributes_innerbox"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="6dp"
+                android:paddingRight="6dp" />
+        </LinearLayout>
+
+        <!-- Offline box -->
+
+        <LinearLayout
+            android:id="@+id/offline_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <View
+                style="@style/separator_horizontal"
+                android:layout_marginBottom="9dp"
+                android:layout_marginTop="9dp" />
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:id="@+id/offline_text"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="130dip"
+                    android:paddingRight="3dip"
+                    android:textColor="?text_color"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/offline_refresh"
+                    style="@style/button_small"
+                    android:layout_width="60dip"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="71dip"
+                    android:text="@string/cache_offline_refresh"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/offline_store"
+                    style="@style/button_small"
+                    android:layout_width="60dip"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/cache_offline_store" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <!-- list box -->
+
+        <RelativeLayout
+            android:id="@+id/list_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <TextView
+                android:id="@+id/list_text"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="left"
+                android:layout_marginLeft="6dip"
+                android:layout_marginRight="130dip"
+                android:paddingRight="3dip"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/change_list"
+                style="@style/button_small"
+                android:layout_alignParentRight="true"
+                android:text="@string/cache_list_change"
+                android:visibility="visible" />
+        </RelativeLayout>
+
+        <!-- Watchlist box -->
+
+        <LinearLayout
+            android:id="@+id/watchlist_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <View
+                style="@style/separator_horizontal"
+                android:layout_marginBottom="9dp"
+                android:layout_marginTop="9dp" />
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:id="@+id/watchlist_text"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="130dip"
+                    android:paddingRight="3dip"
+                    android:textColor="?text_color"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/add_to_watchlist"
+                    style="@style/button_small"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/cache_watchlist_add"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/remove_from_watchlist"
+                    style="@style/button_small"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/cache_watchlist_remove"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <!-- Favorite points box -->
+
+        <LinearLayout
+            android:id="@+id/favpoint_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <View
+                style="@style/separator_horizontal"
+                android:layout_marginBottom="9dp"
+                android:layout_marginTop="9dp" />
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:id="@+id/favpoint_text"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="130dip"
+                    android:paddingRight="3dip"
+                    android:textColor="?text_color"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/add_to_favpoint"
+                    style="@style/button_small"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/cache_favpoint_add"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/remove_from_favpoint"
+                    style="@style/button_small"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/cache_favpoint_remove"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <!-- License Box -->
+
+        <LinearLayout
+            android:id="@+id/license_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/cache_license" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/license"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <!-- Map Preview Box -->
+
+        <LinearLayout
+            android:id="@+id/map_preview_box"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <View
+                style="@style/separator_horizontal"
+                android:layout_marginBottom="9dp"
+                android:layout_marginTop="9dp" />
+
+            <ImageView
+                android:id="@+id/map_preview"
+                android:layout_width="fill_parent"
+                android:layout_height="80dip"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:onClick="showNavigationMenu"
+                android:scaleType="centerCrop"
+                android:src="@null" />
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_images_page.xml b/main/res/layout/cachedetail_images_page.xml
new file mode 100644
index 0000000..2360dd0
--- /dev/null
+++ b/main/res/layout/cachedetail_images_page.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:id="@+id/spoiler_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_inventory_page.xml b/main/res/layout/cachedetail_inventory_page.xml
new file mode 100644
index 0000000..9acbba4
--- /dev/null
+++ b/main/res/layout/cachedetail_inventory_page.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:cacheColorHint="?background_color" >
+
+</ListView>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_logs_page.xml b/main/res/layout/cachedetail_logs_page.xml
new file mode 100644
index 0000000..9aafd83
--- /dev/null
+++ b/main/res/layout/cachedetail_logs_page.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:cacheColorHint="?background_color"
+    android:divider="?background_color"
+    android:fastScrollEnabled="true"
+    android:focusable="false"
+    android:footerDividersEnabled="false"
+    android:headerDividersEnabled="false"
+    android:listSelector="?background_color" >
+
+</ListView>
\ No newline at end of file
diff --git a/main/res/layout/cachedetail_waypoints_page.xml b/main/res/layout/cachedetail_waypoints_page.xml
new file mode 100644
index 0000000..8a24aa8
--- /dev/null
+++ b/main/res/layout/cachedetail_waypoints_page.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:id="@+id/waypoints"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/add_waypoint"
+            style="@style/button_full"
+            android:layout_marginTop="9dp"
+            android:text="@string/cache_waypoints_add" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
deleted file mode 100644
index 5c3abbc..0000000
--- a/main/res/layout/caches.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <include layout="@layout/actionbar_title" />
-
-        <include layout="@layout/actionbar_progress" />
-
-        <include layout="@layout/actionbar_button_map" />
-    </LinearLayout>
-
-    <include layout="@layout/filter_bar" />
-
-    <RelativeLayout
-        android:id="@+id/loading"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-
-        <ProgressBar
-            style="@android:style/Widget.ProgressBar.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:indeterminate="true"
-            android:indeterminateOnly="true" />
-    </RelativeLayout>
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_margin="0dip"
-        android:background="?background_color"
-        android:cacheColorHint="?background_color"
-        android:dividerHeight="1dip"
-        android:padding="0dip"
-        android:visibility="gone" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/caches_footer.xml b/main/res/layout/caches_footer.xml
deleted file mode 100644
index ed2de18..0000000
--- a/main/res/layout/caches_footer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/more_caches"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_gravity="center"
-    android:background="@drawable/actionbar_background"
-    android:ellipsize="marquee"
-    android:gravity="center"
-    android:lines="1"
-    android:padding="8dip"
-    android:scrollHorizontally="true"
-    android:singleLine="true"
-    android:text="@string/caches_no_cache"
-    android:textColor="@color/just_white"
-    android:textSize="16sp" />
diff --git a/main/res/layout/caches_images.xml b/main/res/layout/caches_images.xml
deleted file mode 100644
index 2360dd0..0000000
--- a/main/res/layout/caches_images.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="4dip" >
-
-    <LinearLayout
-        android:id="@+id/spoiler_list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml
deleted file mode 100644
index 3bd556b..0000000
--- a/main/res/layout/caches_item.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching"
-    android:id="@+id/one_cache"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?background_color" >
-
-    <!-- selection mode checkbox -->
-
-    <CheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_gravity="left"
-        android:gravity="left|center_horizontal"
-        android:paddingRight="5dip"
-        android:visibility="gone" />
-
-    <!-- "found" marker, vertical green/red line -->
-
-    <ImageView
-        android:id="@+id/log_status_mark"
-        android:layout_width="2dip"
-        android:layout_height="30dip"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="4dip"
-        android:layout_toRightOf="@id/checkbox"
-        android:scaleType="fitXY"
-        android:src="@drawable/mark_green"
-        android:visibility="gone" />
-
-    <!-- cache name and icon -->
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:layout_marginRight="110dip"
-        android:layout_toRightOf="@+id/log_status_mark"
-        android:ellipsize="marquee"
-        android:lines="1"
-        android:paddingRight="3dip"
-        android:paddingTop="5dip"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textColor="?text_color"
-        android:textIsSelectable="false"
-        android:textSize="18sp" />
-
-    <!-- cache attributes and other info -->
-
-    <TextView
-        android:id="@+id/info"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="left"
-        android:layout_marginRight="110dip"
-        android:layout_marginTop="30dip"
-        android:layout_toRightOf="@id/log_status_mark"
-        android:ellipsize="marquee"
-        android:lines="1"
-        android:paddingBottom="5dip"
-        android:paddingRight="3dip"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textColor="?text_color_grey"
-        android:textIsSelectable="false"
-        android:textSize="12sp" />
-
-    <!-- real text based direction and distance -->
-
-    <RelativeLayout
-        android:layout_width="78dip"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="1dip"
-        android:layout_marginRight="30dip"
-        android:layout_marginTop="1dip" >
-
-        <view
-            android:id="@+id/distance"
-            android:layout_width="78dip"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center"
-            class="cgeo.geocaching.ui.DistanceView"
-            android:ellipsize="marquee"
-            android:gravity="center"
-            android:lines="1"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textColor="?text_color"
-            android:textSize="16sp" />
-
-        <view
-            android:id="@+id/direction"
-            android:layout_width="78dip"
-            android:layout_height="28px"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center"
-            android:layout_marginTop="21dip"
-            class="cgeo.geocaching.ui.CompassMiniView"
-            android:gravity="center"
-            android:minHeight="28px"
-            android:minWidth="28px"
-            android:visibility="gone"
-            cc:skin="?compass" />
-
-        <ImageView
-            android:id="@+id/dirimg"
-            android:layout_width="78dip"
-            android:layout_height="28px"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center"
-            android:layout_marginTop="21dip"
-            android:gravity="center"
-            android:minHeight="28px"
-            android:minWidth="28px"
-            android:src="@null"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-    <!-- inventory and favorites -->
-
-    <RelativeLayout
-        android:layout_width="35dip"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="1dip"
-        android:layout_marginTop="1dip" >
-
-        <ImageView
-            android:id="@+id/inventory"
-            android:layout_width="35dip"
-            android:layout_height="22dip"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:background="?inventory"
-            android:scaleType="center"
-            android:src="@drawable/trackable_all" />
-
-        <TextView
-            android:id="@+id/favorite"
-            android:layout_width="35dip"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center"
-            android:layout_marginTop="22dip"
-            android:background="?favorite"
-            android:ellipsize="marquee"
-            android:gravity="center"
-            android:lines="1"
-            android:paddingBottom="1dip"
-            android:paddingLeft="3dip"
-            android:paddingRight="3dip"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textColor="?text_color"
-            android:textIsSelectable="false"
-            android:textSize="12sp"
-            android:textStyle="bold" />
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/cacheslist_activity.xml b/main/res/layout/cacheslist_activity.xml
new file mode 100644
index 0000000..5c3abbc
--- /dev/null
+++ b/main/res/layout/cacheslist_activity.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <include layout="@layout/actionbar_title" />
+
+        <include layout="@layout/actionbar_progress" />
+
+        <include layout="@layout/actionbar_button_map" />
+    </LinearLayout>
+
+    <include layout="@layout/filter_bar" />
+
+    <RelativeLayout
+        android:id="@+id/loading"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <ProgressBar
+            style="@android:style/Widget.ProgressBar.Large"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:indeterminate="true"
+            android:indeterminateOnly="true" />
+    </RelativeLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_margin="0dip"
+        android:background="?background_color"
+        android:cacheColorHint="?background_color"
+        android:dividerHeight="1dip"
+        android:padding="0dip"
+        android:visibility="gone" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cacheslist_footer.xml b/main/res/layout/cacheslist_footer.xml
new file mode 100644
index 0000000..ed2de18
--- /dev/null
+++ b/main/res/layout/cacheslist_footer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/more_caches"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_gravity="center"
+    android:background="@drawable/actionbar_background"
+    android:ellipsize="marquee"
+    android:gravity="center"
+    android:lines="1"
+    android:padding="8dip"
+    android:scrollHorizontally="true"
+    android:singleLine="true"
+    android:text="@string/caches_no_cache"
+    android:textColor="@color/just_white"
+    android:textSize="16sp" />
diff --git a/main/res/layout/cacheslist_item.xml b/main/res/layout/cacheslist_item.xml
new file mode 100644
index 0000000..3bd556b
--- /dev/null
+++ b/main/res/layout/cacheslist_item.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching"
+    android:id="@+id/one_cache"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="?background_color" >
+
+    <!-- selection mode checkbox -->
+
+    <CheckBox
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="left"
+        android:gravity="left|center_horizontal"
+        android:paddingRight="5dip"
+        android:visibility="gone" />
+
+    <!-- "found" marker, vertical green/red line -->
+
+    <ImageView
+        android:id="@+id/log_status_mark"
+        android:layout_width="2dip"
+        android:layout_height="30dip"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="4dip"
+        android:layout_toRightOf="@id/checkbox"
+        android:scaleType="fitXY"
+        android:src="@drawable/mark_green"
+        android:visibility="gone" />
+
+    <!-- cache name and icon -->
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginRight="110dip"
+        android:layout_toRightOf="@+id/log_status_mark"
+        android:ellipsize="marquee"
+        android:lines="1"
+        android:paddingRight="3dip"
+        android:paddingTop="5dip"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textSize="18sp" />
+
+    <!-- cache attributes and other info -->
+
+    <TextView
+        android:id="@+id/info"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="left"
+        android:layout_marginRight="110dip"
+        android:layout_marginTop="30dip"
+        android:layout_toRightOf="@id/log_status_mark"
+        android:ellipsize="marquee"
+        android:lines="1"
+        android:paddingBottom="5dip"
+        android:paddingRight="3dip"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color_grey"
+        android:textIsSelectable="false"
+        android:textSize="12sp" />
+
+    <!-- real text based direction and distance -->
+
+    <RelativeLayout
+        android:layout_width="78dip"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="1dip"
+        android:layout_marginRight="30dip"
+        android:layout_marginTop="1dip" >
+
+        <view
+            android:id="@+id/distance"
+            android:layout_width="78dip"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            class="cgeo.geocaching.ui.DistanceView"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:lines="1"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textColor="?text_color"
+            android:textSize="16sp" />
+
+        <view
+            android:id="@+id/direction"
+            android:layout_width="78dip"
+            android:layout_height="28px"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:layout_marginTop="21dip"
+            class="cgeo.geocaching.ui.CompassMiniView"
+            android:gravity="center"
+            android:minHeight="28px"
+            android:minWidth="28px"
+            android:visibility="gone"
+            cc:skin="?compass" />
+
+        <ImageView
+            android:id="@+id/dirimg"
+            android:layout_width="78dip"
+            android:layout_height="28px"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:layout_marginTop="21dip"
+            android:gravity="center"
+            android:minHeight="28px"
+            android:minWidth="28px"
+            android:src="@null"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <!-- inventory and favorites -->
+
+    <RelativeLayout
+        android:layout_width="35dip"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="1dip"
+        android:layout_marginTop="1dip" >
+
+        <ImageView
+            android:id="@+id/inventory"
+            android:layout_width="35dip"
+            android:layout_height="22dip"
+            android:layout_alignParentTop="true"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:background="?inventory"
+            android:scaleType="center"
+            android:src="@drawable/trackable_all" />
+
+        <TextView
+            android:id="@+id/favorite"
+            android:layout_width="35dip"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:layout_marginTop="22dip"
+            android:background="?favorite"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:lines="1"
+            android:paddingBottom="1dip"
+            android:paddingLeft="3dip"
+            android:paddingRight="3dip"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textColor="?text_color"
+            android:textIsSelectable="false"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
deleted file mode 100644
index 3afe5f6..0000000
--- a/main/res/layout/cacheview.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <include layout="@layout/actionbar_title" />
-
-        <include layout="@layout/actionbar_button_compass" />
-    </LinearLayout>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/viewpager"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <com.viewpagerindicator.TitlePageIndicator
-        android:id="@+id/pager_indicator"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/actionbar_background"
-        app:footerColor="#ff888888"
-        app:footerIndicatorHeight="3dp"
-        app:footerIndicatorStyle="underline"
-        app:textSize="16sp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cacheview_description.xml
deleted file mode 100644
index 5c05c20..0000000
--- a/main/res/layout/cacheview_description.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <!-- Short description -->
-
-        <TextView
-            android:id="@+id/shortdesc"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dip"
-            android:layout_marginTop="12dip"
-            android:linksClickable="true"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp"
-            android:visibility="gone" />
-
-        <!-- Long description -->
-
-        <TextView
-            android:id="@+id/longdesc"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dip"
-            android:layout_marginTop="12dip"
-            android:linksClickable="true"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/show_description"
-            style="@style/button_small"
-            android:layout_marginBottom="36dip"
-            android:layout_marginTop="12dip"
-            android:text="@string/cache_description_long"
-            android:visibility="gone" />
-
-        <RelativeLayout
-            android:id="@+id/loading"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" >
-
-            <ProgressBar
-                style="?progressSpinnerLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:indeterminate="true"
-                android:indeterminateOnly="true" />
-        </RelativeLayout>
-
-        <!-- Hint and spoiler-images box -->
-
-        <LinearLayout
-            android:id="@+id/hint_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dip"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/cache_hint" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/hint"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:linksClickable="true"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/hint_spoilerlink"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginTop="6dip"
-                android:drawableLeft="?log_img_icon"
-                android:drawablePadding="3dip"
-                android:text="@string/cache_menu_spoilers"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-        </LinearLayout>
-
-        <!-- Personal note box -->
-
-        <LinearLayout
-            android:id="@+id/personalnote_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dip"
-            android:orientation="vertical" >
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/cache_personal_note" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/personalnote"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:linksClickable="true"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/edit_personalnote"
-                style="@style/button_small"
-                android:text="@string/cache_personal_note_edit" />
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cacheview_details.xml
deleted file mode 100644
index 484385e..0000000
--- a/main/res/layout/cacheview_details.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:scrollbars="none" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <!-- Details list -->
-
-        <LinearLayout
-            android:id="@+id/details_list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-
-        <!-- Attributes box -->
-
-        <LinearLayout
-            android:id="@+id/attributes_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <View
-                style="@style/separator_horizontal"
-                android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp" />
-
-            <!-- innerbox is only needed to define the paddings easily -->
-
-            <LinearLayout
-                android:id="@+id/attributes_innerbox"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp" />
-        </LinearLayout>
-
-        <!-- Offline box -->
-
-        <LinearLayout
-            android:id="@+id/offline_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <View
-                style="@style/separator_horizontal"
-                android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp" />
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/offline_text"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="left"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="130dip"
-                    android:paddingRight="3dip"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-
-                <Button
-                    android:id="@+id/offline_refresh"
-                    style="@style/button_small"
-                    android:layout_width="60dip"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="71dip"
-                    android:text="@string/cache_offline_refresh"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/offline_store"
-                    style="@style/button_small"
-                    android:layout_width="60dip"
-                    android:layout_alignParentRight="true"
-                    android:text="@string/cache_offline_store" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <!-- list box -->
-
-        <RelativeLayout
-            android:id="@+id/list_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <TextView
-                android:id="@+id/list_text"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="left"
-                android:layout_marginLeft="6dip"
-                android:layout_marginRight="130dip"
-                android:paddingRight="3dip"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/change_list"
-                style="@style/button_small"
-                android:layout_alignParentRight="true"
-                android:text="@string/cache_list_change"
-                android:visibility="visible" />
-        </RelativeLayout>
-
-        <!-- Watchlist box -->
-
-        <LinearLayout
-            android:id="@+id/watchlist_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <View
-                style="@style/separator_horizontal"
-                android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp" />
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/watchlist_text"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="left"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="130dip"
-                    android:paddingRight="3dip"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-
-                <Button
-                    android:id="@+id/add_to_watchlist"
-                    style="@style/button_small"
-                    android:layout_alignParentRight="true"
-                    android:text="@string/cache_watchlist_add"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/remove_from_watchlist"
-                    style="@style/button_small"
-                    android:layout_alignParentRight="true"
-                    android:text="@string/cache_watchlist_remove"
-                    android:visibility="gone" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <!-- Favorite points box -->
-
-        <LinearLayout
-            android:id="@+id/favpoint_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <View
-                style="@style/separator_horizontal"
-                android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp" />
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/favpoint_text"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="left"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="130dip"
-                    android:paddingRight="3dip"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-
-                <Button
-                    android:id="@+id/add_to_favpoint"
-                    style="@style/button_small"
-                    android:layout_alignParentRight="true"
-                    android:text="@string/cache_favpoint_add"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/remove_from_favpoint"
-                    style="@style/button_small"
-                    android:layout_alignParentRight="true"
-                    android:text="@string/cache_favpoint_remove"
-                    android:visibility="gone" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <!-- License Box -->
-
-        <LinearLayout
-            android:id="@+id/license_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/cache_license" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/license"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-        </LinearLayout>
-
-        <!-- Map Preview Box -->
-
-        <LinearLayout
-            android:id="@+id/map_preview_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <View
-                style="@style/separator_horizontal"
-                android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp" />
-
-            <ImageView
-                android:id="@+id/map_preview"
-                android:layout_width="fill_parent"
-                android:layout_height="80dip"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:onClick="showNavigationMenu"
-                android:scaleType="centerCrop"
-                android:src="@null" />
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_inventory.xml b/main/res/layout/cacheview_inventory.xml
deleted file mode 100644
index 9acbba4..0000000
--- a/main/res/layout/cacheview_inventory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:cacheColorHint="?background_color" >
-
-</ListView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_logs.xml b/main/res/layout/cacheview_logs.xml
deleted file mode 100644
index 9aafd83..0000000
--- a/main/res/layout/cacheview_logs.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:cacheColorHint="?background_color"
-    android:divider="?background_color"
-    android:fastScrollEnabled="true"
-    android:focusable="false"
-    android:footerDividersEnabled="false"
-    android:headerDividersEnabled="false"
-    android:listSelector="?background_color" >
-
-</ListView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cacheview_waypoints.xml
deleted file mode 100644
index 8a24aa8..0000000
--- a/main/res/layout/cacheview_waypoints.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:id="@+id/waypoints"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/add_waypoint"
-            style="@style/button_full"
-            android:layout_marginTop="9dp"
-            android:text="@string/cache_waypoints_add" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/compass_activity.xml b/main/res/layout/compass_activity.xml
new file mode 100644
index 0000000..b994b70
--- /dev/null
+++ b/main/res/layout/compass_activity.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/info1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/destination"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="?text_color"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/cacheinfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="?text_color"
+            android:textSize="14sp" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="30dip" >
+
+            <TextView
+                android:id="@+id/heading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_gravity="left"
+                android:layout_marginLeft="3dip"
+                android:text="@null"
+                android:textColor="?text_color"
+                android:textSize="26sp" />
+
+            <TextView
+                android:id="@+id/distance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_gravity="right"
+                android:layout_marginRight="3dip"
+                android:text="@null"
+                android:textColor="?text_color"
+                android:textSize="26sp" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/info2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/nav_location"
+            style="@style/location_current"
+            android:text="@string/loc_trying" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="16dip" >
+
+            <TextView
+                android:id="@+id/nav_type"
+                style="@style/location_current_type"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
+
+            <TextView
+                android:id="@+id/nav_accuracy"
+                style="@style/location_current_accuracy"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
+
+            <TextView
+                android:id="@+id/nav_satellites"
+                style="@style/location_current_satellites"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <view
+        android:id="@+id/rose"
+        android:layout_width="fill_parent"
+        android:layout_height="295dip"
+        android:layout_above="@id/info2"
+        android:layout_below="@id/info1"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="1dip"
+        android:layout_marginLeft="1dip"
+        android:layout_marginRight="1dip"
+        android:layout_marginTop="6dip"
+        class="cgeo.geocaching.ui.CompassView"
+        android:gravity="center"
+        android:keepScreenOn="true"
+        android:minHeight="289dip"
+        android:minWidth="289dip"
+        android:padding="4dip" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml
new file mode 100644
index 0000000..4603360
--- /dev/null
+++ b/main/res/layout/coordinatesinput_dialog.xml
@@ -0,0 +1,175 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linearLayout1"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <TextView
+            style="@style/action_bar_title"
+            android:text="@string/cache_coordinates" />
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/scroller"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fillViewport="true" >
+
+        <LinearLayout
+            android:id="@+id/scroller_child"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <Spinner
+                android:id="@+id/spinnerCoordinateFormats"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <TableLayout
+                android:id="@+id/coordTable"
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:stretchColumns="0,1,3,5,7" >
+
+                <TableRow android:id="@+id/tableRow1" >
+
+                    <Button
+                        android:id="@+id/ButtonLat"
+                        style="@style/button_full" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatDeg"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator1"
+                        android:text="°"
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatMin"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator2"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatSec"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LatSeparator3"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLatSecFrac"
+                        style="@style/edittext_full"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+                </TableRow>
+
+                <TableRow android:id="@+id/tableRow2" >
+
+                    <Button
+                        android:id="@+id/ButtonLon"
+                        style="@style/button_full" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonDeg"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator1"
+                        android:text="°"
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonMin"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator2"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonSec"
+                        style="@style/edittext_full"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+
+                    <TextView
+                        android:id="@+id/LonSeparator3"
+                        android:text=","
+                        tools:ignore="HardcodedText" />
+
+                    <EditText
+                        android:id="@+id/EditTextLonSecFrac"
+                        style="@style/edittext_full"
+                        android:inputType="number"
+                        android:selectAllOnFocus="true" />
+                </TableRow>
+            </TableLayout>
+
+            <EditText
+                android:id="@+id/latitude"
+                style="@style/edittext_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/latitude" />
+
+            <EditText
+                android:id="@+id/longitude"
+                style="@style/edittext_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/longitude" />
+
+            <Button
+                android:id="@+id/current"
+                style="@style/button_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_my_coordinates" />
+
+            <Button
+                android:id="@+id/cache"
+                style="@style/button_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_cache_coordinates" />
+
+            <Button
+                android:id="@+id/done"
+                style="@style/button_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/waypoint_done" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
deleted file mode 100644
index 4603360..0000000
--- a/main/res/layout/coords.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout1"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <TextView
-            style="@style/action_bar_title"
-            android:text="@string/cache_coordinates" />
-    </LinearLayout>
-
-    <ScrollView
-        android:id="@+id/scroller"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true" >
-
-        <LinearLayout
-            android:id="@+id/scroller_child"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Spinner
-                android:id="@+id/spinnerCoordinateFormats"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <TableLayout
-                android:id="@+id/coordTable"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:stretchColumns="0,1,3,5,7" >
-
-                <TableRow android:id="@+id/tableRow1" >
-
-                    <Button
-                        android:id="@+id/ButtonLat"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-
-                <TableRow android:id="@+id/tableRow2" >
-
-                    <Button
-                        android:id="@+id/ButtonLon"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-            </TableLayout>
-
-            <EditText
-                android:id="@+id/latitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/latitude" />
-
-            <EditText
-                android:id="@+id/longitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/longitude" />
-
-            <Button
-                android:id="@+id/current"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_my_coordinates" />
-
-            <Button
-                android:id="@+id/cache"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_cache_coordinates" />
-
-            <Button
-                android:id="@+id/done"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_done" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
deleted file mode 100644
index 657e9f4..0000000
--- a/main/res/layout/edit_waypoint_activity.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Button
-                android:id="@+id/buttonLatitude"
-                style="@style/button_full"
-                android:hint="@string/latitude" />
-
-            <Button
-                android:id="@+id/buttonLongitude"
-                style="@style/button_full"
-                android:hint="@string/longitude" />
-
-            <EditText
-                android:id="@+id/bearing"
-                style="@style/edittext_full"
-                android:hint="@string/waypoint_bearing"
-                android:inputType="numberDecimal" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <EditText
-                    android:id="@+id/distance"
-                    style="@style/edittext_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:hint="@string/waypoint_distance"
-                    android:inputType="numberDecimal" />
-
-                <Spinner
-                    android:id="@+id/distanceUnit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/distance_units" />
-            </LinearLayout>
-
-            <AutoCompleteTextView
-                android:id="@+id/name"
-                style="@style/edittext_full"
-                android:hint="@string/waypoint_name" />
-
-            <Spinner
-                android:id="@+id/type"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <EditText
-                android:id="@+id/note"
-                style="@style/edittext_full"
-                android:layout_height="wrap_content"
-                android:hint="@string/waypoint_note"
-                android:inputType="textMultiLine|textCapSentences"
-                android:minLines="5"
-                android:singleLine="false" />
-
-            <CheckBox
-                android:id="@+id/wpt_visited_checkbox"
-                style="@style/checkbox_full"
-                android:text="@string/waypoint_visited" />
-
-            <RadioGroup
-                android:id="@+id/modify_cache_coordinates_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" >
-
-                <RadioButton
-                    android:id="@+id/modify_cache_coordinates_nothing"
-                    style="@style/radiobutton_wrap"
-                    android:checked="true"
-                    android:text="@string/waypoint_do_not_touch_cache_coordinates" />
-
-                <RadioButton
-                    android:id="@+id/modify_cache_coordinates_local"
-                    style="@style/radiobutton_wrap"
-                    android:text="@string/waypoint_set_as_cache_coords" />
-
-                <RadioButton
-                    android:id="@+id/modify_cache_coordinates_local_and_remote"
-                    style="@style/radiobutton_wrap"
-                    android:text="@string/waypoint_save_and_modify_on_website"
-                    android:visibility="gone" />
-            </RadioGroup>
-
-            <Button
-                android:id="@+id/add_waypoint"
-                style="@style/button_full"
-                android:text="@string/waypoint_save" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/editwaypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml
new file mode 100644
index 0000000..657e9f4
--- /dev/null
+++ b/main/res/layout/editwaypoint_activity.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <Button
+                android:id="@+id/buttonLatitude"
+                style="@style/button_full"
+                android:hint="@string/latitude" />
+
+            <Button
+                android:id="@+id/buttonLongitude"
+                style="@style/button_full"
+                android:hint="@string/longitude" />
+
+            <EditText
+                android:id="@+id/bearing"
+                style="@style/edittext_full"
+                android:hint="@string/waypoint_bearing"
+                android:inputType="numberDecimal" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <EditText
+                    android:id="@+id/distance"
+                    style="@style/edittext_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:hint="@string/waypoint_distance"
+                    android:inputType="numberDecimal" />
+
+                <Spinner
+                    android:id="@+id/distanceUnit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/distance_units" />
+            </LinearLayout>
+
+            <AutoCompleteTextView
+                android:id="@+id/name"
+                style="@style/edittext_full"
+                android:hint="@string/waypoint_name" />
+
+            <Spinner
+                android:id="@+id/type"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <EditText
+                android:id="@+id/note"
+                style="@style/edittext_full"
+                android:layout_height="wrap_content"
+                android:hint="@string/waypoint_note"
+                android:inputType="textMultiLine|textCapSentences"
+                android:minLines="5"
+                android:singleLine="false" />
+
+            <CheckBox
+                android:id="@+id/wpt_visited_checkbox"
+                style="@style/checkbox_full"
+                android:text="@string/waypoint_visited" />
+
+            <RadioGroup
+                android:id="@+id/modify_cache_coordinates_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone" >
+
+                <RadioButton
+                    android:id="@+id/modify_cache_coordinates_nothing"
+                    style="@style/radiobutton_wrap"
+                    android:checked="true"
+                    android:text="@string/waypoint_do_not_touch_cache_coordinates" />
+
+                <RadioButton
+                    android:id="@+id/modify_cache_coordinates_local"
+                    style="@style/radiobutton_wrap"
+                    android:text="@string/waypoint_set_as_cache_coords" />
+
+                <RadioButton
+                    android:id="@+id/modify_cache_coordinates_local_and_remote"
+                    style="@style/radiobutton_wrap"
+                    android:text="@string/waypoint_save_and_modify_on_website"
+                    android:visibility="gone" />
+            </RadioGroup>
+
+            <Button
+                android:id="@+id/add_waypoint"
+                style="@style/button_full"
+                android:text="@string/waypoint_save" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/images_activity.xml b/main/res/layout/images_activity.xml
new file mode 100644
index 0000000..ccd8499
--- /dev/null
+++ b/main/res/layout/images_activity.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <include layout="@layout/cachedetail_images_page" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/imageselect_activity.xml b/main/res/layout/imageselect_activity.xml
new file mode 100644
index 0000000..fd8eaea
--- /dev/null
+++ b/main/res/layout/imageselect_activity.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <include layout="@layout/actionbar_title" />
+
+        <include layout="@layout/actionbar_progress" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/log_image" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dip"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/stored"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:text="@string/log_image_stored" />
+
+                <Button
+                    android:id="@+id/camera"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:text="@string/log_image_camera" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/image_preview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginTop="5dip"
+                android:background="#000000"
+                android:padding="1dp"
+                android:visibility="gone" />
+
+            <EditText
+                android:id="@+id/caption"
+                style="@style/edittext_full"
+                android:layout_height="wrap_content"
+                android:hint="@string/log_image_caption"
+                android:inputType="textCapSentences"
+                android:maxLength="50"
+                android:minLines="1"
+                android:singleLine="false" />
+
+            <EditText
+                android:id="@+id/description"
+                style="@style/edittext_full"
+                android:layout_height="wrap_content"
+                android:hint="@string/log_image_description"
+                android:inputType="textMultiLine|textCapSentences"
+                android:maxLength="250"
+                android:minLines="5"
+                android:singleLine="false" />
+
+            <Spinner
+                android:id="@+id/logImageScale"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:entries="@array/log_image_scales"
+                android:prompt="@string/log_image_scale" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/save"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:text="@android:string/yes" />
+
+                <Button
+                    android:id="@+id/cancel"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:text="@android:string/no" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
deleted file mode 100644
index ae70fa7..0000000
--- a/main/res/layout/init.xml
+++ /dev/null
@@ -1,853 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_geocaching" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="3dip"
-                android:orientation="horizontal"
-                android:padding="3dip" >
-
-                <CheckBox
-                    android:id="@+id/gc_option"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:gravity="center"
-                    android:padding="1dip" />
-
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:paddingRight="3dip"
-                    android:text="@string/init_gc_activate"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/legal_note"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/legal_note"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/username"
-                style="@style/edittext_full"
-                android:hint="@string/init_username" />
-
-            <EditText
-                android:id="@+id/password"
-                style="@style/edittext_full"
-                android:hint="@string/init_password"
-                android:inputType="textPassword" />
-
-            <Button
-                android:id="@+id/log_me_in"
-                style="@style/button_full"
-                android:lines="2"
-                android:scrollHorizontally="false"
-                android:singleLine="false"
-                android:text="@string/init_login" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_oc" />
-            </RelativeLayout>
-
-            <CheckBox
-                android:id="@+id/oc_option"
-                style="@style/checkbox_full"
-                android:text="@string/init_oc_activate" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:padding="3dip"
-                android:text="@string/init_oc_de_description"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/register_oc_de"
-                style="@style/button_full"
-                android:text="@string/init_register_oc_de" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_gcvote" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/passvote"
-                style="@style/edittext_full"
-                android:hint="@string/init_passvote"
-                android:inputType="textPassword" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_twitter" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/about_twitter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/about_twitter"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/authorize_twitter"
-                style="@style/button_full"
-                android:text="@string/init_twitter_authorize" />
-
-            <CheckBox
-                android:id="@+id/twitter_option"
-                style="@style/checkbox_full"
-                android:text="@string/init_twitter_publish" />
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_signature" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/signature"
-                style="@style/edittext_full"
-                android:layout_height="wrap_content"
-                android:hint="@string/init_signature"
-                android:inputType="textMultiLine|textCapSentences"
-                android:minLines="3"
-                android:singleLine="false" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/signature_template"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:layout_weight="2"
-                    android:text="@string/init_signature_template_button"
-                    android:textSize="14sp" />
-
-                <Button
-                    android:id="@+id/signature_help"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/init_signature_help_button"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <CheckBox
-                android:id="@+id/sigautoinsert"
-                style="@style/checkbox_full"
-                android:text="@string/init_sigautoinsert" />
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_details" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_margin="3dip"
-                android:orientation="vertical"
-                android:padding="3dip" >
-
-                <CheckBox
-                    android:id="@+id/autoload"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_autoload" />
-
-                <CheckBox
-                    android:id="@+id/ratingwanted"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_ratingwanted" />
-
-                <CheckBox
-                    android:id="@+id/elevationwanted"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_elevationwanted" />
-
-                <CheckBox
-                    android:id="@+id/friendlogswanted"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_friendlogswanted" />
-
-                <CheckBox
-                    android:id="@+id/openlastdetailspage"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_openlastdetailspage" />
-
-                <CheckBox
-                    android:id="@+id/offline"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_offline" />
-
-                <CheckBox
-                    android:id="@+id/offline_wp"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_offline_wp" />
-
-                <CheckBox
-                    android:id="@+id/save_log_img"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_save_log_img" />
-            </LinearLayout>
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_other" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_margin="3dip"
-                android:orientation="vertical"
-                android:padding="3dip" >
-
-                <CheckBox
-                    android:id="@+id/skin"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_skin" />
-
-                <CheckBox
-                    android:id="@+id/address"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_address" />
-
-                <CheckBox
-                    android:id="@+id/captcha"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_captcha" />
-
-                <CheckBox
-                    android:id="@+id/livelist"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_livelist" />
-
-                <CheckBox
-                    android:id="@+id/loaddirectionimg"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_loaddirectionimg" />
-
-                <CheckBox
-                    android:id="@+id/useenglish"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_useenglish" />
-
-                <CheckBox
-                    android:id="@+id/units"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_units" />
-
-                <CheckBox
-                    android:id="@+id/exclude"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_exclude" />
-
-                <CheckBox
-                    android:id="@+id/disabled"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_disabled" />
-
-                <CheckBox
-                    android:id="@+id/trackautovisit"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_trackautovisit" />
-
-                <CheckBox
-                    android:id="@+id/log_offline"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_log_offline" />
-
-                <CheckBox
-                    android:id="@+id/choose_list"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_choose_list" />
-
-                <CheckBox
-                    android:id="@+id/trail"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_maptrail" />
-
-                <CheckBox
-                    android:id="@+id/plain_logs"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_plain_logs" />
-
-                <CheckBox
-                    android:id="@+id/use_native_ua"
-                    style="@style/checkbox_full"
-                    android:text="@string/init_use_native_ua" />
-            </LinearLayout>
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_showwaypoints" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/showwaypointsthreshold"
-                style="@style/edittext_full"
-                android:inputType="number"
-                android:lines="1"
-                android:scrollHorizontally="true"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_showwaypoint_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-            <!-- maps -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_mapsources" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:autoLink="web"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_mapsources_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Spinner
-                android:id="@+id/mapsource"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/init_mapsource_select" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:autoLink="web"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_map_directory_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:id="@+id/init_mapdir_group"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/select_map_directory"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:text="@string/init_select_map_directory" />
-
-                <EditText
-                    android:id="@+id/map_directory"
-                    style="@style/edittext_full"
-                    android:inputType="textNoSuggestions"
-                    android:lines="1"
-                    android:scrollHorizontally="true"
-                    android:singleLine="true" />
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:gravity="left"
-                android:padding="3dip"
-                android:text="@string/init_rendertheme_folder"
-                android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:id="@+id/init_themefilegroup"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/select_themefolder"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:text="@string/init_select_themefolder" />
-
-                <EditText
-                    android:id="@+id/themefolder"
-                    style="@style/edittext_full"
-                    android:inputType="textNoSuggestions"
-                    android:lines="1"
-                    android:scrollHorizontally="true"
-                    android:singleLine="true" />
-            </LinearLayout>
-
-            <!-- GPX -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_gpx_exportdir" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:autoLink="web"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_gpx_exportdir_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:id="@+id/init_gpx_export_group"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/select_gpx_exportdir"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:text="@string/init_select_gpx_exportdir" />
-
-                <EditText
-                    android:id="@+id/gpx_exportdir"
-                    style="@style/edittext_full"
-                    android:inputType="textNoSuggestions"
-                    android:lines="1"
-                    android:scrollHorizontally="true"
-                    android:singleLine="true" />
-            </LinearLayout>
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_gpx_importdir" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:autoLink="web"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_gpx_importdir_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:id="@+id/init_gpx_import_group"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/select_gpx_importdir"
-                    style="@style/button_full"
-                    android:layout_width="wrap_content"
-                    android:text="@string/init_select_gpx_importdir" />
-
-                <EditText
-                    android:id="@+id/gpx_importdir"
-                    style="@style/edittext_full"
-                    android:inputType="textNoSuggestions"
-                    android:lines="1"
-                    android:scrollHorizontally="true"
-                    android:singleLine="true" />
-            </LinearLayout>
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_altitude" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/altitude"
-                style="@style/edittext_full"
-                android:inputType="numberSigned"
-                android:lines="1"
-                android:scrollHorizontally="true"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_altitude_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_default_navigation_tool" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_default_navigation_tool_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Spinner
-                android:id="@+id/default_navigation_tool"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/init_default_navigation_tool_select" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_default_navigation_tool_2_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Spinner
-                android:id="@+id/default_navigation_tool_2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/init_default_navigation_tool_select" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_sendToCgeo" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_sendToCgeo_name"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/webDeviceName"
-                style="@style/edittext_full"
-                android:inputType="textNoSuggestions"
-                android:lines="1"
-                android:maxLength="15"
-                android:scrollHorizontally="true"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:autoLink="web"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_sendToCgeo_description"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/sendToCgeo_register"
-                style="@style/button_full"
-                android:text="@string/init_sendToCgeo_register" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_backup" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/backup_last"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@null"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="3dip"
-                android:orientation="horizontal"
-                android:padding="3dip" >
-
-                <Button
-                    android:id="@+id/backup_backup"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:onClick="backup"
-                    android:text="@string/init_backup_backup" />
-
-                <Button
-                    android:id="@+id/backup_restore"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:onClick="restore"
-                    android:text="@string/init_backup_restore" />
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_backup_note"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_dbonsdcard_title" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_dbonsdcard_note"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <CheckBox
-                android:id="@+id/dbonsdcard"
-                style="@style/checkbox_full"
-                android:text="@string/init_dbonsdcard" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/init_debug_title" />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:linksClickable="true"
-                android:padding="3dip"
-                android:text="@string/init_debug_note"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <CheckBox
-                android:id="@+id/debug"
-                style="@style/checkbox_full"
-                android:text="@string/init_debug" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml
new file mode 100644
index 0000000..e0294da
--- /dev/null
+++ b/main/res/layout/logcache_activity.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <include layout="@layout/actionbar_title" />
+
+        <include layout="@layout/actionbar_progress" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dip"
+                android:orientation="vertical" >
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <Button
+                        android:id="@+id/type"
+                        style="@style/button_full"
+                        android:layout_width="0dip"
+                        android:layout_weight="1" />
+
+                    <Button
+                        android:id="@+id/date"
+                        style="@style/button_full"
+                        android:layout_width="0dip"
+                        android:layout_weight="1" />
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/log"
+                    style="@style/edittext_full"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/log_new_log_text"
+                    android:inputType="textMultiLine|textCapSentences"
+                    android:maxLength="4000"
+                    android:minLines="5"
+                    android:singleLine="false" />
+
+                <LinearLayout
+                    android:id="@+id/tweet_box"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dip"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:orientation="horizontal"
+                    android:visibility="gone" >
+
+                    <CheckBox
+                        android:id="@+id/tweet"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left"
+                        android:gravity="center"
+                        android:padding="2sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:gravity="left"
+                        android:paddingRight="3dip"
+                        android:text="@string/visit_tweet"
+                        android:textColor="?text_color"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/image_btn"
+                    style="@style/button_full"
+                    android:text="@string/log_image_attach" />
+
+                <Button
+                    android:id="@+id/post"
+                    style="@style/button_full"
+                    android:text="@string/log_post" />
+
+                <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                    <View style="@style/separator_horizontal" />
+
+                    <TextView
+                        style="@style/separator_horizontal_headline"
+                        android:text="@string/cache_log_offline" />
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <Button
+                        android:id="@+id/save"
+                        style="@style/button_full"
+                        android:layout_width="0dip"
+                        android:layout_weight="1"
+                        android:text="@string/log_save" />
+
+                    <Button
+                        android:id="@+id/clear"
+                        style="@style/button_full"
+                        android:layout_width="0dip"
+                        android:layout_weight="1"
+                        android:text="@string/log_clear" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/inventory_box"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dip"
+                android:layout_marginTop="10dip"
+                android:orientation="vertical"
+                android:visibility="gone" >
+
+                <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                    <View style="@style/separator_horizontal" />
+
+                    <TextView
+                        style="@style/separator_horizontal_headline"
+                        android:text="@string/cache_inventory" />
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/inventory"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" >
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/inventory_changeall"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:orientation="vertical"
+                    android:visibility="gone" >
+
+                    <Button
+                        android:id="@+id/changebutton"
+                        style="@style/button_full"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_marginBottom="5dip"
+                        android:layout_marginLeft="10dip"
+                        android:layout_marginRight="10dip"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="@string/log_tb_changeall"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/logcache_trackable_item.xml b/main/res/layout/logcache_trackable_item.xml
new file mode 100644
index 0000000..1eab116
--- /dev/null
+++ b/main/res/layout/logcache_trackable_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="5dip"
+    android:orientation="horizontal"
+    android:paddingBottom="10dip"
+    android:paddingLeft="10dip"
+    android:paddingRight="10dip" >
+
+    <LinearLayout
+        android:id="@+id/info"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:ellipsize="marquee"
+            android:gravity="left"
+            android:lines="1"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textColor="?text_color"
+            android:textIsSelectable="false"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/trackcode"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:ellipsize="marquee"
+            android:gravity="left"
+            android:lines="1"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textColor="?text_color"
+            android:textIsSelectable="false"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/action"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_weight="1"
+        android:ellipsize="marquee"
+        android:gravity="right"
+        android:lines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textSize="14sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/logtrackable_activity.xml b/main/res/layout/logtrackable_activity.xml
new file mode 100644
index 0000000..7791409
--- /dev/null
+++ b/main/res/layout/logtrackable_activity.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <include layout="@layout/actionbar_title" />
+
+        <include layout="@layout/actionbar_progress" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/type"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/date"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <EditText
+                android:id="@+id/tracking"
+                style="@style/edittext_full"
+                android:hint="@string/trackable_code"
+                android:inputType="textCapCharacters" />
+
+            <EditText
+                android:id="@+id/log"
+                style="@style/edittext_full"
+                android:hint="@string/log_new_log_text"
+                android:inputType="textMultiLine|textCapSentences"
+                android:lines="5"
+                android:maxLength="4000"
+                android:singleLine="false" />
+
+            <LinearLayout
+                android:id="@+id/tweet_box"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:orientation="horizontal"
+                android:visibility="gone" >
+
+                <CheckBox
+                    android:id="@+id/tweet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:gravity="center"
+                    android:padding="2sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="left"
+                    android:paddingRight="3dip"
+                    android:text="@string/visit_tweet"
+                    android:textColor="?text_color"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/post"
+                style="@style/button_full"
+                android:text="@string/log_post" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
deleted file mode 100644
index 40e3d6a..0000000
--- a/main/res/layout/main.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/mainscreen"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_gravity="center" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <ImageView
-            style="@style/action_bar_icon_cgeo"
-            android:onClick="showAbout" />
-
-        <TextView style="@style/action_bar_title" />
-
-        <include layout="@layout/actionbar_button_search" />
-    </LinearLayout>
-
-    <fragment
-        android:id="@+id/status"
-        android:name="cgeo.geocaching.StatusFragment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="60dip" />
-    <!-- ** -->
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginTop="45dip"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_margin="4dip"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal" >
-
-            <LinearLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:onClick="cgeoFindOnMap"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:id="@+id/map"
-                    style="@style/icon_mainscreen"
-                    android:background="@drawable/main_live" />
-
-                <TextView
-                    style="@style/icon_mainscreen_text"
-                    android:text="@string/live_map_button" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:id="@+id/nearest"
-                    style="@style/icon_mainscreen"
-                    android:background="@drawable/main_nearby_disabled" />
-
-                <TextView
-                    style="@style/icon_mainscreen_text"
-                    android:text="@string/caches_nearby_button" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:onClick="cgeoFindByOffline" >
-
-                <TextView
-                    android:id="@+id/offline_count"
-                    style="@style/icon_mainscreen_count"
-                    android:textIsSelectable="false" />
-
-                <LinearLayout
-                    android:layout_width="74dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:orientation="vertical" >
-
-                    <ImageView
-                        android:id="@+id/search_offline"
-                        style="@style/icon_mainscreen"
-                        android:background="@drawable/main_stored" />
-
-                    <TextView
-                        style="@style/icon_mainscreen_text"
-                        android:text="@string/stored_caches_button" />
-                </LinearLayout>
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_margin="4dip"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal" >
-
-            <LinearLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:onClick="cgeoSearch"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:id="@+id/advanced_button"
-                    style="@style/icon_mainscreen"
-                    android:background="@drawable/main_search" />
-
-                <TextView
-                    style="@style/icon_mainscreen_text"
-                    android:text="@string/advanced_search_button" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:onClick="cgeoPoint"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:id="@+id/any_button"
-                    style="@style/icon_mainscreen"
-                    android:background="@drawable/main_any" />
-
-                <TextView
-                    style="@style/icon_mainscreen_text"
-                    android:text="@string/any_button" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="74dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:onClick="cgeoFilter"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:id="@+id/filter_button"
-                    style="@style/icon_mainscreen"
-                    android:background="@drawable/main_filter" />
-
-                <TextView
-                    android:id="@+id/filter_button_title"
-                    style="@style/icon_mainscreen_text"
-                    android:text="@null" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-    <!-- ** -->
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
-        android:onClick="cgeoNavSettings"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/user_info"
-            style="@style/location_current"
-            android:text="@string/init_login_popup_working" />
-
-        <TextView
-            android:id="@+id/nav_location"
-            style="@style/location_current"
-            android:text="@string/loc_trying" />
-
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="16dip" >
-
-            <TextView
-                android:id="@+id/nav_type"
-                style="@style/location_current_type"
-                android:textIsSelectable="false" />
-
-            <TextView
-                android:id="@+id/nav_accuracy"
-                style="@style/location_current_accuracy"
-                android:textIsSelectable="false" />
-
-            <TextView
-                android:id="@+id/nav_satellites"
-                style="@style/location_current_satellites"
-                android:textIsSelectable="false" />
-        </RelativeLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml
new file mode 100644
index 0000000..40e3d6a
--- /dev/null
+++ b/main/res/layout/main_activity.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/mainscreen"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_gravity="center" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <ImageView
+            style="@style/action_bar_icon_cgeo"
+            android:onClick="showAbout" />
+
+        <TextView style="@style/action_bar_title" />
+
+        <include layout="@layout/actionbar_button_search" />
+    </LinearLayout>
+
+    <fragment
+        android:id="@+id/status"
+        android:name="cgeo.geocaching.StatusFragment"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_marginTop="60dip" />
+    <!-- ** -->
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="45dip"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_margin="4dip"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal" >
+
+            <LinearLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:onClick="cgeoFindOnMap"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:id="@+id/map"
+                    style="@style/icon_mainscreen"
+                    android:background="@drawable/main_live" />
+
+                <TextView
+                    style="@style/icon_mainscreen_text"
+                    android:text="@string/live_map_button" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:id="@+id/nearest"
+                    style="@style/icon_mainscreen"
+                    android:background="@drawable/main_nearby_disabled" />
+
+                <TextView
+                    style="@style/icon_mainscreen_text"
+                    android:text="@string/caches_nearby_button" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:onClick="cgeoFindByOffline" >
+
+                <TextView
+                    android:id="@+id/offline_count"
+                    style="@style/icon_mainscreen_count"
+                    android:textIsSelectable="false" />
+
+                <LinearLayout
+                    android:layout_width="74dip"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:orientation="vertical" >
+
+                    <ImageView
+                        android:id="@+id/search_offline"
+                        style="@style/icon_mainscreen"
+                        android:background="@drawable/main_stored" />
+
+                    <TextView
+                        style="@style/icon_mainscreen_text"
+                        android:text="@string/stored_caches_button" />
+                </LinearLayout>
+            </RelativeLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_margin="4dip"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal" >
+
+            <LinearLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:onClick="cgeoSearch"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:id="@+id/advanced_button"
+                    style="@style/icon_mainscreen"
+                    android:background="@drawable/main_search" />
+
+                <TextView
+                    style="@style/icon_mainscreen_text"
+                    android:text="@string/advanced_search_button" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:onClick="cgeoPoint"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:id="@+id/any_button"
+                    style="@style/icon_mainscreen"
+                    android:background="@drawable/main_any" />
+
+                <TextView
+                    style="@style/icon_mainscreen_text"
+                    android:text="@string/any_button" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="74dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:onClick="cgeoFilter"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:id="@+id/filter_button"
+                    style="@style/icon_mainscreen"
+                    android:background="@drawable/main_filter" />
+
+                <TextView
+                    android:id="@+id/filter_button_title"
+                    style="@style/icon_mainscreen_text"
+                    android:text="@null" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+    <!-- ** -->
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:onClick="cgeoNavSettings"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/user_info"
+            style="@style/location_current"
+            android:text="@string/init_login_popup_working" />
+
+        <TextView
+            android:id="@+id/nav_location"
+            style="@style/location_current"
+            android:text="@string/loc_trying" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="16dip" >
+
+            <TextView
+                android:id="@+id/nav_type"
+                style="@style/location_current_type"
+                android:textIsSelectable="false" />
+
+            <TextView
+                android:id="@+id/nav_accuracy"
+                style="@style/location_current_accuracy"
+                android:textIsSelectable="false" />
+
+            <TextView
+                android:id="@+id/nav_satellites"
+                style="@style/location_current_satellites"
+                android:textIsSelectable="false" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml
deleted file mode 100644
index 2ffa70d..0000000
--- a/main/res/layout/map_static.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:id="@+id/maps_list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/map_static_item.xml b/main/res/layout/map_static_item.xml
deleted file mode 100644
index 1bac7f0..0000000
--- a/main/res/layout/map_static_item.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/map_image"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_marginBottom="10dip"
-    android:gravity="center"
-    android:padding="3dip"
-    android:scaleType="centerCrop" />
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
deleted file mode 100644
index b994b70..0000000
--- a/main/res/layout/navigate.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/info1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/destination"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:textColor="?text_color"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/cacheinfo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:textColor="?text_color"
-            android:textSize="14sp" />
-
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="30dip" >
-
-            <TextView
-                android:id="@+id/heading"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_gravity="left"
-                android:layout_marginLeft="3dip"
-                android:text="@null"
-                android:textColor="?text_color"
-                android:textSize="26sp" />
-
-            <TextView
-                android:id="@+id/distance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_gravity="right"
-                android:layout_marginRight="3dip"
-                android:text="@null"
-                android:textColor="?text_color"
-                android:textSize="26sp" />
-        </RelativeLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/info2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/nav_location"
-            style="@style/location_current"
-            android:text="@string/loc_trying" />
-
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="16dip" >
-
-            <TextView
-                android:id="@+id/nav_type"
-                style="@style/location_current_type"
-                android:textColor="?text_color_grey"
-                android:textIsSelectable="false" />
-
-            <TextView
-                android:id="@+id/nav_accuracy"
-                style="@style/location_current_accuracy"
-                android:textColor="?text_color_grey"
-                android:textIsSelectable="false" />
-
-            <TextView
-                android:id="@+id/nav_satellites"
-                style="@style/location_current_satellites"
-                android:textColor="?text_color_grey"
-                android:textIsSelectable="false" />
-        </RelativeLayout>
-    </LinearLayout>
-
-    <view
-        android:id="@+id/rose"
-        android:layout_width="fill_parent"
-        android:layout_height="295dip"
-        android:layout_above="@id/info2"
-        android:layout_below="@id/info1"
-        android:layout_centerInParent="true"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="1dip"
-        android:layout_marginLeft="1dip"
-        android:layout_marginRight="1dip"
-        android:layout_marginTop="6dip"
-        class="cgeo.geocaching.ui.CompassView"
-        android:gravity="center"
-        android:keepScreenOn="true"
-        android:minHeight="289dip"
-        android:minWidth="289dip"
-        android:padding="4dip" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/navigateanypoint_activity.xml b/main/res/layout/navigateanypoint_activity.xml
new file mode 100644
index 0000000..baa568c
--- /dev/null
+++ b/main/res/layout/navigateanypoint_activity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ListView
+        android:id="@+id/historyList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:cacheColorHint="?background_color"
+        android:footerDividersEnabled="false"
+        android:headerDividersEnabled="false" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/navigateanypoint_header.xml b/main/res/layout/navigateanypoint_header.xml
new file mode 100644
index 0000000..caf2e48
--- /dev/null
+++ b/main/res/layout/navigateanypoint_header.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:weightSum="1" >
+
+    <RelativeLayout style="@style/separator_horizontal_layout" >
+
+        <View style="@style/separator_horizontal" />
+
+        <TextView
+            style="@style/separator_horizontal_headline"
+            android:text="@string/search_coordinates" />
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/buttonLatitude"
+        style="@style/button_full"
+        android:hint="@string/latitude" />
+
+    <Button
+        android:id="@+id/buttonLongitude"
+        style="@style/button_full"
+        android:hint="@string/longitude" />
+
+    <Button
+        android:id="@+id/current"
+        style="@style/button_full"
+        android:text="@string/waypoint_my_coordinates" />
+
+    <RelativeLayout style="@style/separator_horizontal_layout" >
+
+        <View style="@style/separator_horizontal" />
+
+        <TextView
+            style="@style/separator_horizontal_headline"
+            android:text="@string/search_direction_rel" />
+    </RelativeLayout>
+
+    <EditText
+        android:id="@+id/bearing"
+        style="@style/edittext_full"
+        android:hint="@string/waypoint_bearing"
+        android:inputType="numberDecimal" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/distance"
+            style="@style/edittext_full"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:hint="@string/waypoint_distance"
+            android:inputType="numberDecimal" />
+
+        <Spinner
+            android:id="@+id/distanceUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:entries="@array/distance_units" />
+    </LinearLayout>
+
+    <RelativeLayout style="@style/separator_horizontal_layout" >
+
+        <View style="@style/separator_horizontal" />
+
+        <TextView
+            style="@style/separator_horizontal_headline"
+            android:text="@string/search_history" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
deleted file mode 100644
index baa568c..0000000
--- a/main/res/layout/point.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ListView
-        android:id="@+id/historyList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:cacheColorHint="?background_color"
-        android:footerDividersEnabled="false"
-        android:headerDividersEnabled="false" >
-    </ListView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/point_controls.xml b/main/res/layout/point_controls.xml
deleted file mode 100644
index caf2e48..0000000
--- a/main/res/layout/point_controls.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:weightSum="1" >
-
-    <RelativeLayout style="@style/separator_horizontal_layout" >
-
-        <View style="@style/separator_horizontal" />
-
-        <TextView
-            style="@style/separator_horizontal_headline"
-            android:text="@string/search_coordinates" />
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/buttonLatitude"
-        style="@style/button_full"
-        android:hint="@string/latitude" />
-
-    <Button
-        android:id="@+id/buttonLongitude"
-        style="@style/button_full"
-        android:hint="@string/longitude" />
-
-    <Button
-        android:id="@+id/current"
-        style="@style/button_full"
-        android:text="@string/waypoint_my_coordinates" />
-
-    <RelativeLayout style="@style/separator_horizontal_layout" >
-
-        <View style="@style/separator_horizontal" />
-
-        <TextView
-            style="@style/separator_horizontal_headline"
-            android:text="@string/search_direction_rel" />
-    </RelativeLayout>
-
-    <EditText
-        android:id="@+id/bearing"
-        style="@style/edittext_full"
-        android:hint="@string/waypoint_bearing"
-        android:inputType="numberDecimal" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <EditText
-            android:id="@+id/distance"
-            style="@style/edittext_full"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:hint="@string/waypoint_distance"
-            android:inputType="numberDecimal" />
-
-        <Spinner
-            android:id="@+id/distanceUnit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:entries="@array/distance_units" />
-    </LinearLayout>
-
-    <RelativeLayout style="@style/separator_horizontal_layout" >
-
-        <View style="@style/separator_horizontal" />
-
-        <TextView
-            style="@style/separator_horizontal_headline"
-            android:text="@string/search_history" />
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
deleted file mode 100644
index a0a699d..0000000
--- a/main/res/layout/search.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_coordinates" />
-            </RelativeLayout>
-
-            <Button
-                android:id="@+id/buttonLatitude"
-                style="@style/button_full"
-                android:hint="@string/latitude" />
-
-            <Button
-                android:id="@+id/buttonLongitude"
-                style="@style/button_full"
-                android:hint="@string/longitude" />
-
-            <Button
-                android:id="@+id/search_coordinates"
-                style="@style/button_full"
-                android:text="@string/search_coordinates_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_address" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/address"
-                style="@style/edittext_full"
-                android:hint="@string/search_address"
-                android:imeOptions="actionGo" />
-
-            <Button
-                android:id="@+id/search_address"
-                style="@style/button_full"
-                android:text="@string/search_address_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_geo" />
-            </RelativeLayout>
-
-            <AutoCompleteTextView
-                android:id="@+id/geocode"
-                style="@style/edittext_full"
-                android:hint="@string/search_geo"
-                android:imeOptions="actionGo"
-                android:inputType="textCapCharacters"
-                android:text="GC"
-                tools:ignore="HardcodedText" />
-
-            <Button
-                android:id="@+id/display_geocode"
-                style="@style/button_full"
-                android:text="@string/search_geo_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_kw" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/keyword"
-                style="@style/edittext_full"
-                android:hint="@string/search_kw_prefill"
-                android:imeOptions="actionGo" />
-
-            <Button
-                android:id="@+id/search_keyword"
-                style="@style/button_full"
-                android:text="@string/search_kw_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_fbu" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/username"
-                style="@style/edittext_full"
-                android:hint="@string/search_fbu_prefill"
-                android:imeOptions="actionGo" />
-
-            <Button
-                android:id="@+id/search_username"
-                style="@style/button_full"
-                android:text="@string/search_fbu_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_hbu" />
-            </RelativeLayout>
-
-            <EditText
-                android:id="@+id/owner"
-                style="@style/edittext_full"
-                android:hint="@string/search_hbu_prefill"
-                android:imeOptions="actionGo" />
-
-            <Button
-                android:id="@+id/search_owner"
-                style="@style/button_full"
-                android:text="@string/search_hbu_button" />
-            <!-- ** -->
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/search_tb" />
-            </RelativeLayout>
-
-            <AutoCompleteTextView
-                android:id="@+id/trackable"
-                style="@style/edittext_full"
-                android:hint="@string/search_tb_hint"
-                android:imeOptions="actionGo"
-                android:inputType="textCapCharacters" />
-
-            <Button
-                android:id="@+id/display_trackable"
-                style="@style/button_full"
-                android:text="@string/search_tb_button" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/search_activity.xml b/main/res/layout/search_activity.xml
new file mode 100644
index 0000000..a0a699d
--- /dev/null
+++ b/main/res/layout/search_activity.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_coordinates" />
+            </RelativeLayout>
+
+            <Button
+                android:id="@+id/buttonLatitude"
+                style="@style/button_full"
+                android:hint="@string/latitude" />
+
+            <Button
+                android:id="@+id/buttonLongitude"
+                style="@style/button_full"
+                android:hint="@string/longitude" />
+
+            <Button
+                android:id="@+id/search_coordinates"
+                style="@style/button_full"
+                android:text="@string/search_coordinates_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_address" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/address"
+                style="@style/edittext_full"
+                android:hint="@string/search_address"
+                android:imeOptions="actionGo" />
+
+            <Button
+                android:id="@+id/search_address"
+                style="@style/button_full"
+                android:text="@string/search_address_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_geo" />
+            </RelativeLayout>
+
+            <AutoCompleteTextView
+                android:id="@+id/geocode"
+                style="@style/edittext_full"
+                android:hint="@string/search_geo"
+                android:imeOptions="actionGo"
+                android:inputType="textCapCharacters"
+                android:text="GC"
+                tools:ignore="HardcodedText" />
+
+            <Button
+                android:id="@+id/display_geocode"
+                style="@style/button_full"
+                android:text="@string/search_geo_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_kw" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/keyword"
+                style="@style/edittext_full"
+                android:hint="@string/search_kw_prefill"
+                android:imeOptions="actionGo" />
+
+            <Button
+                android:id="@+id/search_keyword"
+                style="@style/button_full"
+                android:text="@string/search_kw_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_fbu" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/username"
+                style="@style/edittext_full"
+                android:hint="@string/search_fbu_prefill"
+                android:imeOptions="actionGo" />
+
+            <Button
+                android:id="@+id/search_username"
+                style="@style/button_full"
+                android:text="@string/search_fbu_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_hbu" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/owner"
+                style="@style/edittext_full"
+                android:hint="@string/search_hbu_prefill"
+                android:imeOptions="actionGo" />
+
+            <Button
+                android:id="@+id/search_owner"
+                style="@style/button_full"
+                android:text="@string/search_hbu_button" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/search_tb" />
+            </RelativeLayout>
+
+            <AutoCompleteTextView
+                android:id="@+id/trackable"
+                style="@style/edittext_full"
+                android:hint="@string/search_tb_hint"
+                android:imeOptions="actionGo"
+                android:inputType="textCapCharacters" />
+
+            <Button
+                android:id="@+id/display_trackable"
+                style="@style/button_full"
+                android:text="@string/search_tb_button" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/settings_activity.xml b/main/res/layout/settings_activity.xml
new file mode 100644
index 0000000..ae70fa7
--- /dev/null
+++ b/main/res/layout/settings_activity.xml
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_geocaching" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="3dip"
+                android:orientation="horizontal"
+                android:padding="3dip" >
+
+                <CheckBox
+                    android:id="@+id/gc_option"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:gravity="center"
+                    android:padding="1dip" />
+
+                <TextView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="left"
+                    android:paddingRight="3dip"
+                    android:text="@string/init_gc_activate"
+                    android:textColor="?text_color"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/legal_note"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/legal_note"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/username"
+                style="@style/edittext_full"
+                android:hint="@string/init_username" />
+
+            <EditText
+                android:id="@+id/password"
+                style="@style/edittext_full"
+                android:hint="@string/init_password"
+                android:inputType="textPassword" />
+
+            <Button
+                android:id="@+id/log_me_in"
+                style="@style/button_full"
+                android:lines="2"
+                android:scrollHorizontally="false"
+                android:singleLine="false"
+                android:text="@string/init_login" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_oc" />
+            </RelativeLayout>
+
+            <CheckBox
+                android:id="@+id/oc_option"
+                style="@style/checkbox_full"
+                android:text="@string/init_oc_activate" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:padding="3dip"
+                android:text="@string/init_oc_de_description"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/register_oc_de"
+                style="@style/button_full"
+                android:text="@string/init_register_oc_de" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_gcvote" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/passvote"
+                style="@style/edittext_full"
+                android:hint="@string/init_passvote"
+                android:inputType="textPassword" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_twitter" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/about_twitter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/about_twitter"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/authorize_twitter"
+                style="@style/button_full"
+                android:text="@string/init_twitter_authorize" />
+
+            <CheckBox
+                android:id="@+id/twitter_option"
+                style="@style/checkbox_full"
+                android:text="@string/init_twitter_publish" />
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_signature" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/signature"
+                style="@style/edittext_full"
+                android:layout_height="wrap_content"
+                android:hint="@string/init_signature"
+                android:inputType="textMultiLine|textCapSentences"
+                android:minLines="3"
+                android:singleLine="false" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/signature_template"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:layout_weight="2"
+                    android:text="@string/init_signature_template_button"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/signature_help"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/init_signature_help_button"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <CheckBox
+                android:id="@+id/sigautoinsert"
+                style="@style/checkbox_full"
+                android:text="@string/init_sigautoinsert" />
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_details" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="3dip"
+                android:orientation="vertical"
+                android:padding="3dip" >
+
+                <CheckBox
+                    android:id="@+id/autoload"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_autoload" />
+
+                <CheckBox
+                    android:id="@+id/ratingwanted"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_ratingwanted" />
+
+                <CheckBox
+                    android:id="@+id/elevationwanted"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_elevationwanted" />
+
+                <CheckBox
+                    android:id="@+id/friendlogswanted"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_friendlogswanted" />
+
+                <CheckBox
+                    android:id="@+id/openlastdetailspage"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_openlastdetailspage" />
+
+                <CheckBox
+                    android:id="@+id/offline"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_offline" />
+
+                <CheckBox
+                    android:id="@+id/offline_wp"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_offline_wp" />
+
+                <CheckBox
+                    android:id="@+id/save_log_img"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_save_log_img" />
+            </LinearLayout>
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_other" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="3dip"
+                android:orientation="vertical"
+                android:padding="3dip" >
+
+                <CheckBox
+                    android:id="@+id/skin"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_skin" />
+
+                <CheckBox
+                    android:id="@+id/address"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_address" />
+
+                <CheckBox
+                    android:id="@+id/captcha"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_captcha" />
+
+                <CheckBox
+                    android:id="@+id/livelist"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_livelist" />
+
+                <CheckBox
+                    android:id="@+id/loaddirectionimg"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_loaddirectionimg" />
+
+                <CheckBox
+                    android:id="@+id/useenglish"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_useenglish" />
+
+                <CheckBox
+                    android:id="@+id/units"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_units" />
+
+                <CheckBox
+                    android:id="@+id/exclude"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_exclude" />
+
+                <CheckBox
+                    android:id="@+id/disabled"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_disabled" />
+
+                <CheckBox
+                    android:id="@+id/trackautovisit"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_trackautovisit" />
+
+                <CheckBox
+                    android:id="@+id/log_offline"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_log_offline" />
+
+                <CheckBox
+                    android:id="@+id/choose_list"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_choose_list" />
+
+                <CheckBox
+                    android:id="@+id/trail"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_maptrail" />
+
+                <CheckBox
+                    android:id="@+id/plain_logs"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_plain_logs" />
+
+                <CheckBox
+                    android:id="@+id/use_native_ua"
+                    style="@style/checkbox_full"
+                    android:text="@string/init_use_native_ua" />
+            </LinearLayout>
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_showwaypoints" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/showwaypointsthreshold"
+                style="@style/edittext_full"
+                android:inputType="number"
+                android:lines="1"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_showwaypoint_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+            <!-- maps -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_mapsources" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_mapsources_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Spinner
+                android:id="@+id/mapsource"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/init_mapsource_select" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_map_directory_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:id="@+id/init_mapdir_group"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/select_map_directory"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:text="@string/init_select_map_directory" />
+
+                <EditText
+                    android:id="@+id/map_directory"
+                    style="@style/edittext_full"
+                    android:inputType="textNoSuggestions"
+                    android:lines="1"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:gravity="left"
+                android:padding="3dip"
+                android:text="@string/init_rendertheme_folder"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:id="@+id/init_themefilegroup"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/select_themefolder"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:text="@string/init_select_themefolder" />
+
+                <EditText
+                    android:id="@+id/themefolder"
+                    style="@style/edittext_full"
+                    android:inputType="textNoSuggestions"
+                    android:lines="1"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true" />
+            </LinearLayout>
+
+            <!-- GPX -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_gpx_exportdir" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_gpx_exportdir_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:id="@+id/init_gpx_export_group"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/select_gpx_exportdir"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:text="@string/init_select_gpx_exportdir" />
+
+                <EditText
+                    android:id="@+id/gpx_exportdir"
+                    style="@style/edittext_full"
+                    android:inputType="textNoSuggestions"
+                    android:lines="1"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true" />
+            </LinearLayout>
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_gpx_importdir" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_gpx_importdir_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:id="@+id/init_gpx_import_group"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/select_gpx_importdir"
+                    style="@style/button_full"
+                    android:layout_width="wrap_content"
+                    android:text="@string/init_select_gpx_importdir" />
+
+                <EditText
+                    android:id="@+id/gpx_importdir"
+                    style="@style/edittext_full"
+                    android:inputType="textNoSuggestions"
+                    android:lines="1"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true" />
+            </LinearLayout>
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_altitude" />
+            </RelativeLayout>
+
+            <EditText
+                android:id="@+id/altitude"
+                style="@style/edittext_full"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_altitude_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_default_navigation_tool" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_default_navigation_tool_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Spinner
+                android:id="@+id/default_navigation_tool"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/init_default_navigation_tool_select" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_default_navigation_tool_2_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Spinner
+                android:id="@+id/default_navigation_tool_2"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/init_default_navigation_tool_select" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_sendToCgeo" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_sendToCgeo_name"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/webDeviceName"
+                style="@style/edittext_full"
+                android:inputType="textNoSuggestions"
+                android:lines="1"
+                android:maxLength="15"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_sendToCgeo_description"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/sendToCgeo_register"
+                style="@style/button_full"
+                android:text="@string/init_sendToCgeo_register" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_backup" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/backup_last"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@null"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="3dip"
+                android:orientation="horizontal"
+                android:padding="3dip" >
+
+                <Button
+                    android:id="@+id/backup_backup"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:onClick="backup"
+                    android:text="@string/init_backup_backup" />
+
+                <Button
+                    android:id="@+id/backup_restore"
+                    style="@style/button_full"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:onClick="restore"
+                    android:text="@string/init_backup_restore" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_backup_note"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_dbonsdcard_title" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_dbonsdcard_note"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <CheckBox
+                android:id="@+id/dbonsdcard"
+                style="@style/checkbox_full"
+                android:text="@string/init_dbonsdcard" />
+            <!-- ** -->
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/init_debug_title" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:linksClickable="true"
+                android:padding="3dip"
+                android:text="@string/init_debug_note"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <CheckBox
+                android:id="@+id/debug"
+                style="@style/checkbox_full"
+                android:text="@string/init_debug" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml
deleted file mode 100644
index 29ad570..0000000
--- a/main/res/layout/spoilers.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <include layout="@layout/caches_images" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/star.xml b/main/res/layout/star.xml
deleted file mode 100644
index 919fedb..0000000
--- a/main/res/layout/star.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="12dip"
-    android:layout_height="12dip"
-    android:layout_gravity="center"
-    android:layout_margin="1dip"
-    android:gravity="center"
-    android:scaleType="fitXY"
-    android:src="@drawable/star_off" />
diff --git a/main/res/layout/star_image.xml b/main/res/layout/star_image.xml
new file mode 100644
index 0000000..919fedb
--- /dev/null
+++ b/main/res/layout/star_image.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="12dip"
+    android:layout_height="12dip"
+    android:layout_gravity="center"
+    android:layout_margin="1dip"
+    android:gravity="center"
+    android:scaleType="fitXY"
+    android:src="@drawable/star_off" />
diff --git a/main/res/layout/staticmaps_activity.xml b/main/res/layout/staticmaps_activity.xml
new file mode 100644
index 0000000..2ffa70d
--- /dev/null
+++ b/main/res/layout/staticmaps_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:padding="4dip" >
+
+        <LinearLayout
+            android:id="@+id/maps_list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/staticmaps_activity_item.xml b/main/res/layout/staticmaps_activity_item.xml
new file mode 100644
index 0000000..1bac7f0
--- /dev/null
+++ b/main/res/layout/staticmaps_activity_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/map_image"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginBottom="10dip"
+    android:gravity="center"
+    android:padding="3dip"
+    android:scaleType="centerCrop" />
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
deleted file mode 100644
index 7791409..0000000
--- a/main/res/layout/touch.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <include layout="@layout/actionbar_title" />
-
-        <include layout="@layout/actionbar_progress" />
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/type"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-
-                <Button
-                    android:id="@+id/date"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-            </LinearLayout>
-
-            <EditText
-                android:id="@+id/tracking"
-                style="@style/edittext_full"
-                android:hint="@string/trackable_code"
-                android:inputType="textCapCharacters" />
-
-            <EditText
-                android:id="@+id/log"
-                style="@style/edittext_full"
-                android:hint="@string/log_new_log_text"
-                android:inputType="textMultiLine|textCapSentences"
-                android:lines="5"
-                android:maxLength="4000"
-                android:singleLine="false" />
-
-            <LinearLayout
-                android:id="@+id/tweet_box"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:orientation="horizontal"
-                android:visibility="gone" >
-
-                <CheckBox
-                    android:id="@+id/tweet"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:gravity="center"
-                    android:padding="2sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:paddingRight="3dip"
-                    android:text="@string/visit_tweet"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/post"
-                style="@style/button_full"
-                android:text="@string/log_post" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/useful_apps_activity.xml b/main/res/layout/useful_apps_activity.xml
deleted file mode 100644
index 84bcf39..0000000
--- a/main/res/layout/useful_apps_activity.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ListView
-        android:id="@+id/apps_list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:cacheColorHint="?background_color"
-        android:divider="?background_color"
-        android:fastScrollEnabled="true"
-        android:footerDividersEnabled="false"
-        android:headerDividersEnabled="false"
-        android:listSelector="?background_color"
-        android:padding="4dip" >
-    </ListView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/useful_apps_item.xml
deleted file mode 100644
index 70e7baf..0000000
--- a/main/res/layout/useful_apps_item.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/app_layout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="10dip"
-    android:descendantFocusability="blocksDescendants"
-    android:orientation="vertical" >
-
-    <RelativeLayout style="@style/separator_horizontal_layout" >
-
-        <View style="@style/separator_horizontal" />
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/separator_horizontal_headline"
-            android:textIsSelectable="true" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginBottom="5dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="64dip"
-            android:layout_height="64dip"
-            android:layout_gravity="center"
-            android:layout_margin="1dip"
-            android:gravity="center"
-            android:scaleType="fitXY" />
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:linksClickable="true"
-            android:padding="3dip"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textIsSelectable="false"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml
new file mode 100644
index 0000000..84bcf39
--- /dev/null
+++ b/main/res/layout/usefulapps_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <include layout="@layout/actionbar" />
+
+    <ListView
+        android:id="@+id/apps_list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:cacheColorHint="?background_color"
+        android:divider="?background_color"
+        android:fastScrollEnabled="true"
+        android:footerDividersEnabled="false"
+        android:headerDividersEnabled="false"
+        android:listSelector="?background_color"
+        android:padding="4dip" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/usefulapps_item.xml b/main/res/layout/usefulapps_item.xml
new file mode 100644
index 0000000..70e7baf
--- /dev/null
+++ b/main/res/layout/usefulapps_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="10dip"
+    android:descendantFocusability="blocksDescendants"
+    android:orientation="vertical" >
+
+    <RelativeLayout style="@style/separator_horizontal_layout" >
+
+        <View style="@style/separator_horizontal" />
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/separator_horizontal_headline"
+            android:textIsSelectable="true" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="5dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="10dip"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="64dip"
+            android:layout_height="64dip"
+            android:layout_gravity="center"
+            android:layout_margin="1dip"
+            android:gravity="center"
+            android:scaleType="fitXY" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:linksClickable="true"
+            android:padding="3dip"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textIsSelectable="false"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
deleted file mode 100644
index e0294da..0000000
--- a/main/res/layout/visit.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <include layout="@layout/actionbar_title" />
-
-        <include layout="@layout/actionbar_progress" />
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical" >
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <Button
-                        android:id="@+id/type"
-                        style="@style/button_full"
-                        android:layout_width="0dip"
-                        android:layout_weight="1" />
-
-                    <Button
-                        android:id="@+id/date"
-                        style="@style/button_full"
-                        android:layout_width="0dip"
-                        android:layout_weight="1" />
-                </LinearLayout>
-
-                <EditText
-                    android:id="@+id/log"
-                    style="@style/edittext_full"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/log_new_log_text"
-                    android:inputType="textMultiLine|textCapSentences"
-                    android:maxLength="4000"
-                    android:minLines="5"
-                    android:singleLine="false" />
-
-                <LinearLayout
-                    android:id="@+id/tweet_box"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dip"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:orientation="horizontal"
-                    android:visibility="gone" >
-
-                    <CheckBox
-                        android:id="@+id/tweet"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left"
-                        android:gravity="center"
-                        android:padding="2sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="left"
-                        android:paddingRight="3dip"
-                        android:text="@string/visit_tweet"
-                        android:textColor="?text_color"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/image_btn"
-                    style="@style/button_full"
-                    android:text="@string/log_image_attach" />
-
-                <Button
-                    android:id="@+id/post"
-                    style="@style/button_full"
-                    android:text="@string/log_post" />
-
-                <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                    <View style="@style/separator_horizontal" />
-
-                    <TextView
-                        style="@style/separator_horizontal_headline"
-                        android:text="@string/cache_log_offline" />
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <Button
-                        android:id="@+id/save"
-                        style="@style/button_full"
-                        android:layout_width="0dip"
-                        android:layout_weight="1"
-                        android:text="@string/log_save" />
-
-                    <Button
-                        android:id="@+id/clear"
-                        style="@style/button_full"
-                        android:layout_width="0dip"
-                        android:layout_weight="1"
-                        android:text="@string/log_clear" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/inventory_box"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dip"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical"
-                android:visibility="gone" >
-
-                <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                    <View style="@style/separator_horizontal" />
-
-                    <TextView
-                        style="@style/separator_horizontal_headline"
-                        android:text="@string/cache_inventory" />
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:id="@+id/inventory"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical" >
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/inventory_changeall"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
-                    android:orientation="vertical"
-                    android:visibility="gone" >
-
-                    <Button
-                        android:id="@+id/changebutton"
-                        style="@style/button_full"
-                        android:layout_width="wrap_content"
-                        android:layout_height="0dp"
-                        android:layout_marginBottom="5dip"
-                        android:layout_marginLeft="10dip"
-                        android:layout_marginRight="10dip"
-                        android:layout_weight="1"
-                        android:gravity="right"
-                        android:text="@string/log_tb_changeall"
-                        android:textSize="14sp" />
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
deleted file mode 100644
index fd8eaea..0000000
--- a/main/res/layout/visit_image.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?background_color"
-    android:orientation="vertical" >
-
-    <LinearLayout style="@style/action_bar" >
-
-        <include layout="@layout/actionbar_title" />
-
-        <include layout="@layout/actionbar_progress" />
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/log_image" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dip"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/stored"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:text="@string/log_image_stored" />
-
-                <Button
-                    android:id="@+id/camera"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:text="@string/log_image_camera" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/image_preview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dip"
-                android:layout_marginTop="5dip"
-                android:background="#000000"
-                android:padding="1dp"
-                android:visibility="gone" />
-
-            <EditText
-                android:id="@+id/caption"
-                style="@style/edittext_full"
-                android:layout_height="wrap_content"
-                android:hint="@string/log_image_caption"
-                android:inputType="textCapSentences"
-                android:maxLength="50"
-                android:minLines="1"
-                android:singleLine="false" />
-
-            <EditText
-                android:id="@+id/description"
-                style="@style/edittext_full"
-                android:layout_height="wrap_content"
-                android:hint="@string/log_image_description"
-                android:inputType="textMultiLine|textCapSentences"
-                android:maxLength="250"
-                android:minLines="5"
-                android:singleLine="false" />
-
-            <Spinner
-                android:id="@+id/logImageScale"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:entries="@array/log_image_scales"
-                android:prompt="@string/log_image_scale" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/save"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:text="@android:string/yes" />
-
-                <Button
-                    android:id="@+id/cancel"
-                    style="@style/button_full"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:text="@android:string/no" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/visit_trackable.xml
deleted file mode 100644
index 1eab116..0000000
--- a/main/res/layout/visit_trackable.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="5dip"
-    android:orientation="horizontal"
-    android:paddingBottom="10dip"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip" >
-
-    <LinearLayout
-        android:id="@+id/info"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="marquee"
-            android:gravity="left"
-            android:lines="1"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textColor="?text_color"
-            android:textIsSelectable="false"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/trackcode"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="marquee"
-            android:gravity="left"
-            android:lines="1"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textColor="?text_color"
-            android:textIsSelectable="false"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/action"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:layout_weight="1"
-        android:ellipsize="marquee"
-        android:gravity="right"
-        android:lines="1"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textColor="?text_color"
-        android:textIsSelectable="false"
-        android:textSize="14sp" />
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.1