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/AndroidManifest.xml                           |   2 +-
 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 --
 main/src/cgeo/geocaching/AddressListActivity.java  |   2 +-
 main/src/cgeo/geocaching/CacheDetailActivity.java  |  14 +-
 main/src/cgeo/geocaching/CompassActivity.java      |   2 +-
 main/src/cgeo/geocaching/EditWaypointActivity.java |   2 +-
 main/src/cgeo/geocaching/Geocache.java             |   6 +-
 main/src/cgeo/geocaching/ImageSelectActivity.java  |   2 +-
 main/src/cgeo/geocaching/ImagesActivity.java       |   2 +-
 main/src/cgeo/geocaching/LogCacheActivity.java     | 706 +++++++++++++++++
 main/src/cgeo/geocaching/LogTrackableActivity.java |   2 +-
 main/src/cgeo/geocaching/MainActivity.java         |   2 +-
 .../cgeo/geocaching/NavigateAnyPointActivity.java  |   6 +-
 main/src/cgeo/geocaching/SearchActivity.java       |   2 +-
 main/src/cgeo/geocaching/SettingsActivity.java     |   2 +-
 main/src/cgeo/geocaching/StaticMapsActivity.java   |   4 +-
 main/src/cgeo/geocaching/UsefulAppsActivity.java   |   6 +-
 main/src/cgeo/geocaching/VisitCacheActivity.java   | 706 -----------------
 main/src/cgeo/geocaching/cgeocaches.java           |   4 +-
 .../geocaching/connector/gc/GCLoggingManager.java  |   6 +-
 .../connector/oc/OkapiLoggingManager.java          |   6 +-
 .../src/cgeo/geocaching/ui/AddressListAdapter.java |   2 +-
 .../cgeo/geocaching/ui/CacheDetailsCreator.java    |   2 +-
 main/src/cgeo/geocaching/ui/CacheListAdapter.java  |   2 +-
 .../ui/dialog/CoordinatesInputDialog.java          |   2 +-
 88 files changed, 4163 insertions(+), 4163 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
 create mode 100644 main/src/cgeo/geocaching/LogCacheActivity.java
 delete mode 100644 main/src/cgeo/geocaching/VisitCacheActivity.java

(limited to 'main')

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index c391fe9..1ea0d28 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -172,7 +172,7 @@
             android:label="@string/map_static_title" >
         </activity>
         <activity
-            android:name=".VisitCacheActivity"
+            android:name=".LogCacheActivity"
             android:label="@string/log_new_log" >
         </activity>
         <activity
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
diff --git a/main/src/cgeo/geocaching/AddressListActivity.java b/main/src/cgeo/geocaching/AddressListActivity.java
index 150bbc5..c984d28 100644
--- a/main/src/cgeo/geocaching/AddressListActivity.java
+++ b/main/src/cgeo/geocaching/AddressListActivity.java
@@ -20,7 +20,7 @@ public class AddressListActivity extends AbstractListActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.addresses);
+        super.onCreate(savedInstanceState, R.layout.addresslist_activity);
 
         // get parameters
         final String keyword = getIntent().getStringExtra(Intents.EXTRA_KEYWORD);
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 0f2fba0..32aabd8 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -202,7 +202,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.cacheview);
+        super.onCreate(savedInstanceState, R.layout.cachedetail_activity);
 
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.cache));
@@ -1155,7 +1155,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_details, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_details_page, null);
 
             // Start loading preview map
             if (Settings.isStoreOfflineMaps()) {
@@ -1776,7 +1776,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_description, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_description_page, null);
             Views.inject(this, view);
 
             // cache short description
@@ -2108,7 +2108,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ListView) getLayoutInflater().inflate(R.layout.cacheview_logs, null);
+            view = (ListView) getLayoutInflater().inflate(R.layout.cachedetail_logs_page, null);
 
             // log count
             final Map<LogType, Integer> logCounts = cache.getLogCounts();
@@ -2273,7 +2273,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_waypoints, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_waypoints_page, null);
 
             final LinearLayout waypoints = (LinearLayout) view.findViewById(R.id.waypoints);
 
@@ -2392,7 +2392,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ListView) getLayoutInflater().inflate(R.layout.cacheview_inventory, null);
+            view = (ListView) getLayoutInflater().inflate(R.layout.cachedetail_inventory_page, null);
 
             // TODO: fix layout, then switch back to Android-resource and delete copied one
             // this copy is modified to respect the text color
@@ -2420,7 +2420,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null; // something is really wrong
             }
 
-            view = getLayoutInflater().inflate(R.layout.caches_images, null);
+            view = getLayoutInflater().inflate(R.layout.cachedetail_images_page, null);
             if (imagesList == null && isCurrentPage(Page.IMAGES)) {
                 loadCacheImages();
             }
diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index 73db653..4f8af08 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -57,7 +57,7 @@ public class CompassActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.navigate);
+        super.onCreate(savedInstanceState, R.layout.compass_activity);
 
         final SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         hasMagneticFieldSensor = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD) != null;
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 74cac4d..f97e9b5 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -126,7 +126,7 @@ public class EditWaypointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.edit_waypoint_activity);
+        super.onCreate(savedInstanceState, R.layout.editwaypoint_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 66b23bf..781f9ff 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -459,9 +459,9 @@ public class Geocache implements ICache, IWaypoint {
             fromActivity.showToast(((Activity) fromActivity).getResources().getString(R.string.err_cannot_log_visit));
             return;
         }
-        Intent logVisitIntent = new Intent((Activity) fromActivity, VisitCacheActivity.class);
-        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_ID, cacheId);
-        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_GEOCODE, geocode);
+        Intent logVisitIntent = new Intent((Activity) fromActivity, LogCacheActivity.class);
+        logVisitIntent.putExtra(LogCacheActivity.EXTRAS_ID, cacheId);
+        logVisitIntent.putExtra(LogCacheActivity.EXTRAS_GEOCODE, geocode);
 
         ((Activity) fromActivity).startActivity(logVisitIntent);
     }
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index f442a51..26dd85a 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -64,7 +64,7 @@ public class ImageSelectActivity extends AbstractActivity {
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.visit_image);
+        super.onCreate(savedInstanceState, R.layout.imageselect_activity);
         Views.inject(this);
 
         scaleChoiceIndex = Settings.getLogImageScale();
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 07ff734..030b3f7 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -45,7 +45,7 @@ public class ImagesActivity extends AbstractActivity {
 
         // init
         setTheme();
-        setContentView(R.layout.spoilers);
+        setContentView(R.layout.images_activity);
         setTitle(res.getString(imgType.getTitle()));
 
         imagesList = new ImagesList(this, geocode);
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java
new file mode 100644
index 0000000..e4d3d17
--- /dev/null
+++ b/main/src/cgeo/geocaching/LogCacheActivity.java
@@ -0,0 +1,706 @@
+package cgeo.geocaching;
+
+import cgeo.geocaching.connector.ILoggingManager;
+import cgeo.geocaching.connector.ImageResult;
+import cgeo.geocaching.connector.LogResult;
+import cgeo.geocaching.enumerations.LoadFlags;
+import cgeo.geocaching.enumerations.LogType;
+import cgeo.geocaching.enumerations.LogTypeTrackable;
+import cgeo.geocaching.enumerations.StatusCode;
+import cgeo.geocaching.gcvote.GCVote;
+import cgeo.geocaching.twitter.Twitter;
+import cgeo.geocaching.ui.Formatter;
+import cgeo.geocaching.ui.dialog.DateDialog;
+import cgeo.geocaching.utils.AsyncTaskWithProgress;
+import cgeo.geocaching.utils.DateUtils;
+import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.LogTemplateProvider;
+import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+public class LogCacheActivity extends AbstractLoggingActivity implements DateDialog.DateDialogParent {
+    static final String EXTRAS_GEOCODE = "geocode";
+    static final String EXTRAS_ID = "id";
+
+    private static final int SUBMENU_VOTE = 3;
+    private static final String SAVED_STATE_RATING = "cgeo.geocaching.saved_state_rating";
+    private static final String SAVED_STATE_TYPE = "cgeo.geocaching.saved_state_type";
+    private static final String SAVED_STATE_DATE = "cgeo.geocaching.saved_state_date";
+    private static final String SAVED_STATE_IMAGE_CAPTION = "cgeo.geocaching.saved_state_image_caption";
+    private static final String SAVED_STATE_IMAGE_DESCRIPTION = "cgeo.geocaching.saved_state_image_description";
+    private static final String SAVED_STATE_IMAGE_URI = "cgeo.geocaching.saved_state_image_uri";
+
+    private static final int SELECT_IMAGE = 101;
+
+    private LayoutInflater inflater = null;
+    private Geocache cache = null;
+    private String cacheid = null;
+    private String geocode = null;
+    private String text = null;
+    private List<LogType> possibleLogTypes = new ArrayList<LogType>();
+    private List<TrackableLog> trackables = null;
+    private Button postButton = null;
+    private CheckBox tweetCheck = null;
+    private LinearLayout tweetBox = null;
+    private boolean tbChanged = false;
+    private SparseArray<TrackableLog> actionButtons;
+
+    private ILoggingManager loggingManager;
+
+    // Data to be saved while reconfiguring
+    private double rating;
+    private LogType typeSelected;
+    private Calendar date;
+    private String imageCaption;
+    private String imageDescription;
+    private Uri imageUri;
+
+
+    public void onLoadFinished() {
+
+        if (loggingManager.hasLoaderError()) {
+            showErrorLoadingData();
+            return;
+        }
+
+        trackables = loggingManager.getTrackables();
+        possibleLogTypes = loggingManager.getPossibleLogTypes();
+
+        if (possibleLogTypes.isEmpty()) {
+            showErrorLoadingData();
+            return;
+        }
+
+        if (!possibleLogTypes.contains(typeSelected)) {
+            typeSelected = possibleLogTypes.get(0);
+            setType(typeSelected);
+
+            showToast(res.getString(R.string.info_log_type_changed));
+        }
+
+        enablePostButton(true);
+
+        initializeTrackablesAction();
+        updateTrackablesList();
+
+        showProgress(false);
+    }
+
+    private void showErrorLoadingData() {
+        showToast(res.getString(R.string.err_log_load_data));
+        showProgress(false);
+    }
+
+    private void initializeTrackablesAction() {
+        if (Settings.isTrackableAutoVisit()) {
+            for (TrackableLog trackable : trackables) {
+                trackable.action = LogTypeTrackable.VISITED;
+                tbChanged = true;
+            }
+        }
+    }
+
+    private void updateTrackablesList() {
+        if (CollectionUtils.isEmpty(trackables)) {
+            return;
+        }
+        if (inflater == null) {
+            inflater = getLayoutInflater();
+        }
+        actionButtons = new SparseArray<TrackableLog>();
+
+        final LinearLayout inventoryView = (LinearLayout) findViewById(R.id.inventory);
+        inventoryView.removeAllViews();
+
+        for (TrackableLog tb : trackables) {
+            LinearLayout inventoryItem = (LinearLayout) inflater.inflate(R.layout.logcache_trackable_item, null);
+
+            ((TextView) inventoryItem.findViewById(R.id.trackcode)).setText(tb.trackCode);
+            ((TextView) inventoryItem.findViewById(R.id.name)).setText(tb.name);
+            final TextView actionButton = (TextView) inventoryItem.findViewById(R.id.action);
+            actionButton.setId(tb.id);
+            actionButtons.put(actionButton.getId(), tb);
+            actionButton.setText(res.getString(tb.action.resourceId) + " ▼");
+            actionButton.setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View view) {
+                    selectTrackableAction(view);
+                }
+            });
+
+            final String tbCode = tb.trackCode;
+            inventoryItem.setClickable(true);
+            inventoryItem.findViewById(R.id.info).setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View view) {
+                    final Intent trackablesIntent = new Intent(LogCacheActivity.this, TrackableActivity.class);
+                    trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, tbCode);
+                    startActivity(trackablesIntent);
+                }
+            });
+
+            inventoryView.addView(inventoryItem);
+        }
+
+        if (inventoryView.getChildCount() > 0) {
+            findViewById(R.id.inventory_box).setVisibility(View.VISIBLE);
+        }
+        if (inventoryView.getChildCount() > 1) {
+            final LinearLayout inventoryChangeAllView = (LinearLayout) findViewById(R.id.inventory_changeall);
+
+            final Button changeButton = (Button) inventoryChangeAllView.findViewById(R.id.changebutton);
+            changeButton.setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View view) {
+                    selectAllTrackablesAction();
+                }
+            });
+
+            inventoryChangeAllView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void enablePostButton(boolean enabled) {
+        postButton.setEnabled(enabled);
+        if (enabled) {
+            postButton.setOnClickListener(new PostListener());
+        }
+        else {
+            postButton.setOnTouchListener(null);
+            postButton.setOnClickListener(null);
+        }
+        updatePostButtonText();
+    }
+
+    private void updatePostButtonText() {
+        postButton.setText(getPostButtonText());
+    }
+
+    private String getPostButtonText() {
+        if (!postButton.isEnabled()) {
+            return res.getString(R.string.log_post_not_possible);
+        }
+        if (typeSelected != LogType.FOUND_IT || !Settings.isGCvoteLogin() || !cache.supportsGCVote()) {
+            return res.getString(R.string.log_post);
+        }
+        if (rating == 0) {
+            return res.getString(R.string.log_post_no_rate);
+        }
+        return res.getString(R.string.log_post_rate) + " " + ratingTextValue(rating) + "*";
+    }
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState, R.layout.logcache_activity);
+
+        // Get parameters from intent and basic cache information from database
+        final Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            cacheid = extras.getString(EXTRAS_ID);
+            geocode = extras.getString(EXTRAS_GEOCODE);
+        }
+
+        if ((StringUtils.isBlank(cacheid)) && StringUtils.isNotBlank(geocode)) {
+            cacheid = cgData.getCacheidForGeocode(geocode);
+        }
+        if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(cacheid)) {
+            geocode = cgData.getGeocodeForGuid(cacheid);
+        }
+
+        cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
+        possibleLogTypes = cache.getPossibleLogTypes();
+
+        if (StringUtils.isNotBlank(cache.getName())) {
+            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getName());
+        } else {
+            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getGeocode());
+        }
+
+        // Get ids for later use
+        postButton = (Button) findViewById(R.id.post);
+        tweetBox = (LinearLayout) findViewById(R.id.tweet_box);
+        tweetCheck = (CheckBox) findViewById(R.id.tweet);
+
+        // initialize with default values
+        setDefaultValues();
+
+        // Restore previous state
+        if (savedInstanceState != null) {
+            rating = savedInstanceState.getDouble(SAVED_STATE_RATING);
+            typeSelected = LogType.getById(savedInstanceState.getInt(SAVED_STATE_TYPE));
+            date.setTimeInMillis(savedInstanceState.getLong(SAVED_STATE_DATE));
+            imageCaption = savedInstanceState.getString(SAVED_STATE_IMAGE_CAPTION);
+            imageDescription = savedInstanceState.getString(SAVED_STATE_IMAGE_DESCRIPTION);
+            imageUri = Uri.parse(savedInstanceState.getString(SAVED_STATE_IMAGE_URI));
+        } else {
+            // If log had been previously saved, load it now, otherwise initialize signature as needed
+            final LogEntry log = cgData.loadLogOffline(geocode);
+            if (log != null) {
+                typeSelected = log.type;
+                date.setTime(new Date(log.date));
+                text = log.log;
+            } else if (StringUtils.isNotBlank(Settings.getSignature())
+                    && Settings.isAutoInsertSignature()
+                    && StringUtils.isBlank(currentLogText())) {
+                insertIntoLog(LogTemplateProvider.applyTemplates(Settings.getSignature(), new LogContext(cache)), false);
+            }
+        }
+        updatePostButtonText();
+        updateImageButton();
+        enablePostButton(false);
+
+        final Button typeButton = (Button) findViewById(R.id.type);
+        typeButton.setText(typeSelected.getL10n());
+        typeButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                selectLogType();
+            }
+        });
+
+        final Button dateButton = (Button) findViewById(R.id.date);
+        setDate(date);
+        dateButton.setOnClickListener(new DateListener());
+
+        final EditText logView = (EditText) findViewById(R.id.log);
+        if (StringUtils.isBlank(currentLogText()) && StringUtils.isNotBlank(text)) {
+            logView.setText(text);
+        }
+
+        tweetCheck.setChecked(true);
+        updateTweetBox(typeSelected);
+
+        final Button imageButton = (Button) findViewById(R.id.image_btn);
+        imageButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                selectImage();
+            }
+        });
+
+        final Button saveButton = (Button) findViewById(R.id.save);
+        saveButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                saveLog(true);
+            }
+        });
+
+        final Button clearButton = (Button) findViewById(R.id.clear);
+        clearButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                clearLog();
+            }
+        });
+
+        loggingManager = cache.getLoggingManager(this);
+
+        loggingManager.init();
+    }
+
+    private void setDefaultValues() {
+        date = Calendar.getInstance();
+        rating = 0.0;
+        if (cache.isEventCache()) {
+            final Date eventDate = cache.getHiddenDate();
+            boolean expired = DateUtils.daysSince(eventDate.getTime()) > 0;
+
+            if (cache.hasOwnLog(LogType.WILL_ATTEND) || expired) {
+                if (cache.hasOwnLog(LogType.ATTENDED)) {
+                    typeSelected = LogType.NOTE;
+                }
+                else {
+                    typeSelected = LogType.ATTENDED;
+                }
+            }
+            else {
+                typeSelected = LogType.WILL_ATTEND;
+            }
+        }
+        else {
+            if (cache.isFound()) {
+                typeSelected = LogType.NOTE;
+            } else {
+                typeSelected = LogType.FOUND_IT;
+            }
+        }
+        text = null;
+        imageCaption = StringUtils.EMPTY;
+        imageDescription = StringUtils.EMPTY;
+        imageUri = Uri.EMPTY;
+    }
+
+    private void clearLog() {
+        cgData.clearLogOffline(geocode);
+
+        setDefaultValues();
+
+        setType(typeSelected);
+        setDate(date);
+
+        final EditText logView = (EditText) findViewById(R.id.log);
+        logView.setText(StringUtils.EMPTY);
+
+        updateImageButton();
+
+        showToast(res.getString(R.string.info_log_cleared));
+    }
+
+    @Override
+    public void finish() {
+        saveLog(false);
+        super.finish();
+    }
+
+    @Override
+    public void onStop() {
+        saveLog(false);
+        super.onStop();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        super.onCreateOptionsMenu(menu);
+
+        final SubMenu menuStars = menu.addSubMenu(0, SUBMENU_VOTE, 0, res.getString(R.string.log_rating)).setIcon(R.drawable.ic_menu_sort_by_size);
+        menuStars.add(0, 10, 0, res.getString(R.string.log_no_rating));
+        menuStars.add(0, 19, 0, res.getString(R.string.log_stars_5) + " (" + res.getString(R.string.log_stars_5_description) + ")");
+        menuStars.add(0, 18, 0, res.getString(R.string.log_stars_45) + " (" + res.getString(R.string.log_stars_45_description) + ")");
+        menuStars.add(0, 17, 0, res.getString(R.string.log_stars_4) + " (" + res.getString(R.string.log_stars_4_description) + ")");
+        menuStars.add(0, 16, 0, res.getString(R.string.log_stars_35) + " (" + res.getString(R.string.log_stars_35_description) + ")");
+        menuStars.add(0, 15, 0, res.getString(R.string.log_stars_3) + " (" + res.getString(R.string.log_stars_3_description) + ")");
+        menuStars.add(0, 14, 0, res.getString(R.string.log_stars_25) + " (" + res.getString(R.string.log_stars_25_description) + ")");
+        menuStars.add(0, 13, 0, res.getString(R.string.log_stars_2) + " (" + res.getString(R.string.log_stars_2_description) + ")");
+        menuStars.add(0, 12, 0, res.getString(R.string.log_stars_15) + " (" + res.getString(R.string.log_stars_15_description) + ")");
+        menuStars.add(0, 11, 0, res.getString(R.string.log_stars_1) + " (" + res.getString(R.string.log_stars_1_description) + ")");
+
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+
+        final boolean voteAvailable = Settings.isGCvoteLogin() && typeSelected == LogType.FOUND_IT && StringUtils.isNotBlank(cache.getGuid()) && cache.supportsGCVote();
+        menu.findItem(SUBMENU_VOTE).setVisible(voteAvailable);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (super.onOptionsItemSelected(item)) {
+            return true;
+        }
+
+        final int id = item.getItemId();
+        if (id >= 10 && id <= 19) {
+            rating = (id - 9) / 2.0;
+            if (rating < 1) {
+                rating = 0;
+            }
+            updatePostButtonText();
+            return true;
+        }
+
+        return false;
+    }
+
+    private static String ratingTextValue(final double rating) {
+        return String.format(Locale.getDefault(), "%.1f", rating);
+    }
+
+    @Override
+    protected void onSaveInstanceState(final Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putDouble(SAVED_STATE_RATING, rating);
+        outState.putInt(SAVED_STATE_TYPE, typeSelected.id);
+        outState.putLong(SAVED_STATE_DATE, date.getTimeInMillis());
+        outState.putString(SAVED_STATE_IMAGE_URI, imageUri.getPath());
+        outState.putString(SAVED_STATE_IMAGE_CAPTION, imageCaption);
+        outState.putString(SAVED_STATE_IMAGE_DESCRIPTION, imageDescription);
+    }
+
+    @Override
+    public void setDate(Calendar dateIn) {
+        date = dateIn;
+
+        final Button dateButton = (Button) findViewById(R.id.date);
+        dateButton.setText(Formatter.formatShortDateVerbally(date.getTime().getTime()));
+    }
+
+    public void setType(LogType type) {
+        final Button typeButton = (Button) findViewById(R.id.type);
+
+        typeSelected = type;
+        typeButton.setText(typeSelected.getL10n());
+
+        if (LogType.FOUND_IT == type && !tbChanged) {
+            // TODO: change action
+        } else if (LogType.FOUND_IT != type && !tbChanged) {
+            // TODO: change action
+        }
+
+        updateTweetBox(type);
+
+        updatePostButtonText();
+    }
+
+    private void updateTweetBox(LogType type) {
+        if (type == LogType.FOUND_IT && Settings.isUseTwitter()) {
+            tweetBox.setVisibility(View.VISIBLE);
+        } else {
+            tweetBox.setVisibility(View.GONE);
+        }
+    }
+
+    private class DateListener implements View.OnClickListener {
+
+        @Override
+        public void onClick(View arg0) {
+            final Dialog dateDialog = new DateDialog(LogCacheActivity.this, LogCacheActivity.this, date);
+            dateDialog.setCancelable(true);
+            dateDialog.show();
+        }
+    }
+
+    private class PostListener implements View.OnClickListener {
+        @Override
+        public void onClick(View arg0) {
+            final String message = res.getString(StringUtils.isBlank(imageUri.getPath()) ?
+                    R.string.log_saving :
+                    R.string.log_saving_and_uploading);
+            new Poster(LogCacheActivity.this, message).execute(currentLogText());
+        }
+    }
+
+    private class Poster extends AsyncTaskWithProgress<String, StatusCode> {
+
+        public Poster(final Activity activity, final String progressMessage) {
+            super(activity, null, progressMessage, true);
+        }
+
+        @Override
+        protected StatusCode doInBackgroundInternal(final String[] logTexts) {
+            final String log = logTexts[0];
+            try {
+                final LogResult logResult = loggingManager.postLog(cache, typeSelected, date, log, trackables);
+
+                if (logResult.getPostLogResult() == StatusCode.NO_ERROR) {
+                    final LogEntry logNow = new LogEntry(date, typeSelected, log);
+
+                    cache.getLogs().add(0, logNow);
+
+                    if (typeSelected == LogType.FOUND_IT || typeSelected == LogType.ATTENDED) {
+                        cache.setFound(true);
+                    }
+
+                    cgData.saveChangedCache(cache);
+                    cgData.clearLogOffline(geocode);
+
+                    if (typeSelected == LogType.FOUND_IT) {
+                        if (tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
+                            Twitter.postTweetCache(geocode);
+                        }
+                        GCVote.setRating(cache, rating);
+                    }
+
+                    if (StringUtils.isNotBlank(imageUri.getPath())) {
+                        ImageResult imageResult = loggingManager.postLogImage(logResult.getLogId(), imageCaption, imageDescription, imageUri);
+                        final String uploadedImageUrl = imageResult.getImageUri();
+                        if (StringUtils.isNotEmpty(uploadedImageUrl)) {
+                            logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
+                            cgData.saveChangedCache(cache);
+                        }
+                        return imageResult.getPostResult();
+                    }
+                }
+
+                return logResult.getPostLogResult();
+            } catch (Exception e) {
+                Log.e("VisitCacheActivity.Poster.doInBackgroundInternal", e);
+            }
+
+            return StatusCode.LOG_POST_ERROR;
+        }
+
+        @Override
+        protected void onPostExecuteInternal(final StatusCode status) {
+            if (status == StatusCode.NO_ERROR) {
+                showToast(res.getString(R.string.info_log_posted));
+                // No need to save the log when quitting if it has been posted.
+                text = currentLogText();
+                finish();
+            } else if (status == StatusCode.LOG_SAVED) {
+                showToast(res.getString(R.string.info_log_saved));
+                finish();
+            } else {
+                showToast(status.getErrorString(res));
+            }
+        }
+    }
+
+    private void saveLog(final boolean force) {
+        final String log = currentLogText();
+
+        // Do not erase the saved log if the user has removed all the characters
+        // without using "Clear". This may be a manipulation mistake, and erasing
+        // again will be easy using "Clear" while retyping the text may not be.
+        if (force || (StringUtils.isNotEmpty(log) && !StringUtils.equals(log, text))) {
+            cache.logOffline(this, log, date, typeSelected);
+        }
+        text = log;
+    }
+
+    private String currentLogText() {
+        return ((EditText) findViewById(R.id.log)).getText().toString();
+    }
+
+    @Override
+    protected LogContext getLogContext() {
+        return new LogContext(cache);
+    }
+
+    private void selectAllTrackablesAction() {
+        Builder alert = new AlertDialog.Builder(this);
+        alert.setTitle(res.getString(R.string.log_tb_changeall));
+        String[] tbLogTypes = getTBLogTypes();
+        alert.setItems(tbLogTypes, new OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int position) {
+                final LogTypeTrackable logType = LogTypeTrackable.values()[position];
+                for (TrackableLog tb : trackables) {
+                    tb.action = logType;
+                }
+                tbChanged = true;
+                updateTrackablesList();
+                dialog.dismiss();
+            }
+        });
+        alert.create().show();
+    }
+
+    private String[] getTBLogTypes() {
+        final LogTypeTrackable[] logTypeValues = LogTypeTrackable.values();
+        String[] logTypes = new String[logTypeValues.length];
+        for (int i = 0; i < logTypes.length; i++) {
+            logTypes[i] = res.getString(logTypeValues[i].resourceId);
+        }
+        return logTypes;
+    }
+
+    private void selectLogType() {
+        // use a local copy of the possible types, as that one might be modified in the background by the loader
+        final ArrayList<LogType> possible = new ArrayList<LogType>(possibleLogTypes);
+
+        Builder alert = new AlertDialog.Builder(this);
+        String[] choices = new String[possible.size()];
+        for (int i = 0; i < choices.length; i++) {
+            choices[i] = possible.get(i).getL10n();
+        }
+        alert.setSingleChoiceItems(choices, possible.indexOf(typeSelected), new OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int position) {
+                setType(possible.get(position));
+                dialog.dismiss();
+            }
+        });
+        alert.create().show();
+    }
+
+    private void selectTrackableAction(View view) {
+        final int realViewId = view.getId();
+        Builder alert = new AlertDialog.Builder(this);
+        final TrackableLog trackableLog = actionButtons.get(realViewId);
+        alert.setTitle(trackableLog.name);
+        String[] tbLogTypes = getTBLogTypes();
+        alert.setItems(tbLogTypes, new OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int position) {
+                final LogTypeTrackable logType = LogTypeTrackable.values()[position];
+                tbChanged = true;
+                trackableLog.action = logType;
+                Log.i("Trackable " + trackableLog.trackCode + " (" + trackableLog.name + ") has new action: #" + logType);
+                updateTrackablesList();
+                dialog.dismiss();
+            }
+        });
+        alert.create().show();
+    }
+
+    private void selectImage() {
+        Intent selectImageIntent = new Intent(this, ImageSelectActivity.class);
+        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_CAPTION, imageCaption);
+        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_DESCRIPTION, imageDescription);
+        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_URI_AS_STRING, imageUri.toString());
+
+        startActivityForResult(selectImageIntent, SELECT_IMAGE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SELECT_IMAGE) {
+            if (resultCode == RESULT_OK) {
+                imageCaption = data.getStringExtra(ImageSelectActivity.EXTRAS_CAPTION);
+                imageDescription = data.getStringExtra(ImageSelectActivity.EXTRAS_DESCRIPTION);
+                imageUri = Uri.parse(data.getStringExtra(ImageSelectActivity.EXTRAS_URI_AS_STRING));
+            } else if (resultCode != RESULT_CANCELED) {
+                // Image capture failed, advise user
+                showToast(getResources().getString(R.string.err_select_logimage_failed));
+            }
+            updateImageButton();
+
+        }
+    }
+
+    private void updateImageButton() {
+        final Button imageButton = (Button) findViewById(R.id.image_btn);
+        if (cache.supportsLogImages()) {
+            imageButton.setVisibility(View.VISIBLE);
+            imageButton.setText(StringUtils.isNotBlank(imageUri.getPath()) ?
+                res.getString(R.string.log_image_edit) : res.getString(R.string.log_image_attach));
+        } else {
+            imageButton.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 7d8575b..1f6feb7 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -115,7 +115,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.touch);
+        super.onCreate(savedInstanceState, R.layout.logtrackable_activity);
         Views.inject(this);
 
         // get parameters
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index e8de1f7..9c3e89f 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -189,7 +189,7 @@ public class MainActivity extends AbstractActivity {
     public void onCreate(Bundle savedInstanceState) {
         // don't call the super implementation with the layout argument, as that would set the wrong theme
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
+        setContentView(R.layout.main_activity);
         Views.inject(this);
 
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index cc6853b..6f94944 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -119,7 +119,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.point);
+        super.onCreate(savedInstanceState, R.layout.navigateanypoint_activity);
         Views.inject(this);
 
         createHistoryView();
@@ -127,7 +127,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     }
 
     private void createHistoryView() {
-        final View pointControls = getLayoutInflater().inflate(R.layout.point_controls, null);
+        final View pointControls = getLayoutInflater().inflate(R.layout.navigateanypoint_header, null);
         historyListView.addHeaderView(pointControls, null, false);
 
         // inject a second time to also find the dynamically expanded views above
@@ -197,7 +197,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     private TextView getEmptyHistoryFooter() {
         if (historyFooter == null) {
-            historyFooter = (TextView) getLayoutInflater().inflate(R.layout.caches_footer, null);
+            historyFooter = (TextView) getLayoutInflater().inflate(R.layout.cacheslist_footer, null);
             historyFooter.setText(R.string.search_history_empty);
         }
         return historyFooter;
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 946724f..0c31abf 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -78,7 +78,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         setTheme();
-        setContentView(R.layout.search);
+        setContentView(R.layout.search_activity);
 
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.search));
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index aa163ad..872d5ee 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -126,7 +126,7 @@ public class SettingsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.init);
+        super.onCreate(savedInstanceState, R.layout.settings_activity);
 
         init();
     }
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index d8bc614..5cf9e9d 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -85,7 +85,7 @@ public class StaticMapsActivity extends AbstractActivity {
 
         for (final Bitmap image : maps) {
             if (image != null) {
-                final ImageView map = (ImageView) inflater.inflate(R.layout.map_static_item, null);
+                final ImageView map = (ImageView) inflater.inflate(R.layout.staticmaps_activity_item, null);
                 map.setImageBitmap(image);
                 smapsView.addView(map);
             }
@@ -94,7 +94,7 @@ public class StaticMapsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.map_static);
+        super.onCreate(savedInstanceState, R.layout.staticmaps_activity);
 
         if (geocode == null) {
             showToast("Sorry, c:geo forgot for what cache you want to load static maps.");
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index b74db83..8093bba 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -67,16 +67,16 @@ public class UsefulAppsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.useful_apps_activity);
+        super.onCreate(savedInstanceState, R.layout.usefulapps_activity);
 
         Views.inject(this);
 
-        list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.useful_apps_item, HELPER_APPS) {
+        list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.usefulapps_item, HELPER_APPS) {
             @Override
             public View getView(int position, View convertView, android.view.ViewGroup parent) {
                 View rowView = convertView;
                 if (null == rowView) {
-                    rowView = getLayoutInflater().inflate(R.layout.useful_apps_item, null);
+                    rowView = getLayoutInflater().inflate(R.layout.usefulapps_item, null);
                 }
                 ViewHolder holder = (ViewHolder) rowView.getTag();
                 if (null == holder) {
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
deleted file mode 100644
index 89a7249..0000000
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ /dev/null
@@ -1,706 +0,0 @@
-package cgeo.geocaching;
-
-import cgeo.geocaching.connector.ILoggingManager;
-import cgeo.geocaching.connector.ImageResult;
-import cgeo.geocaching.connector.LogResult;
-import cgeo.geocaching.enumerations.LoadFlags;
-import cgeo.geocaching.enumerations.LogType;
-import cgeo.geocaching.enumerations.LogTypeTrackable;
-import cgeo.geocaching.enumerations.StatusCode;
-import cgeo.geocaching.gcvote.GCVote;
-import cgeo.geocaching.twitter.Twitter;
-import cgeo.geocaching.ui.Formatter;
-import cgeo.geocaching.ui.dialog.DateDialog;
-import cgeo.geocaching.utils.AsyncTaskWithProgress;
-import cgeo.geocaching.utils.DateUtils;
-import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.LogTemplateProvider;
-import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-public class VisitCacheActivity extends AbstractLoggingActivity implements DateDialog.DateDialogParent {
-    static final String EXTRAS_GEOCODE = "geocode";
-    static final String EXTRAS_ID = "id";
-
-    private static final int SUBMENU_VOTE = 3;
-    private static final String SAVED_STATE_RATING = "cgeo.geocaching.saved_state_rating";
-    private static final String SAVED_STATE_TYPE = "cgeo.geocaching.saved_state_type";
-    private static final String SAVED_STATE_DATE = "cgeo.geocaching.saved_state_date";
-    private static final String SAVED_STATE_IMAGE_CAPTION = "cgeo.geocaching.saved_state_image_caption";
-    private static final String SAVED_STATE_IMAGE_DESCRIPTION = "cgeo.geocaching.saved_state_image_description";
-    private static final String SAVED_STATE_IMAGE_URI = "cgeo.geocaching.saved_state_image_uri";
-
-    private static final int SELECT_IMAGE = 101;
-
-    private LayoutInflater inflater = null;
-    private Geocache cache = null;
-    private String cacheid = null;
-    private String geocode = null;
-    private String text = null;
-    private List<LogType> possibleLogTypes = new ArrayList<LogType>();
-    private List<TrackableLog> trackables = null;
-    private Button postButton = null;
-    private CheckBox tweetCheck = null;
-    private LinearLayout tweetBox = null;
-    private boolean tbChanged = false;
-    private SparseArray<TrackableLog> actionButtons;
-
-    private ILoggingManager loggingManager;
-
-    // Data to be saved while reconfiguring
-    private double rating;
-    private LogType typeSelected;
-    private Calendar date;
-    private String imageCaption;
-    private String imageDescription;
-    private Uri imageUri;
-
-
-    public void onLoadFinished() {
-
-        if (loggingManager.hasLoaderError()) {
-            showErrorLoadingData();
-            return;
-        }
-
-        trackables = loggingManager.getTrackables();
-        possibleLogTypes = loggingManager.getPossibleLogTypes();
-
-        if (possibleLogTypes.isEmpty()) {
-            showErrorLoadingData();
-            return;
-        }
-
-        if (!possibleLogTypes.contains(typeSelected)) {
-            typeSelected = possibleLogTypes.get(0);
-            setType(typeSelected);
-
-            showToast(res.getString(R.string.info_log_type_changed));
-        }
-
-        enablePostButton(true);
-
-        initializeTrackablesAction();
-        updateTrackablesList();
-
-        showProgress(false);
-    }
-
-    private void showErrorLoadingData() {
-        showToast(res.getString(R.string.err_log_load_data));
-        showProgress(false);
-    }
-
-    private void initializeTrackablesAction() {
-        if (Settings.isTrackableAutoVisit()) {
-            for (TrackableLog trackable : trackables) {
-                trackable.action = LogTypeTrackable.VISITED;
-                tbChanged = true;
-            }
-        }
-    }
-
-    private void updateTrackablesList() {
-        if (CollectionUtils.isEmpty(trackables)) {
-            return;
-        }
-        if (inflater == null) {
-            inflater = getLayoutInflater();
-        }
-        actionButtons = new SparseArray<TrackableLog>();
-
-        final LinearLayout inventoryView = (LinearLayout) findViewById(R.id.inventory);
-        inventoryView.removeAllViews();
-
-        for (TrackableLog tb : trackables) {
-            LinearLayout inventoryItem = (LinearLayout) inflater.inflate(R.layout.visit_trackable, null);
-
-            ((TextView) inventoryItem.findViewById(R.id.trackcode)).setText(tb.trackCode);
-            ((TextView) inventoryItem.findViewById(R.id.name)).setText(tb.name);
-            final TextView actionButton = (TextView) inventoryItem.findViewById(R.id.action);
-            actionButton.setId(tb.id);
-            actionButtons.put(actionButton.getId(), tb);
-            actionButton.setText(res.getString(tb.action.resourceId) + " ▼");
-            actionButton.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View view) {
-                    selectTrackableAction(view);
-                }
-            });
-
-            final String tbCode = tb.trackCode;
-            inventoryItem.setClickable(true);
-            inventoryItem.findViewById(R.id.info).setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View view) {
-                    final Intent trackablesIntent = new Intent(VisitCacheActivity.this, TrackableActivity.class);
-                    trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, tbCode);
-                    startActivity(trackablesIntent);
-                }
-            });
-
-            inventoryView.addView(inventoryItem);
-        }
-
-        if (inventoryView.getChildCount() > 0) {
-            findViewById(R.id.inventory_box).setVisibility(View.VISIBLE);
-        }
-        if (inventoryView.getChildCount() > 1) {
-            final LinearLayout inventoryChangeAllView = (LinearLayout) findViewById(R.id.inventory_changeall);
-
-            final Button changeButton = (Button) inventoryChangeAllView.findViewById(R.id.changebutton);
-            changeButton.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View view) {
-                    selectAllTrackablesAction();
-                }
-            });
-
-            inventoryChangeAllView.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private void enablePostButton(boolean enabled) {
-        postButton.setEnabled(enabled);
-        if (enabled) {
-            postButton.setOnClickListener(new PostListener());
-        }
-        else {
-            postButton.setOnTouchListener(null);
-            postButton.setOnClickListener(null);
-        }
-        updatePostButtonText();
-    }
-
-    private void updatePostButtonText() {
-        postButton.setText(getPostButtonText());
-    }
-
-    private String getPostButtonText() {
-        if (!postButton.isEnabled()) {
-            return res.getString(R.string.log_post_not_possible);
-        }
-        if (typeSelected != LogType.FOUND_IT || !Settings.isGCvoteLogin() || !cache.supportsGCVote()) {
-            return res.getString(R.string.log_post);
-        }
-        if (rating == 0) {
-            return res.getString(R.string.log_post_no_rate);
-        }
-        return res.getString(R.string.log_post_rate) + " " + ratingTextValue(rating) + "*";
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.visit);
-
-        // Get parameters from intent and basic cache information from database
-        final Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            cacheid = extras.getString(EXTRAS_ID);
-            geocode = extras.getString(EXTRAS_GEOCODE);
-        }
-
-        if ((StringUtils.isBlank(cacheid)) && StringUtils.isNotBlank(geocode)) {
-            cacheid = cgData.getCacheidForGeocode(geocode);
-        }
-        if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(cacheid)) {
-            geocode = cgData.getGeocodeForGuid(cacheid);
-        }
-
-        cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
-        possibleLogTypes = cache.getPossibleLogTypes();
-
-        if (StringUtils.isNotBlank(cache.getName())) {
-            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getName());
-        } else {
-            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getGeocode());
-        }
-
-        // Get ids for later use
-        postButton = (Button) findViewById(R.id.post);
-        tweetBox = (LinearLayout) findViewById(R.id.tweet_box);
-        tweetCheck = (CheckBox) findViewById(R.id.tweet);
-
-        // initialize with default values
-        setDefaultValues();
-
-        // Restore previous state
-        if (savedInstanceState != null) {
-            rating = savedInstanceState.getDouble(SAVED_STATE_RATING);
-            typeSelected = LogType.getById(savedInstanceState.getInt(SAVED_STATE_TYPE));
-            date.setTimeInMillis(savedInstanceState.getLong(SAVED_STATE_DATE));
-            imageCaption = savedInstanceState.getString(SAVED_STATE_IMAGE_CAPTION);
-            imageDescription = savedInstanceState.getString(SAVED_STATE_IMAGE_DESCRIPTION);
-            imageUri = Uri.parse(savedInstanceState.getString(SAVED_STATE_IMAGE_URI));
-        } else {
-            // If log had been previously saved, load it now, otherwise initialize signature as needed
-            final LogEntry log = cgData.loadLogOffline(geocode);
-            if (log != null) {
-                typeSelected = log.type;
-                date.setTime(new Date(log.date));
-                text = log.log;
-            } else if (StringUtils.isNotBlank(Settings.getSignature())
-                    && Settings.isAutoInsertSignature()
-                    && StringUtils.isBlank(currentLogText())) {
-                insertIntoLog(LogTemplateProvider.applyTemplates(Settings.getSignature(), new LogContext(cache)), false);
-            }
-        }
-        updatePostButtonText();
-        updateImageButton();
-        enablePostButton(false);
-
-        final Button typeButton = (Button) findViewById(R.id.type);
-        typeButton.setText(typeSelected.getL10n());
-        typeButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                selectLogType();
-            }
-        });
-
-        final Button dateButton = (Button) findViewById(R.id.date);
-        setDate(date);
-        dateButton.setOnClickListener(new DateListener());
-
-        final EditText logView = (EditText) findViewById(R.id.log);
-        if (StringUtils.isBlank(currentLogText()) && StringUtils.isNotBlank(text)) {
-            logView.setText(text);
-        }
-
-        tweetCheck.setChecked(true);
-        updateTweetBox(typeSelected);
-
-        final Button imageButton = (Button) findViewById(R.id.image_btn);
-        imageButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                selectImage();
-            }
-        });
-
-        final Button saveButton = (Button) findViewById(R.id.save);
-        saveButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                saveLog(true);
-            }
-        });
-
-        final Button clearButton = (Button) findViewById(R.id.clear);
-        clearButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                clearLog();
-            }
-        });
-
-        loggingManager = cache.getLoggingManager(this);
-
-        loggingManager.init();
-    }
-
-    private void setDefaultValues() {
-        date = Calendar.getInstance();
-        rating = 0.0;
-        if (cache.isEventCache()) {
-            final Date eventDate = cache.getHiddenDate();
-            boolean expired = DateUtils.daysSince(eventDate.getTime()) > 0;
-
-            if (cache.hasOwnLog(LogType.WILL_ATTEND) || expired) {
-                if (cache.hasOwnLog(LogType.ATTENDED)) {
-                    typeSelected = LogType.NOTE;
-                }
-                else {
-                    typeSelected = LogType.ATTENDED;
-                }
-            }
-            else {
-                typeSelected = LogType.WILL_ATTEND;
-            }
-        }
-        else {
-            if (cache.isFound()) {
-                typeSelected = LogType.NOTE;
-            } else {
-                typeSelected = LogType.FOUND_IT;
-            }
-        }
-        text = null;
-        imageCaption = StringUtils.EMPTY;
-        imageDescription = StringUtils.EMPTY;
-        imageUri = Uri.EMPTY;
-    }
-
-    private void clearLog() {
-        cgData.clearLogOffline(geocode);
-
-        setDefaultValues();
-
-        setType(typeSelected);
-        setDate(date);
-
-        final EditText logView = (EditText) findViewById(R.id.log);
-        logView.setText(StringUtils.EMPTY);
-
-        updateImageButton();
-
-        showToast(res.getString(R.string.info_log_cleared));
-    }
-
-    @Override
-    public void finish() {
-        saveLog(false);
-        super.finish();
-    }
-
-    @Override
-    public void onStop() {
-        saveLog(false);
-        super.onStop();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        super.onCreateOptionsMenu(menu);
-
-        final SubMenu menuStars = menu.addSubMenu(0, SUBMENU_VOTE, 0, res.getString(R.string.log_rating)).setIcon(R.drawable.ic_menu_sort_by_size);
-        menuStars.add(0, 10, 0, res.getString(R.string.log_no_rating));
-        menuStars.add(0, 19, 0, res.getString(R.string.log_stars_5) + " (" + res.getString(R.string.log_stars_5_description) + ")");
-        menuStars.add(0, 18, 0, res.getString(R.string.log_stars_45) + " (" + res.getString(R.string.log_stars_45_description) + ")");
-        menuStars.add(0, 17, 0, res.getString(R.string.log_stars_4) + " (" + res.getString(R.string.log_stars_4_description) + ")");
-        menuStars.add(0, 16, 0, res.getString(R.string.log_stars_35) + " (" + res.getString(R.string.log_stars_35_description) + ")");
-        menuStars.add(0, 15, 0, res.getString(R.string.log_stars_3) + " (" + res.getString(R.string.log_stars_3_description) + ")");
-        menuStars.add(0, 14, 0, res.getString(R.string.log_stars_25) + " (" + res.getString(R.string.log_stars_25_description) + ")");
-        menuStars.add(0, 13, 0, res.getString(R.string.log_stars_2) + " (" + res.getString(R.string.log_stars_2_description) + ")");
-        menuStars.add(0, 12, 0, res.getString(R.string.log_stars_15) + " (" + res.getString(R.string.log_stars_15_description) + ")");
-        menuStars.add(0, 11, 0, res.getString(R.string.log_stars_1) + " (" + res.getString(R.string.log_stars_1_description) + ")");
-
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-
-        final boolean voteAvailable = Settings.isGCvoteLogin() && typeSelected == LogType.FOUND_IT && StringUtils.isNotBlank(cache.getGuid()) && cache.supportsGCVote();
-        menu.findItem(SUBMENU_VOTE).setVisible(voteAvailable);
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (super.onOptionsItemSelected(item)) {
-            return true;
-        }
-
-        final int id = item.getItemId();
-        if (id >= 10 && id <= 19) {
-            rating = (id - 9) / 2.0;
-            if (rating < 1) {
-                rating = 0;
-            }
-            updatePostButtonText();
-            return true;
-        }
-
-        return false;
-    }
-
-    private static String ratingTextValue(final double rating) {
-        return String.format(Locale.getDefault(), "%.1f", rating);
-    }
-
-    @Override
-    protected void onSaveInstanceState(final Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putDouble(SAVED_STATE_RATING, rating);
-        outState.putInt(SAVED_STATE_TYPE, typeSelected.id);
-        outState.putLong(SAVED_STATE_DATE, date.getTimeInMillis());
-        outState.putString(SAVED_STATE_IMAGE_URI, imageUri.getPath());
-        outState.putString(SAVED_STATE_IMAGE_CAPTION, imageCaption);
-        outState.putString(SAVED_STATE_IMAGE_DESCRIPTION, imageDescription);
-    }
-
-    @Override
-    public void setDate(Calendar dateIn) {
-        date = dateIn;
-
-        final Button dateButton = (Button) findViewById(R.id.date);
-        dateButton.setText(Formatter.formatShortDateVerbally(date.getTime().getTime()));
-    }
-
-    public void setType(LogType type) {
-        final Button typeButton = (Button) findViewById(R.id.type);
-
-        typeSelected = type;
-        typeButton.setText(typeSelected.getL10n());
-
-        if (LogType.FOUND_IT == type && !tbChanged) {
-            // TODO: change action
-        } else if (LogType.FOUND_IT != type && !tbChanged) {
-            // TODO: change action
-        }
-
-        updateTweetBox(type);
-
-        updatePostButtonText();
-    }
-
-    private void updateTweetBox(LogType type) {
-        if (type == LogType.FOUND_IT && Settings.isUseTwitter()) {
-            tweetBox.setVisibility(View.VISIBLE);
-        } else {
-            tweetBox.setVisibility(View.GONE);
-        }
-    }
-
-    private class DateListener implements View.OnClickListener {
-
-        @Override
-        public void onClick(View arg0) {
-            final Dialog dateDialog = new DateDialog(VisitCacheActivity.this, VisitCacheActivity.this, date);
-            dateDialog.setCancelable(true);
-            dateDialog.show();
-        }
-    }
-
-    private class PostListener implements View.OnClickListener {
-        @Override
-        public void onClick(View arg0) {
-            final String message = res.getString(StringUtils.isBlank(imageUri.getPath()) ?
-                    R.string.log_saving :
-                    R.string.log_saving_and_uploading);
-            new Poster(VisitCacheActivity.this, message).execute(currentLogText());
-        }
-    }
-
-    private class Poster extends AsyncTaskWithProgress<String, StatusCode> {
-
-        public Poster(final Activity activity, final String progressMessage) {
-            super(activity, null, progressMessage, true);
-        }
-
-        @Override
-        protected StatusCode doInBackgroundInternal(final String[] logTexts) {
-            final String log = logTexts[0];
-            try {
-                final LogResult logResult = loggingManager.postLog(cache, typeSelected, date, log, trackables);
-
-                if (logResult.getPostLogResult() == StatusCode.NO_ERROR) {
-                    final LogEntry logNow = new LogEntry(date, typeSelected, log);
-
-                    cache.getLogs().add(0, logNow);
-
-                    if (typeSelected == LogType.FOUND_IT || typeSelected == LogType.ATTENDED) {
-                        cache.setFound(true);
-                    }
-
-                    cgData.saveChangedCache(cache);
-                    cgData.clearLogOffline(geocode);
-
-                    if (typeSelected == LogType.FOUND_IT) {
-                        if (tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
-                            Twitter.postTweetCache(geocode);
-                        }
-                        GCVote.setRating(cache, rating);
-                    }
-
-                    if (StringUtils.isNotBlank(imageUri.getPath())) {
-                        ImageResult imageResult = loggingManager.postLogImage(logResult.getLogId(), imageCaption, imageDescription, imageUri);
-                        final String uploadedImageUrl = imageResult.getImageUri();
-                        if (StringUtils.isNotEmpty(uploadedImageUrl)) {
-                            logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
-                            cgData.saveChangedCache(cache);
-                        }
-                        return imageResult.getPostResult();
-                    }
-                }
-
-                return logResult.getPostLogResult();
-            } catch (Exception e) {
-                Log.e("VisitCacheActivity.Poster.doInBackgroundInternal", e);
-            }
-
-            return StatusCode.LOG_POST_ERROR;
-        }
-
-        @Override
-        protected void onPostExecuteInternal(final StatusCode status) {
-            if (status == StatusCode.NO_ERROR) {
-                showToast(res.getString(R.string.info_log_posted));
-                // No need to save the log when quitting if it has been posted.
-                text = currentLogText();
-                finish();
-            } else if (status == StatusCode.LOG_SAVED) {
-                showToast(res.getString(R.string.info_log_saved));
-                finish();
-            } else {
-                showToast(status.getErrorString(res));
-            }
-        }
-    }
-
-    private void saveLog(final boolean force) {
-        final String log = currentLogText();
-
-        // Do not erase the saved log if the user has removed all the characters
-        // without using "Clear". This may be a manipulation mistake, and erasing
-        // again will be easy using "Clear" while retyping the text may not be.
-        if (force || (StringUtils.isNotEmpty(log) && !StringUtils.equals(log, text))) {
-            cache.logOffline(this, log, date, typeSelected);
-        }
-        text = log;
-    }
-
-    private String currentLogText() {
-        return ((EditText) findViewById(R.id.log)).getText().toString();
-    }
-
-    @Override
-    protected LogContext getLogContext() {
-        return new LogContext(cache);
-    }
-
-    private void selectAllTrackablesAction() {
-        Builder alert = new AlertDialog.Builder(this);
-        alert.setTitle(res.getString(R.string.log_tb_changeall));
-        String[] tbLogTypes = getTBLogTypes();
-        alert.setItems(tbLogTypes, new OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int position) {
-                final LogTypeTrackable logType = LogTypeTrackable.values()[position];
-                for (TrackableLog tb : trackables) {
-                    tb.action = logType;
-                }
-                tbChanged = true;
-                updateTrackablesList();
-                dialog.dismiss();
-            }
-        });
-        alert.create().show();
-    }
-
-    private String[] getTBLogTypes() {
-        final LogTypeTrackable[] logTypeValues = LogTypeTrackable.values();
-        String[] logTypes = new String[logTypeValues.length];
-        for (int i = 0; i < logTypes.length; i++) {
-            logTypes[i] = res.getString(logTypeValues[i].resourceId);
-        }
-        return logTypes;
-    }
-
-    private void selectLogType() {
-        // use a local copy of the possible types, as that one might be modified in the background by the loader
-        final ArrayList<LogType> possible = new ArrayList<LogType>(possibleLogTypes);
-
-        Builder alert = new AlertDialog.Builder(this);
-        String[] choices = new String[possible.size()];
-        for (int i = 0; i < choices.length; i++) {
-            choices[i] = possible.get(i).getL10n();
-        }
-        alert.setSingleChoiceItems(choices, possible.indexOf(typeSelected), new OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int position) {
-                setType(possible.get(position));
-                dialog.dismiss();
-            }
-        });
-        alert.create().show();
-    }
-
-    private void selectTrackableAction(View view) {
-        final int realViewId = view.getId();
-        Builder alert = new AlertDialog.Builder(this);
-        final TrackableLog trackableLog = actionButtons.get(realViewId);
-        alert.setTitle(trackableLog.name);
-        String[] tbLogTypes = getTBLogTypes();
-        alert.setItems(tbLogTypes, new OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int position) {
-                final LogTypeTrackable logType = LogTypeTrackable.values()[position];
-                tbChanged = true;
-                trackableLog.action = logType;
-                Log.i("Trackable " + trackableLog.trackCode + " (" + trackableLog.name + ") has new action: #" + logType);
-                updateTrackablesList();
-                dialog.dismiss();
-            }
-        });
-        alert.create().show();
-    }
-
-    private void selectImage() {
-        Intent selectImageIntent = new Intent(this, ImageSelectActivity.class);
-        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_CAPTION, imageCaption);
-        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_DESCRIPTION, imageDescription);
-        selectImageIntent.putExtra(ImageSelectActivity.EXTRAS_URI_AS_STRING, imageUri.toString());
-
-        startActivityForResult(selectImageIntent, SELECT_IMAGE);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SELECT_IMAGE) {
-            if (resultCode == RESULT_OK) {
-                imageCaption = data.getStringExtra(ImageSelectActivity.EXTRAS_CAPTION);
-                imageDescription = data.getStringExtra(ImageSelectActivity.EXTRAS_DESCRIPTION);
-                imageUri = Uri.parse(data.getStringExtra(ImageSelectActivity.EXTRAS_URI_AS_STRING));
-            } else if (resultCode != RESULT_CANCELED) {
-                // Image capture failed, advise user
-                showToast(getResources().getString(R.string.err_select_logimage_failed));
-            }
-            updateImageButton();
-
-        }
-    }
-
-    private void updateImageButton() {
-        final Button imageButton = (Button) findViewById(R.id.image_btn);
-        if (cache.supportsLogImages()) {
-            imageButton.setVisibility(View.VISIBLE);
-            imageButton.setText(StringUtils.isNotBlank(imageUri.getPath()) ?
-                res.getString(R.string.log_image_edit) : res.getString(R.string.log_image_attach));
-        } else {
-            imageButton.setVisibility(View.GONE);
-        }
-    }
-}
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 6dad510..40dddd4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -408,7 +408,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         super.onCreate(savedInstanceState);
 
         setTheme();
