lint cleanups

* unused resources
* textIsSelectable

18 files changed, 1253 insertions, 959 deletions

diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml
index 39ad8ff..15862e6 100644
--- a/main/res/layout/about.xml
+++ b/main/res/layout/about.xml
@@ -1,205 +1,256 @@
 <?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:background="?background_color" >
-	<LinearLayout style="@style/action_bar">
-		<ImageView style="@style/action_bar_action"
-				android:onClick="goHome" />
-		<View style="@style/action_bar_separator" />
-		<TextView style="@style/action_bar_title" />
-	</LinearLayout>
-	<ScrollView
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:padding="4dip"
-			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="fill_parent"
-					android:layout_marginTop="10dip"
-					android:orientation="vertical" >
-				<ImageView
-						android:layout_width="200dip"
-						android:layout_height="200dip"
-						android:layout_margin="10dip"
-						android:layout_gravity="center"
-						android:gravity="center"
-						android:scaleType="fitXY"
-						android:src="@drawable/cgeo_logo" />
-				<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="10dip"
-						android:layout_marginRight="10dip"
-						android:layout_marginTop="5dip"
-						android:layout_gravity="left"
-						android:textSize="14dip"
-						android:textColor="?text_color"
-						android:text="@string/quote" />
-				<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="10dip"
-						android:layout_marginRight="10dip"
-						android:layout_marginBottom="5dip"
-						android:layout_gravity="right"
-						android:textSize="14dip"
-						android:textColor="?text_color"
-						android:text="@string/powered_by" />
-			</LinearLayout>
-			<RelativeLayout style="@style/separator_horizontal_layout" >
-				<View style="@style/separator_horizontal" />
-				<TextView style="@style/separator_horizontal_headline"
-						android:text="@string/about_version" />
-			</RelativeLayout>
-			<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="10dip"
-						android:layout_marginRight="10dip"
-						android:layout_marginBottom="5dip"
-						android:layout_gravity="left"
-						android:textSize="14dip"
-						android:textStyle="bold"
-						android:textColor="?text_color"
-						android:id="@+id/about_version_string" />
-			<RelativeLayout style="@style/separator_horizontal_layout" >
-				<View style="@style/separator_horizontal" />
-				<TextView style="@style/separator_horizontal_headline"
-						android:text="@string/about_donate" />
-			</RelativeLayout>
-			<LinearLayout
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="10dip"
-					android:orientation="horizontal"
-					android:gravity="center_horizontal" >
-				<Button style="@style/button_full"
-						android:layout_width="280dip"
-						android:singleLine="false"
-						android:lines="2"
-						android:onClick="donate"
-						android:text="@string/about_donation_more" />
-			</LinearLayout>
-			<RelativeLayout style="@style/separator_horizontal_layout" >
-				<View style="@style/separator_horizontal" />
-				<TextView style="@style/separator_horizontal_headline"
-						android:text="@string/about_detail" />
-			</RelativeLayout>
-			<TextView android:id="@+id/support"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dip"
-					android:layout_marginRight="10dip"
-					android:layout_marginBottom="5dip"
-					android:layout_gravity="left"
-					android:textSize="14dip"
-					android:textColor="?text_color"
-					android:textColorLink="?text_color_link"
-					android:linksClickable="false"
-					android:focusable="true"
-					android:clickable="true"
-					android:onClick="support"
-					android:text="@string/support" />
-			<TextView android:id="@+id/website"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dip"
-					android:layout_marginRight="10dip"
-					android:layout_marginBottom="5dip"
-					android:layout_gravity="left"
-					android:textSize="14dip"
-					android:textColor="?text_color"
-					android:textColorLink="?text_color_link"
-					android:linksClickable="false"
-					android:focusable="true"
-					android:clickable="true"
-					android:onClick="website"
-					android:text="@string/website" />
-			<TextView android:id="@+id/facebook"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dip"
-					android:layout_marginRight="10dip"
-					android:layout_marginBottom="5dip"
-					android:layout_gravity="left"
-					android:textSize="14dip"
-					android:textColor="?text_color"
-					android:textColorLink="?text_color_link"
-					android:linksClickable="false"
-					android:focusable="true"
-					android:clickable="true"
-					android:onClick="facebook"
-					android:text="@string/facebook" />
-			<TextView android:id="@+id/twitter"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dip"
-					android:layout_marginRight="10dip"
-					android:layout_marginBottom="5dip"
-					android:layout_gravity="left"
-					android:textSize="14dip"
-					android:textColor="?text_color"
-					android:textColorLink="?text_color_link"
-					android:linksClickable="false"
-					android:focusable="true"
-					android:clickable="true"
-					android:onClick="twitter"
-					android:text="@string/twitter" />
-			<TextView android:id="@+id/nutshellmanual"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dip"
-					android:layout_marginRight="10dip"
-					android:layout_marginBottom="5dip"
-					android:layout_gravity="left"
-					android:textSize="14dip"
-					android:textColor="?text_color"
-					android:textColorLink="?text_color_link"
-					android:linksClickable="false"
-					android:focusable="true"
-					android:clickable="true"
-					android:onClick="nutshellmanual"
-					android:text="@string/nutshellmanual" />
-			<RelativeLayout style="@style/separator_horizontal_layout" >
-				<View style="@style/separator_horizontal" />
-				<TextView style="@style/separator_horizontal_headline"
-						android:text="@string/about_changelog" />
-			</RelativeLayout>
-			<TextView android:id="@+id/changelog"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_margin="7dip"
-					android:layout_gravity="left"
-					android:paddingLeft="3dip"
-					android:textSize="12dip"
-                    android:linksClickable="true"
-                    android:textColorLink="?text_color_link"
-					android:textColor="?text_color"
-					android:text="@string/changelog" />
-			<RelativeLayout style="@style/separator_horizontal_layout" >
-				<View style="@style/separator_horizontal" />
-				<TextView style="@style/separator_horizontal_headline"
-						android:text="@string/about_contributors" />
-			</RelativeLayout>
-			<TextView android:id="@+id/contributors"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_margin="7dip"
-					android:layout_gravity="left"
-					android:paddingLeft="3dip"
-					android:textSize="14dip"
-					android:linksClickable="true"
-					android:textColorLink="?text_color_link"
-					android:textColor="?text_color"
-					android:text="@string/contributors" />
-		</LinearLayout>
-	</ScrollView>
-</LinearLayout>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goHome" />
+
+        <View style="@style/action_bar_separator" />
+
+        <TextView style="@style/action_bar_title" />
+    </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:layout_marginTop="10dip"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_marginTop="10dip"
+                android:orientation="vertical" >
+
+                <ImageView
+                    android:layout_width="200dip"
+                    android:layout_height="200dip"
+                    android:layout_gravity="center"
+                    android:layout_margin="10dip"
+                    android:gravity="center"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/cgeo_logo" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:layout_marginTop="5dip"
+                    android:text="@string/quote"
+                    android:textColor="?text_color"
+                    android:textSize="14dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_marginBottom="5dip"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:text="@string/powered_by"
+                    android:textColor="?text_color"
+                    android:textSize="14dip" />
+            </LinearLayout>
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/about_version" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/about_version_string"
+                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:textColor="?text_color"
+                android:textIsSelectable="true"
+                android:textSize="14dip"
+                android:textStyle="bold" />
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/about_donate" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dip"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal" >
+
+                <Button
+                    style="@style/button_full"
+                    android:layout_width="280dip"
+                    android:lines="2"
+                    android:onClick="donate"
+                    android:singleLine="false"
+                    android:text="@string/about_donation_more" />
+            </LinearLayout>
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/about_detail" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/support"
+                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:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:onClick="support"
+                android:text="@string/support"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+
+            <TextView
+                android:id="@+id/website"
+                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:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:onClick="website"
+                android:text="@string/website"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+
+            <TextView
+                android:id="@+id/facebook"
+                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:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:onClick="facebook"
+                android:text="@string/facebook"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+
+            <TextView
+                android:id="@+id/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:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:onClick="twitter"
+                android:text="@string/twitter"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+
+            <TextView
+                android:id="@+id/nutshellmanual"
+                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:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:onClick="nutshellmanual"
+                android:text="@string/nutshellmanual"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/about_changelog" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/changelog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_margin="7dip"
+                android:linksClickable="true"
+                android:paddingLeft="3dip"
+                android:text="@string/changelog"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="12dip" />
+
+            <RelativeLayout style="@style/separator_horizontal_layout" >
+
+                <View style="@style/separator_horizontal" />
+
+                <TextView
+                    style="@style/separator_horizontal_headline"
+                    android:text="@string/about_contributors" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/contributors"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_margin="7dip"
+                android:linksClickable="true"
+                android:paddingLeft="3dip"
+                android:text="@string/contributors"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresses_item.xml b/main/res/layout/addresses_item.xml
index 0699a6f..3ea27ff 100644
--- a/main/res/layout/addresses_item.xml
+++ b/main/res/layout/addresses_item.xml
@@ -1,32 +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_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:layout_margin="3dip"
-		android:paddingLeft="5dip"
-		android:paddingRight="5dip"
-		android:paddingBottom="7dip"
-		android:paddingTop="7dip"
-		android:orientation="vertical"
-		android:background="?background_color" >
-	<TextView android:id="@+id/label"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="22dip"
-			android:gravity="left"
-			android:singleLine="false"
-			android:ellipsize="marquee"
-			android:textColor="?text_color" />
-	<TextView android:id="@+id/distance"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="12dip"
-			android:gravity="left"
-			android:lines="1"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:textColor="?text_color" />
+    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="22dip" />
+
+    <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="12dip" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/attribute_descriptions.xml b/main/res/layout/attribute_descriptions.xml
index 1d2459f..45dd3cd 100644
--- a/main/res/layout/attribute_descriptions.xml
+++ b/main/res/layout/attribute_descriptions.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/attribute_descriptions"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" >
-    <TextView android:id="@+id/attribute_descriptions_textview"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:textSize="14dip"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link" 
-            android:linksClickable="true" />
-</LinearLayout>
+    android:id="@+id/attribute_descriptions"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+
+    <TextView
+        android:id="@+id/attribute_descriptions_textview"
+        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:textIsSelectable="false"
+        android:textSize="14dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cache_information_item.xml b/main/res/layout/cache_information_item.xml
new file mode 100644
index 0000000..e9df7f5
--- /dev/null
+++ b/main/res/layout/cache_information_item.xml
@@ -0,0 +1,63 @@
+<?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="wrap_content"
+    android:layout_marginBottom="3dip" >
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="80dip"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="false"
+        android:layout_centerVertical="true"
+        android:layout_gravity="left|top"
+        android:layout_marginRight="4dip"
+        android:ellipsize="end"
+        android:gravity="right"
+        android:lines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:text="@null"
+        android:textColor="?text_color_headline"
+        android:textIsSelectable="false"
+        android:textSize="12dip" />
+
+    <TextView
+        android:id="@+id/value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="5dip"
+        android:layout_toRightOf="@+id/name"
+        android:gravity="center_vertical"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textSize="14dip" />
+
+    <LinearLayout
+        android:id="@+id/stars"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/value"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="gone" >
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/addition"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="5dip"
+        android:layout_toRightOf="@+id/stars"
+        android:gravity="center_vertical"
+        android:textColor="?text_color_grey"
+        android:textIsSelectable="false"
+        android:textSize="11dip"
+        android:visibility="gone" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/cache_layout.xml b/main/res/layout/cache_layout.xml
deleted file mode 100644
index 256026c..0000000
--- a/main/res/layout/cache_layout.xml
+++ /dev/null
@@ -1,43 +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="wrap_content"
-		android:layout_marginBottom="3dip" >
-	<TextView android:id="@+id/name"
-			android:layout_width="80dip"
-			android:layout_height="wrap_content"
-			android:layout_alignParentTop="false"
-			android:layout_alignParentLeft="true"
-			android:layout_gravity="left|top"
-			android:layout_marginRight="4dip"
-			android:gravity="right"
-			android:lines="1"
-			android:singleLine="true"
-			android:scrollHorizontally="true"
-			android:ellipsize="end"
-			android:textSize="12dip"
-			android:textColor="?text_color_headline"
-			android:text="@null" android:layout_centerVertical="true"/>
-    <TextView android:id="@+id/value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dip"
-            android:textSize="14dip"
-            android:textColor="?text_color" android:gravity="center_vertical" android:layout_toRightOf="@+id/name"
-            android:layout_centerVertical="true"/>
-    <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" android:id="@+id/stars" android:layout_toRightOf="@+id/value"
-            android:layout_centerVertical="true" android:visibility="gone" android:baselineAligned="false"
-            android:gravity="center_vertical">
-    </LinearLayout>
-    <TextView android:id="@+id/addition"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dip"
-            android:textSize="11dip"
-            android:textColor="?text_color_grey" android:gravity="center_vertical"
-            android:layout_centerVertical="true" android:layout_toRightOf="@+id/stars"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml
index db2bcbd..e3b861c 100644
--- a/main/res/layout/caches_item.xml
+++ b/main/res/layout/caches_item.xml
@@ -1,164 +1,184 @@
 <?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" >
-	
+<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_centerVertical="true"
-			android:layout_alignParentLeft="true"
-			android:layout_gravity="left"
-			android:paddingRight="5dip"
-			android:gravity="left|center_horizontal"
-			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_toRightOf="@id/checkbox"
-		android:layout_marginRight="4dip"
-		android:scaleType="fitXY"
-		android:visibility="gone"
-		android:src="@drawable/mark_green" />
-	
-	<!-- cache name and icon -->
-	
-	<TextView android:id="@+id/text"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginRight="110dip"
-			android:layout_toRightOf="@+id/log_status_mark"
-			android:layout_gravity="left"
-			android:paddingTop="5dip"
-			android:paddingRight="3dip"
-			android:lines="1"
-			android:singleLine="true"
-			android:scrollHorizontally="true"
-			android:ellipsize="marquee"
-			android:textSize="18dip"
-			android:textColor="?text_color" />
-	
-	<!-- cache attributes and other info -->
-	
-	<TextView android:id="@+id/info"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="30dip"
-			android:layout_marginRight="110dip"
-			android:layout_alignParentBottom="true"
-			android:layout_toRightOf="@id/log_status_mark"
-			android:layout_gravity="left"
-			android:paddingRight="3dip"
-			android:paddingBottom="5dip"
-			android:lines="1"
-			android:singleLine="true"
-			android:scrollHorizontally="true"
-			android:ellipsize="marquee"
-			android:textSize="12dip"
-			android:textColor="?text_color_grey" />
-	
-	<!-- real text based direction and distance -->
-	
-	<RelativeLayout android:id="@+id/direction_layout"
-			android:visibility="gone"
-			android:layout_width="78dip"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_alignParentRight="true"
-			android:layout_marginTop="1dip"
-			android:layout_marginBottom="1dip"
-			android:layout_marginRight="30dip" >
-		<view class="cgeo.geocaching.ui.DistanceView"
-				android:id="@+id/distance"
-				android:layout_width="78dip"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true"
-				android:layout_gravity="center"
-				android:lines="1"
-				android:singleLine="true"
-				android:scrollHorizontally="true"
-				android:ellipsize="marquee"
-				android:textSize="16dip"
-				android:textColor="?text_color"
-				android:gravity="center" />
-		<view class="cgeo.geocaching.ui.CompassMiniView"
-				android:id="@+id/direction"
-				android:layout_width="78dip"
-				android:layout_height="28px"
-				android:layout_marginTop="21dip"
-				android:layout_centerHorizontal="true"
-				android:layout_gravity="center"
-				android:minWidth="28px"
-				android:minHeight="28px"
-				android:gravity="center" 
-				cc:skin="?compass" />
-	</RelativeLayout>
-	
-	<!-- image based direction and distance -->
-	
-	<RelativeLayout android:id="@+id/dirimg_layout"
-			android:visibility="gone"
-			android:layout_width="78dip"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_alignParentRight="true"
-			android:layout_marginTop="1dip"
-			android:layout_marginBottom="1dip"
-			android:layout_marginRight="30dip" >
-		<ImageView android:id="@+id/dirimg"
-				android:layout_width="55dip"
-				android:layout_height="30dip"
-				android:layout_centerInParent="true"
-				android:layout_gravity="center"
-				android:gravity="center"
-				android:scaleType="fitXY"
-				android:src="@null" />
-	</RelativeLayout>
-	
-	<!-- inventory and favorites -->
-	
-	<RelativeLayout
-			android:layout_width="35dip"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_alignParentRight="true"
-			android:layout_marginTop="1dip"
-			android:layout_marginBottom="1dip">
-
-		<ImageView android:id="@+id/inventory"
-				android:layout_width="35dip"
-				android:layout_height="22dip"
-				android:layout_gravity="center_vertical|center_horizontal"
-				android:layout_alignParentTop="true"
-				android:scaleType="center"
-				android:src="@drawable/trackable_all"
-				android:background="?inventory"/>
-		<TextView android:id="@+id/favourite"
-				android:layout_width="35dip"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="22dip"
-				android:layout_centerHorizontal="true"
-				android:layout_alignParentBottom="true"
-				android:layout_gravity="center"
-				android:gravity="center"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
-				android:paddingBottom="1dip"
-				android:lines="1"
-				android:singleLine="true"
-				android:scrollHorizontally="true"
-				android:ellipsize="marquee"
-				android:textSize="12dip"
-				android:textStyle="bold"
-				android:background="?favourite"
-				android:textColor="?text_color" />
-	</RelativeLayout>
+
+    <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="18dip" />
+
+    <!-- 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="12dip" />
+
+    <!-- real text based direction and distance -->
+
+    <RelativeLayout
+        android:id="@+id/direction_layout"
+        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"
+        android:visibility="gone" >
+
+        <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="16dip" />
+
+        <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"
+            cc:skin="?compass" />
+    </RelativeLayout>
+
+    <!-- image based direction and distance -->
+
+    <RelativeLayout
+        android:id="@+id/dirimg_layout"
+        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"
+        android:visibility="gone" >
+
+        <ImageView
+            android:id="@+id/dirimg"
+            android:layout_width="55dip"
+            android:layout_height="30dip"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:scaleType="fitXY"
+            android:src="@null" />
+    </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/favourite"
+            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="?favourite"
+            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="12dip"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/filter_bar.xml b/main/res/layout/filter_bar.xml
index 9df8f84..6d12ae1 100644
--- a/main/res/layout/filter_bar.xml
+++ b/main/res/layout/filter_bar.xml
@@ -14,6 +14,7 @@
 
     <TextView
         android:id="@+id/filter_text"