-        setContentView(R.layout.caches);
+        setContentView(R.layout.cacheslist_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
@@ -1000,7 +1000,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             if (inflater == null) {
                 inflater = getLayoutInflater();
             }
-            listFooter = inflater.inflate(R.layout.caches_footer, null);
+            listFooter = inflater.inflate(R.layout.cacheslist_footer, null);
             listFooter.setClickable(true);
             listFooter.setOnClickListener(new MoreCachesListener());
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
index 0fbd718..4f2f8c4 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.VisitCacheActivity;
+import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.ImageResult;
@@ -30,7 +30,7 @@ import java.util.List;
 
 public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCallbacks<String> {
 
-    private final VisitCacheActivity activity;
+    private final LogCacheActivity activity;
     private final Geocache cache;
 
     private String[] viewstates;
@@ -39,7 +39,7 @@ public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCa
     private boolean hasLoaderError = true;
 
     public GCLoggingManager(Activity activity, Geocache cache) {
-        this.activity = (VisitCacheActivity) activity;
+        this.activity = (LogCacheActivity) activity;
         this.cache = cache;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
index c5d6990..8a94218 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.connector.oc;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.VisitCacheActivity;
+import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
@@ -21,7 +21,7 @@ public class OkapiLoggingManager implements ILoggingManager {
 
     private final OCApiConnector connector;
     private final Geocache cache;
-    private VisitCacheActivity activity;
+    private LogCacheActivity activity;
 
     private final static List<LogType> standardLogTypes = Arrays.asList(LogType.FOUND_IT, LogType.DIDNT_FIND_IT, LogType.NOTE, LogType.NEEDS_MAINTENANCE);
     private final static List<LogType> eventLogTypes = Arrays.asList(LogType.WILL_ATTEND, LogType.ATTENDED, LogType.NOTE);
@@ -29,7 +29,7 @@ public class OkapiLoggingManager implements ILoggingManager {
     public OkapiLoggingManager(Activity activity, OCApiConnector connector, Geocache cache) {
         this.connector = connector;
         this.cache = cache;
-        this.activity = (VisitCacheActivity) activity;
+        this.activity = (LogCacheActivity) activity;
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 6689bb6..736c036 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -50,7 +50,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
         // holder pattern implementation
         final ViewHolder holder;
         if (view == null) {
-            view = inflater.inflate(R.layout.addresses_item, null);
+            view = inflater.inflate(R.layout.addresslist_item, null);
             holder = new ViewHolder(view);
         } else {
             holder = (ViewHolder) view.getTag();
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 80f01e2..9059a6b 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -68,7 +68,7 @@ public final class CacheDetailsCreator {
         final LayoutInflater inflater = LayoutInflater.from(activity);
 
         for (int i = 0; i < 5; i++) {
-            ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
+            ImageView star = (ImageView) inflater.inflate(R.layout.star_image, null);
             if (value - i >= 0.75) {
                 star.setImageResource(R.drawable.star_on);
             } else if (value - i >= 0.25) {
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index 122f835..d95363e 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -354,7 +354,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
 
         final ViewHolder holder;
         if (v == null) {
-            v = inflater.inflate(R.layout.caches_item, null);
+            v = inflater.inflate(R.layout.cacheslist_item, null);
 
             holder = new ViewHolder(v);
         } else {
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index becd422..4ab9af0 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -72,7 +72,7 @@ public class CoordinatesInputDialog extends Dialog {
             // nothing
         }
 
-        setContentView(R.layout.coords);
+        setContentView(R.layout.coordinatesinput_dialog);
 
         final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
         final ArrayAdapter<CharSequence> adapter =
-- 
cgit v1.1