-        style="@style/filter_bar_text" />
+        style="@style/filter_bar_text"
+        android:textIsSelectable="false" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/gpx_item.xml b/main/res/layout/gpx_item.xml
index 8c0ac7b..df735bc 100644
--- a/main/res/layout/gpx_item.xml
+++ b/main/res/layout/gpx_item.xml
@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/button_map"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:layout_margin="3dip"
-		android:paddingLeft="5dip"
-		android:paddingRight="5dip"
-		android:paddingBottom="7dip"
-		android:paddingTop="7dip"
-		android:orientation="vertical"
-		android:background="?background_color" >
-	<TextView android:id="@+id/filepath"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="12dip"
-			android:gravity="right"
-			android:lines="1"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:textColor="?text_color_grey" />
-	<TextView android:id="@+id/filename"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="22dip"
-			android:gravity="left"
-			android:lines="1"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:textColor="?text_color" />
+    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/filepath"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:gravity="right"
+        android:lines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color_grey"
+        android:textIsSelectable="false"
+        android:textSize="12dip" />
+
+    <TextView
+        android:id="@+id/filename"
+        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="22dip" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index 32b1d30..0f9aff0 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -1,198 +1,256 @@
 <?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" />
-		<View style="@style/action_bar_separator" />
-		<ImageView style="@style/action_bar_action"
-				android:src="@drawable/actionbar_search"
-				android:onClick="goSearch" />
-		<View style="@style/action_bar_separator" />
-		<ImageView style="@style/action_bar_action"
-				android:src="@drawable/actionbar_manual"
-				android:onClick="goManual" />
-	</LinearLayout>
-    <fragment android:id="@+id/status"
-			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"
-        android:name="cgeo.geocaching.StatusFragment" />
-<!-- ** -->
-	<LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="45dip"
-			android:layout_centerInParent="true"
-			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:orientation="vertical"
-					android:onClick="cgeoFindOnMap" >
-				<View
-						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">
-				<View
-						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" />
-				<LinearLayout
-						android:layout_width="74dip"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"
-						android:layout_alignParentTop="true" >
-					<View
-							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:orientation="vertical"
-					android:onClick="cgeoSearch" >
-				<View
-						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:orientation="vertical"
-					android:onClick="cgeoPoint" >
-				<View
-						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:orientation="vertical"
-					android:onClick="cgeoFilter" >
-				<View
-						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>
-<!-- ** -->
-	<RelativeLayout android:id="@+id/helper"
-			android:visibility="gone"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:layout_marginLeft="16dip"
-			android:layout_marginRight="16dip"
-			android:layout_marginBottom="64dip"
-			android:background="@drawable/helper_bcg" >
-		<ImageView
-				android:layout_width="32dip"
-				android:layout_height="32dip"
-				android:layout_alignParentLeft="true"
-				android:layout_gravity="center"
-				android:gravity="center"
-				android:layout_margin="4dip"
-				android:scaleType="center"
-				android:src="@drawable/actionbar_manual" />
-		<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="34dip"
-				android:layout_gravity="center"
-				android:gravity="center"
-				android:padding="4dip"
-				android:textSize="14dip"
-				android:textColor="@color/text_icon"
-				android:text="@string/helper" />
-	</RelativeLayout>
-<!-- ** -->
-	<LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:layout_marginRight="6dip"
-			android:layout_marginLeft="6dip"
-			android:orientation="vertical"
-			android:onClick="cgeoNavSettings">
-		<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" />
-			<TextView android:id="@+id/nav_accuracy"
-					style="@style/location_current_accuracy" />
-			<TextView android:id="@+id/nav_satellites"
-					style="@style/location_current_satellites" />
-		</RelativeLayout>
-	</LinearLayout>
-</RelativeLayout>
+    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" />
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goSearch"
+            android:src="@drawable/actionbar_search" />
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goManual"
+            android:src="@drawable/actionbar_manual" />
+    </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" >
+
+                <View
+                    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" >
+
+                <View
+                    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" >
+
+                    <View
+                        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" >
+
+                <View
+                    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" >
+
+                <View
+                    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" >
+
+                <View
+                    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>
+    <!-- ** -->
+
+    <RelativeLayout
+        android:id="@+id/helper"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="64dip"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:background="@drawable/helper_bcg"
+        android:visibility="gone" >
+
+        <ImageView
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_alignParentLeft="true"
+            android:layout_gravity="center"
+            android:layout_margin="4dip"
+            android:gravity="center"
+            android:scaleType="center"
+            android:src="@drawable/actionbar_manual" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="34dip"
+            android:gravity="center"
+            android:padding="4dip"
+            android:text="@string/helper"
+            android:textColor="@color/text_icon"
+            android:textSize="14dip" />
+    </RelativeLayout>
+    <!-- ** -->
+
+    <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/mapfile_item.xml b/main/res/layout/mapfile_item.xml
index a024b81..c30315a 100644
--- a/main/res/layout/mapfile_item.xml
+++ b/main/res/layout/mapfile_item.xml
@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/mapfile_item"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:layout_margin="3dip"
-		android:paddingLeft="5dip"
-		android:paddingRight="5dip"
-		android:paddingBottom="7dip"
-		android:paddingTop="7dip"
-		android:orientation="vertical"
-		android:background="?background_color" >
-	<TextView android:id="@+id/mapfilepath"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="12dip"
-			android:gravity="right"
-			android:lines="1"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:textColor="?text_color_grey" />
-	<TextView android:id="@+id/mapfilename"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:scrollHorizontally="true"
-			android:textSize="22dip"
-			android:gravity="left"
-			android:lines="1"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:textColor="?text_color" />
+    android:id="@+id/mapfile_item"
+    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/mapfilepath"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:gravity="right"
+        android:lines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?text_color_grey"
+        android:textIsSelectable="false"
+        android:textSize="12dip" />
+
+    <TextView
+        android:id="@+id/mapfilename"
+        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="22dip" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 61cfe2a..0c95958 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -1,99 +1,134 @@
 <?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:background="?background_color" >
-	<LinearLayout style="@style/action_bar">
-		<ImageView style="@style/action_bar_action"
-				android:onClick="goHome" />
-		<View style="@style/action_bar_separator" />
-		<TextView style="@style/action_bar_title" />
-		<View style="@style/action_bar_separator" />
-		<ImageView style="@style/action_bar_action"
-				android:src="@drawable/actionbar_manual"
-				android:onClick="goManual" />
-	</LinearLayout>
-	<RelativeLayout
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goHome" />
+
+        <View style="@style/action_bar_separator" />
+
+        <TextView style="@style/action_bar_title" />
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goManual"
+            android:src="@drawable/actionbar_manual" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
         <LinearLayout
-                android:layout_width="fill_parent"
+            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="14dip" />
+
+            <TextView
+                android:id="@+id/cacheinfo"
+                android:layout_width="wrap_content"
                 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:textSize="14dip"
-				   android:textColor="?text_color"/>
-           <TextView android:id="@+id/cacheinfo"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_gravity="center"
-                   android:textSize="14dip"
-                   android:textColor="?text_color"/>
+                android:layout_gravity="center"
+                android:textColor="?text_color"
+                android:textSize="14dip" />
+
             <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_marginLeft="3dip"
-				      android:layout_alignParentLeft="true"
-				      android:layout_gravity="left"
-				      android:textSize="26dip"
-				      android:textColor="?text_color"
-				      android:text="@null" />
-		      <TextView android:id="@+id/distance"
-				      android:layout_width="wrap_content"
-				      android:layout_height="wrap_content"
-				      android:layout_marginRight="3dip"
-				      android:layout_alignParentRight="true"
-				      android:layout_gravity="right"
-				      android:textSize="26dip"
-				      android:textColor="?text_color"
-				      android:text="@null" />
-			</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="26dip" />
+
+                <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="26dip" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <view
+            android:id="@+id/rose"
+            android:layout_width="fill_parent"
+            android:layout_height="295dip"
+            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" />
+
+        <LinearLayout
+            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 class="cgeo.geocaching.ui.CompassView"
-				android:id="@+id/rose"
-				android:layout_width="fill_parent"
-				android:layout_height="295dip"
-				android:layout_marginTop="6dip"
-				android:layout_marginBottom="1dip"
-				android:layout_marginRight="1dip"
-				android:layout_marginLeft="1dip"
-				android:layout_gravity="center_horizontal"
-				android:layout_centerInParent="true"
-				android:keepScreenOn="true"
-				android:gravity="center"
-				android:padding="4dip"
-				android:minWidth="289dip"
-				android:minHeight="289dip" />
-		<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_alignParentBottom="true"
-				android:layout_marginRight="6dip"
-				android:layout_marginLeft="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" />
-				<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>
-		</LinearLayout>
-	</RelativeLayout>
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 201b9e6..ff64c91 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -1,70 +1,99 @@
 <?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:background="?background_color_transparent" >
-	<LinearLayout style="@style/action_bar">
-		<TextView style="@style/action_bar_title" />
-		<View style="@style/action_bar_separator" />
-		<ImageView android:id="@+id/defaultNavigation" 
-		    	style="@style/action_bar_action"
-				android:src="@drawable/actionbar_compass_dark"
-				android:onClick="goDefaultNavigation"
-				android:longClickable="true" />
-		<View style="@style/action_bar_separator"
-		 		android:id="@+id/separator"
-		 />
-		<ImageView style="@style/action_bar_action"
-				android:src="@drawable/actionbar_manual"
-				android:onClick="goManual" />
-	</LinearLayout>
-	<ScrollView android:id="@+id/details_list_box"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:padding="4dip"
-			android:orientation="vertical" >
-		<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical" >
-			<LinearLayout android:id="@+id/details_list"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical" >
-			</LinearLayout>
-            <Button style="@style/button_small" android:id="@+id/more_details" android:text="@string/popup_more"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"/>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color_transparent"
+    android:orientation="vertical" >
+
+    <LinearLayout style="@style/action_bar" >
+
+        <TextView style="@style/action_bar_title" />
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageView
+            android:id="@+id/defaultNavigation"
+            style="@style/action_bar_action"
+            android:longClickable="true"
+            android:onClick="goDefaultNavigation"
+            android:src="@drawable/actionbar_compass_dark" />
+
+        <View
+            android:id="@+id/separator"
+            style="@style/action_bar_separator" />
+
+        <ImageView
+            style="@style/action_bar_action"
+            android:onClick="goManual"
+            android:src="@drawable/actionbar_manual" />
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/details_list_box"
+        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:id="@+id/details_list"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" >
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/more_details"
+                style="@style/button_small"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/popup_more" />
+
             <RelativeLayout style="@style/separator_horizontal_layout" >
+
                 <View style="@style/separator_horizontal" />
             </RelativeLayout>
+
             <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" >
-                <TextView android:id="@+id/offline_text"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="6dip"
-                          android:layout_marginRight="130dip"
-                          android:layout_alignParentLeft="true"
-                          android:layout_gravity="left"
-                          android:paddingRight="3dip"
-                          android:textSize="14dip"
-                          android:textColor="?text_color" />
-                <Button style="@style/button_small"
-                        android:id="@+id/offline_refresh"
-                        android:visibility="gone"
-                        android:layout_width="60dip"
-                        android:layout_marginRight="71dip"
-                        android:layout_alignParentRight="true"
-                        android:text="@string/cache_offline_refresh" />
-                <Button style="@style/button_small"
-                        android:id="@+id/offline_store"
-                        android:layout_width="60dip"
-                        android:layout_alignParentRight="true"
-                        android:text="@string/cache_offline_store" />
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="130dip"
+                    android:paddingRight="3dip"
+                    android:textColor="?text_color"
+                    android:textIsSelectable="false"
+                    android:textSize="14dip" />
+
+                <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>
-	</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/simple_dir_item.xml b/main/res/layout/simple_dir_item.xml
index 6261127..e268943 100644
--- a/main/res/layout/simple_dir_item.xml
+++ b/main/res/layout/simple_dir_item.xml
@@ -1,21 +1,26 @@
 <?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="horizontal"
-		android:background="?background_color" >
-	<CheckBox android:text=""
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?background_color"
+    android:orientation="horizontal" >
+
+    <CheckBox
         android:id="@+id/CheckBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:checked="false"/>
-    <TextView 
-	    android:id="@+id/TextView01" 
-	    android:layout_width="fill_parent" 
-	    android:layout_height="wrap_content"
-	    android:singleLine="true" 
-	    android:textStyle="bold" 
-	    android:layout_marginTop="5dip" 
-	    android:layout_marginLeft="5dip"
-	    android:textColor="?text_color"/>
-</LinearLayout>
+        android:checked="false"
+        android:text="" />
+
+    <TextView
+        android:id="@+id/TextView01"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:layout_marginTop="5dip"
+        android:singleLine="true"
+        android:textColor="?text_color"
+        android:textIsSelectable="false"
+        android:textStyle="bold" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/simple_list_item_1.xml b/main/res/layout/simple_list_item_1.xml
index 039b0c1..4e8898d 100644
--- a/main/res/layout/simple_list_item_1.xml
+++ b/main/res/layout/simple_list_item_1.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
+<!--
+     Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,9 +19,9 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceLarge"
     android:gravity="center_vertical"
-    android:paddingLeft="6dip"
     android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="6dip"
+    android:textAppearance="?android:attr/textAppearanceLarge"
     android:textColor="?text_color"
-/>
+    android:textIsSelectable="false" />
diff --git a/main/res/layout/simple_way_point.xml b/main/res/layout/simple_way_point.xml
index a1b7f33..88f76e7 100644
--- a/main/res/layout/simple_way_point.xml
+++ b/main/res/layout/simple_way_point.xml
@@ -1,25 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/linearLayout1" android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
-	<ImageView android:layout_width="wrap_content" android:src="@drawable/waypoint_waypoint"
-		android:id="@+id/imageView1" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginLeft="10dp"></ImageView>
-	<RelativeLayout android:layout_height="wrap_content"
-		android:id="@+id/relativeLayout1" android:layout_width="match_parent">
-		<TextView android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:id="@+id/simple_way_point_latitude" android:layout_width="wrap_content"
-			android:layout_alignParentLeft="true" android:layout_alignParentTop="true"
-			android:text="@string/latitude" android:layout_marginLeft="10dp"></TextView>
-		<TextView android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:id="@+id/simple_way_point_longitude" android:layout_width="wrap_content"
-			android:layout_below="@+id/simple_way_point_latitude" android:text="@string/longitude"
-			android:layout_marginLeft="10dp"></TextView>
-		<TextView android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:id="@+id/date" android:layout_width="wrap_content"
-			android:layout_alignParentRight="true" android:layout_alignParentTop="true"
-			android:layout_marginRight="10dp"></TextView>
-	</RelativeLayout>
-</LinearLayout>
+    android:id="@+id/linearLayout1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:src="@drawable/waypoint_waypoint" >
+    </ImageView>
+
+    <RelativeLayout
+        android:id="@+id/relativeLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/simple_way_point_latitude"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="10dp"
+            android:text="@string/latitude"
+            android:textAppearance="?android:attr/textAppearanceSmall" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/simple_way_point_longitude"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/simple_way_point_latitude"
+            android:layout_marginLeft="10dp"
+            android:text="@string/longitude"
+            android:textAppearance="?android:attr/textAppearanceSmall" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="10dp"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textIsSelectable="false" >
+        </TextView>
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/status.xml b/main/res/layout/status.xml
index 01b4333..4b1d55f 100644
--- a/main/res/layout/status.xml
+++ b/main/res/layout/status.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/status"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-	android:background="@drawable/helper_bcg"
-	android:visibility="invisible">
-    <ImageView android:id="@+id/status_icon"
+    android:background="@drawable/helper_bcg"
+    android:visibility="invisible" >
+
+    <ImageView
+        android:id="@+id/status_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_margin="4dip" />
-    <TextView android:id="@+id/status_message"
+
+    <TextView
+        android:id="@+id/status_message"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/status_icon"
         android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/status_icon"
         android:gravity="center"
         android:padding="4dip"
-        android:textSize="14dip"
-        android:textColor="@color/text_icon" />
+        android:textColor="@color/text_icon"
+        android:textIsSelectable="false"
+        android:textSize="14dip" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/useful_apps_item.xml
index 7dcb777..5c8f6f0 100644
--- a/main/res/layout/useful_apps_item.xml
+++ b/main/res/layout/useful_apps_item.xml
@@ -12,7 +12,8 @@
 
         <TextView
             android:id="@+id/title"
-            style="@style/separator_horizontal_headline" />
+            style="@style/separator_horizontal_headline"
+            android:textIsSelectable="true" />
     </RelativeLayout>
 
     <LinearLayout
@@ -41,6 +42,7 @@
             android:padding="3dip"
             android:textColor="?text_color"
             android:textColorLink="?text_color_link"
+            android:textIsSelectable="false"
             android:textSize="14dip" />
     </LinearLayout>
 
diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/visit_trackable.xml
index b4750cf..360e553 100644
--- a/main/res/layout/visit_trackable.xml
+++ b/main/res/layout/visit_trackable.xml
@@ -1,50 +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:paddingLeft="10dip"
-		android:paddingRight="10dip"
-		android:paddingBottom="10dip"
-		android:orientation="horizontal" >
-	<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:gravity="left"
-				android:lines="1"
-				android:singleLine="true"
-				android:scrollHorizontally="true"
-				android:ellipsize="marquee"
-				android:textSize="14dip"
-				android:textColor="?text_color" />
-		<TextView android:id="@+id/trackcode"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="left"
-				android:gravity="left"
-				android:lines="1"
-				android:singleLine="true"
-				android:scrollHorizontally="true"
-				android:ellipsize="marquee"
-				android:textSize="14dip"
-				android:textColor="?text_color" />
-	</LinearLayout>
-	<TextView android:id="@+id/action"
-			android:layout_width="0dip"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:layout_gravity="right"
-			android:gravity="right"
-			android:lines="1"
-			android:singleLine="true"
-			android:scrollHorizontally="true"
-			android:ellipsize="marquee"
-			android:textSize="14dip"
-			android:textColor="?text_color" />
-</LinearLayout>
+    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="14dip" />
+
+        <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="14dip" />
+    </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="14dip" />
+
+</LinearLayout>
\ No newline at end of file