diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b8f78b44c..1219470ef 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,191 +14,194 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:installLocation="auto"
-  android:versionCode="74"
-  android:versionName="2.0.6"
-  package="com.google.android.maps.mytracks" >
-  <!-- Permission to initialize services -->
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <!-- Permissions to record locations -->
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <!-- Permissions to access sensors -->
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-  <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-  <!-- Permission to read/write external storage -->
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <!-- Permissions to access My Tracks data -->
-  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
-  <!-- Permission to receive My Tracks internal broadcasts -->
-  <permission
-    android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
-    android:permissionGroup="android.permission-group.LOCATION"
-    android:protectionLevel="signature" />
-  <!-- Required features -->
-  <uses-feature
-    android:name="android.hardware.location.gps"
-    android:required="true" />
-  <!-- Optional features -->
-  <uses-feature
-    android:name="android.hardware.bluetooth"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.camera"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.faketouch"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.sensor.compass"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.telephony"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.telephony.gsm"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.touchscreen"
-    android:required="false" />
-  <uses-feature
-    android:name="android.hardware.touchscreen.multitouch"
-    android:required="false" />
-  <supports-screens
-    android:anyDensity="true"
-    android:largeScreens="true"
-    android:normalScreens="true"
-    android:smallScreens="true"
-    android:xlargeScreens="true" />
-  <application
-    android:allowBackup="true"
-    android:hardwareAccelerated="true"
-    android:icon="@drawable/ic_logo"
-    android:label="@string/app_name"
-    android:theme="@style/ThemeCustom"
-    tools:replace="android:label" >
-    <!-- Activities -->
-    <activity
-      android:label="@string/menu_aggregated_statistics"
-      android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.DeleteActivity" />
-      <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
-      <intent-filter>
-        <action android:name="android.intent.action.ATTACH_DATA" />
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="application/gpx" />
-        <data android:mimeType="application/gpx+xml" />
-        <data android:mimeType="application/vnd.google-earth.gpx" />
-        <data android:mimeType="application/vnd.google-earth.gpx+xml" />
-        <data android:scheme="file" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
-    <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
-    <activity
-      android:label="@string/menu_markers"
-      android:name="com.google.android.apps.mytracks.MarkerListActivity" >
-      <meta-data
-        android:name="android.app.default_searchable"
-        android:value="com.google.android.apps.mytracks.SearchListActivity" />
-    </activity>
-    <activity
-      android:launchMode="singleTop"
-      android:name="com.google.android.apps.mytracks.SearchListActivity" >
-      <intent-filter>
-        <action android:name="android.intent.action.SEARCH" />
-      </intent-filter>
-      <meta-data
-        android:name="android.app.searchable"
-        android:resource="@xml/search" />
-    </activity>
-    <activity
-      android:name="com.google.android.apps.mytracks.TrackDetailActivity"
-      android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity" >
-      <meta-data
-        android:name="android.support.PARENT_ACTIVITY"
-        android:value="com.google.android.apps.mytracks.TrackListActivity" />
-    </activity>
-    <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
-    <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <meta-data
-        android:name="android.app.default_searchable"
-        android:value="com.google.android.apps.mytracks.SearchListActivity" />
-    </activity>
-    <activity android:name="com.google.android.apps.mytracks.io.file.exporter.SaveActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.AdvancedSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
-    <activity
-      android:label="@string/track_widget_config_title"
-      android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity" >
-      <intent-filter>
-        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-      </intent-filter>
-    </activity>
-    <service
-      android:exported="false"
-      android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
-    <service
-      android:enabled="true"
-      android:exported="false"
-      android:icon="@drawable/ic_arrow_320"
-      android:label="@string/recording_service"
-      android:name="com.google.android.apps.mytracks.services.TrackRecordingService" />
-    <!-- Receivers -->
-    <receiver android:name="com.google.android.apps.mytracks.BootReceiver" >
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider" >
-      <intent-filter>
-        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_PAUSED" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_RESUMED" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_UPDATE" />
-      </intent-filter>
-      <meta-data
-        android:name="android.appwidget.provider"
-        android:resource="@xml/track_widget_info" />
-    </receiver>
-    <!-- Providers -->
-    <provider
-      android:authorities="com.google.android.maps.mytracks"
-      android:exported="false"
-      android:grantUriPermissions="true"
-      android:name="com.google.android.apps.mytracks.content.CustomContentProvider"
-    />
-    <!-- Search suggestion provider -->
-    <provider
-      android:authorities="com.google.android.maps.mytracks.search"
-      android:exported="false"
-      android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.maps.mytracks"
+    android:installLocation="auto"
+    android:versionCode="74"
+    android:versionName="2.0.6">
+    <!-- Permission to initialize services -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- Permissions to record locations -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <!-- Permissions to access sensors -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- Permission to read/write external storage -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Permissions to access My Tracks data -->
+    <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
+    <!-- Permission to receive My Tracks internal broadcasts -->
+    <permission
+        android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+        android:permissionGroup="android.permission-group.LOCATION"
+        android:protectionLevel="signature" />
+    <!-- Required features -->
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="true" />
+    <!-- Optional features -->
+    <uses-feature
+        android:name="android.hardware.bluetooth"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.faketouch"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.sensor.compass"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony.gsm"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen.multitouch"
+        android:required="false" />
 
-    <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="com.google.android.apps.mytracks.fileprovider"
-        android:exported="false"
-        android:grantUriPermissions="true">
-      <meta-data
-          android:name="android.support.FILE_PROVIDER_PATHS"
-          android:resource="@xml/file_paths" />
-    </provider>
-  </application>
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+    <application
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_logo"
+        android:label="@string/app_name"
+        android:theme="@style/ThemeCustom"
+        tools:replace="android:label">
+        <!-- Activities -->
+        <activity
+            android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
+            android:label="@string/menu_aggregated_statistics" />
+        <activity android:name="com.google.android.apps.mytracks.DeleteActivity" />
+        <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.ATTACH_DATA" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/gpx" />
+                <data android:mimeType="application/gpx+xml" />
+                <data android:mimeType="application/vnd.google-earth.gpx" />
+                <data android:mimeType="application/vnd.google-earth.gpx+xml" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
+        <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
+        <activity
+            android:name="com.google.android.apps.mytracks.MarkerListActivity"
+            android:label="@string/menu_markers">
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:value="com.google.android.apps.mytracks.SearchListActivity" />
+        </activity>
+        <activity
+            android:name="com.google.android.apps.mytracks.SearchListActivity"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/search" />
+        </activity>
+        <activity
+            android:name="com.google.android.apps.mytracks.TrackDetailActivity"
+            android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.google.android.apps.mytracks.TrackListActivity" />
+        </activity>
+        <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
+        <activity android:name="com.google.android.apps.mytracks.TrackListActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:value="com.google.android.apps.mytracks.SearchListActivity" />
+        </activity>
+        <activity android:name="com.google.android.apps.mytracks.io.file.exporter.SaveActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.AdvancedSettingsActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
+        <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
+        <activity
+            android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
+            android:label="@string/track_widget_config_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
+            android:exported="false" />
+        <service
+            android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
+            android:enabled="true"
+            android:exported="false"
+            android:icon="@drawable/ic_arrow_320"
+            android:label="@string/recording_service" />
+        <!-- Receivers -->
+        <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="com.google.android.apps.mytracks.TRACK_PAUSED" />
+                <action android:name="com.google.android.apps.mytracks.TRACK_RESUMED" />
+                <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
+                <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
+                <action android:name="com.google.android.apps.mytracks.TRACK_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/track_widget_info" />
+        </receiver>
+        <!-- Providers -->
+        <provider
+            android:name="com.google.android.apps.mytracks.content.CustomContentProvider"
+            android:authorities="com.google.android.maps.mytracks"
+            android:exported="false"
+            android:grantUriPermissions="true" />
+        <!-- Search suggestion provider -->
+        <provider
+            android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
+            android:authorities="com.google.android.maps.mytracks.search"
+            android:exported="false" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.google.android.apps.mytracks.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 </manifest>
diff --git a/src/main/res/anim/fadeout.xml b/src/main/res/anim/fadeout.xml
index 231311626..544a00328 100644
--- a/src/main/res/anim/fadeout.xml
+++ b/src/main/res/anim/fadeout.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-  android:duration="1000"
-  android:fromAlpha="1.0"
-  android:interpolator="@android:anim/linear_interpolator"
-  android:toAlpha="0.0" />
+    android:duration="1000"
+    android:fromAlpha="1.0"
+    android:interpolator="@android:anim/linear_interpolator"
+    android:toAlpha="0.0" />
diff --git a/src/main/res/drawable/activated_background_holo_dark.xml b/src/main/res/drawable/activated_background_holo_dark.xml
index 5741ebab8..e805b83ed 100644
--- a/src/main/res/drawable/activated_background_holo_dark.xml
+++ b/src/main/res/drawable/activated_background_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 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.
@@ -15,6 +14,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
+    <item android:drawable="@drawable/list_activated_holo" android:state_activated="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/src/main/res/drawable/btn_check_holo_dark.xml b/src/main/res/drawable/btn_check_holo_dark.xml
index cbdf44e3a..0c2f5e7d5 100644
--- a/src/main/res/drawable/btn_check_holo_dark.xml
+++ b/src/main/res/drawable/btn_check_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -17,49 +16,28 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Enabled states -->
-        
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_dark" />
 
-    <item android:state_checked="true" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_pressed_holo_dark" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_pressed_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
+    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
 
-    <item android:state_checked="true" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_pressed_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_check_off_pressed_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
 
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_dark" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_focused_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
+    <item android:drawable="@drawable/btn_check_off_focused_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
 
+    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/btn_check_on_disabled_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_check_off_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" android:state_window_focused="false" />
+    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" android:state_window_focused="false" />
 
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/btn_check_on_disabled_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_check_off_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_disabled_focused_holo_dark" android:state_checked="true" android:state_focused="true" />
+    <item android:drawable="@drawable/btn_check_off_disabled_focused_holo_dark" android:state_checked="false" android:state_focused="true" />
 
-    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disabled_holo_dark" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_check_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" />
+    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" />
 
 </selector>
diff --git a/src/main/res/drawable/btn_radio_holo_dark.xml b/src/main/res/drawable/btn_radio_holo_dark.xml
index e35d5709d..2b5eb79cc 100644
--- a/src/main/res/drawable/btn_radio_holo_dark.xml
+++ b/src/main/res/drawable/btn_radio_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -15,45 +14,27 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_dark" />
-          
-    <item android:state_checked="true" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_pressed_holo_dark" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_pressed_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
+    <item android:drawable="@drawable/btn_radio_off_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
 
-    <item android:state_checked="true" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_pressed_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_radio_off_pressed_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
 
-    <item android:state_checked="false" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_dark" />
-    <item android:state_checked="true" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_focused_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
+    <item android:drawable="@drawable/btn_radio_off_focused_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
+
+    <item android:drawable="@drawable/btn_radio_off_holo_dark" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/btn_radio_on_holo_dark" android:state_checked="true" android:state_enabled="true" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_disabled_holo_dark" android:state_checked="true" android:state_window_focused="false" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_holo_dark" android:state_checked="false" android:state_window_focused="false" />
 
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_disabled_focused_holo_dark" android:state_checked="true" android:state_focused="true" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_focused_holo_dark" android:state_checked="false" android:state_focused="true" />
 
-    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_holo_dark" android:state_checked="false" />
+    <item android:drawable="@drawable/btn_radio_on_disabled_holo_dark" android:state_checked="true" />
 
 </selector>
diff --git a/src/main/res/drawable/button_pause.xml b/src/main/res/drawable/button_pause.xml
index d81ef26ab..1e1dbc151 100644
--- a/src/main/res/drawable/button_pause.xml
+++ b/src/main/res/drawable/button_pause.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/ic_button_pause"/>
+    <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_button_pause" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/button_record.xml b/src/main/res/drawable/button_record.xml
index 0d4dc4ef1..249596b38 100644
--- a/src/main/res/drawable/button_record.xml
+++ b/src/main/res/drawable/button_record.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/ic_button_record"/>
+    <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_button_record" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/button_stop.xml b/src/main/res/drawable/button_stop.xml
index a1e833eff..bf5bf445e 100644
--- a/src/main/res/drawable/button_stop.xml
+++ b/src/main/res/drawable/button_stop.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/ic_button_stop"/>
+    <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_button_stop" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/edit_text_holo_dark.xml b/src/main/res/drawable/edit_text_holo_dark.xml
index 05a570c90..02859f70f 100644
--- a/src/main/res/drawable/edit_text_holo_dark.xml
+++ b/src/main/res/drawable/edit_text_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -15,11 +14,11 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />
-    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_disabled_holo_dark" />
-    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_activated_holo_dark" />
-    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_focused_holo_dark" />
-    <item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />
-    <item android:state_focused="true" android:drawable="@drawable/textfield_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" android:state_window_focused="false" />
+    <item android:drawable="@drawable/textfield_disabled_holo_dark" android:state_enabled="false" android:state_window_focused="false" />
+    <item android:drawable="@drawable/textfield_activated_holo_dark" android:state_enabled="true" android:state_focused="true" />
+    <item android:drawable="@drawable/textfield_focused_holo_dark" android:state_activated="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" />
+    <item android:drawable="@drawable/textfield_disabled_focused_holo_dark" android:state_focused="true" />
     <item android:drawable="@drawable/textfield_disabled_holo_dark" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/ic_logo.xml b/src/main/res/drawable/ic_logo.xml
index 017dbd413..863f22aaf 100644
--- a/src/main/res/drawable/ic_logo.xml
+++ b/src/main/res/drawable/ic_logo.xml
@@ -1,12 +1,23 @@
-<vector android:height="24dp" android:viewportHeight="100"
-    android:viewportWidth="100" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
     <path android:pathData="M82.489,12.834C83.196,10.418 82.043,9.556 79.926,10.917L10.087,55.828c-2.117,1.361 -1.795,2.628 0.714,2.815L39.806,60.807c2.51,0.188 5.291,2.267 6.18,4.621l10.282,27.208c0.89,2.354 2.195,2.304 2.902,-0.111z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="81.73018" android:endY="11.204678"
-                android:startX="27.696081" android:startY="83.44198" android:type="linear">
-                <item android:color="#FFFBB22F" android:offset="0"/>
-                <item android:color="#FFF58820" android:offset="1"/>
+            <gradient
+                android:endX="81.73018"
+                android:endY="11.204678"
+                android:startX="27.696081"
+                android:startY="83.44198"
+                android:type="linear">
+                <item
+                    android:color="#FFFBB22F"
+                    android:offset="0" />
+                <item
+                    android:color="#FFF58820"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/src/main/res/drawable/list_selector_background_transition_holo_dark.xml b/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
index a22572984..f84708e4b 100644
--- a/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
+++ b/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -15,6 +14,6 @@
 -->
 
 <transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/list_pressed_holo_dark"  />
-    <item android:drawable="@drawable/list_longpressed_holo"  />
+    <item android:drawable="@drawable/list_pressed_holo_dark" />
+    <item android:drawable="@drawable/list_longpressed_holo" />
 </transition>
diff --git a/src/main/res/drawable/list_selector_holo_dark.xml b/src/main/res/drawable/list_selector_holo_dark.xml
index cfe9487c5..cdc00775f 100644
--- a/src/main/res/drawable/list_selector_holo_dark.xml
+++ b/src/main/res/drawable/list_selector_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -16,12 +15,12 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+    <item android:drawable="@android:color/transparent" android:state_window_focused="false" />
 
     <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/list_focused_holo" />
+    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" />
+    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/list_focused_holo" android:state_focused="true" />
 </selector>
diff --git a/src/main/res/drawable/progress_horizontal_holo_dark.xml b/src/main/res/drawable/progress_horizontal_holo_dark.xml
index 328c7224a..5610feaa3 100644
--- a/src/main/res/drawable/progress_horizontal_holo_dark.xml
+++ b/src/main/res/drawable/progress_horizontal_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -16,17 +15,20 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:id="@android:id/background"
-          android:drawable="@drawable/progress_bg_holo_dark" />
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/progress_bg_holo_dark" />
 
     <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_secondary_holo_dark" />
+        <scale
+            android:drawable="@drawable/progress_secondary_holo_dark"
+            android:scaleWidth="100%" />
     </item>
 
     <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_primary_holo_dark" />
+        <scale
+            android:drawable="@drawable/progress_primary_holo_dark"
+            android:scaleWidth="100%" />
     </item>
 
 </layer-list>
diff --git a/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml b/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml
index e99c35bc7..911e98cd4 100644
--- a/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml
+++ b/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 /*
 ** Copyright 2011, The Android Open Source Project
 **
@@ -16,15 +15,30 @@
 ** limitations under the License.
 */
 -->
-<animation-list
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:oneshot="false">
-    <item android:drawable="@drawable/progressbar_indeterminate_holo1" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo2" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo3" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo4" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo5" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo6" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo7" android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo8" android:duration="50" />
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false">
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo1"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo2"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo3"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo4"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo5"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo6"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo7"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo8"
+        android:duration="50" />
 </animation-list>
diff --git a/src/main/res/drawable/spinner_background_holo_dark.xml b/src/main/res/drawable/spinner_background_holo_dark.xml
index eb6b18b51..070c95a89 100644
--- a/src/main/res/drawable/spinner_background_holo_dark.xml
+++ b/src/main/res/drawable/spinner_background_holo_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -15,11 +14,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-          android:drawable="@drawable/spinner_disabled_holo_dark" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/spinner_pressed_holo_dark" />
-    <item android:state_pressed="false" android:state_focused="true"
-          android:drawable="@drawable/spinner_focused_holo_dark" />
+    <item android:drawable="@drawable/spinner_disabled_holo_dark" android:state_enabled="false" />
+    <item android:drawable="@drawable/spinner_pressed_holo_dark" android:state_pressed="true" />
+    <item android:drawable="@drawable/spinner_focused_holo_dark" android:state_focused="true" android:state_pressed="false" />
     <item android:drawable="@drawable/spinner_default_holo_dark" />
 </selector>
diff --git a/src/main/res/drawable/tab_indicator_mytracks.xml b/src/main/res/drawable/tab_indicator_mytracks.xml
index f0a40880b..60a71714c 100644
--- a/src/main/res/drawable/tab_indicator_mytracks.xml
+++ b/src/main/res/drawable/tab_indicator_mytracks.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
-  <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
-  <!-- Pressed -->
-  <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
-  <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/tab_unselected" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <!-- Focused states -->
+    <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <!-- Pressed -->
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
+    <!-- Focused states -->
+    <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/text_gradient.xml b/src/main/res/drawable/text_gradient.xml
index 2b6a856be..f05783b9e 100644
--- a/src/main/res/drawable/text_gradient.xml
+++ b/src/main/res/drawable/text_gradient.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-  <gradient
-    android:angle="90"
-    android:centerColor="@color/text_gradient_center"
-    android:endColor="@color/text_gradient_start"
-    android:startColor="@color/text_gradient_end" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/text_gradient_center"
+        android:endColor="@color/text_gradient_start"
+        android:startColor="@color/text_gradient_end" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/layout-land/stats_content.xml b/src/main/res/layout-land/stats_content.xml
index 6be9c2191..e61583c7e 100644
--- a/src/main/res/layout-land/stats_content.xml
+++ b/src/main/res/layout-land/stats_content.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,131 +13,147 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- Distance, calorie, total time, and moving time -->
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_distance"
-      layout="@layout/stats_large_item" />
-    <include
-      android:id="@+id/stats_calorie"
-      layout="@layout/stats_activity_type" />
-    <View
-      android:layout_height="match_parent"
-      android:layout_width="1dp"
-      android:visibility="invisible" />
-    <include
-      android:id="@+id/stats_total_time"
-      layout="@layout/stats_large_item" />
-    <include
-      android:id="@+id/stats_moving_time"
-      layout="@layout/stats_large_item" />
-  </LinearLayout>
-  <!-- Horizontal line -->
-  <View style="@style/StatsHorizontalLine" />
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_width="0dp" >
-      <!-- Speed and average speed -->
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" >
-        <include
-          android:id="@+id/stats_speed"
-          layout="@layout/stats_small_item" />
-        <include
-          android:id="@+id/stats_average_speed"
-          layout="@layout/stats_small_item" />
-      </LinearLayout>
-      <!-- Max speed and average moving speed -->
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" >
-        <include
-          android:id="@+id/stats_max_speed"
-          layout="@layout/stats_small_item" />
-        <include
-          android:id="@+id/stats_average_moving_speed"
-          layout="@layout/stats_small_item" />
-      </LinearLayout>
-      <!-- Latitude and longitude -->
-      <LinearLayout
-        android:id="@+id/stats_coordinate_container"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" >
-        <include
-          android:id="@+id/stats_latitude"
-          layout="@layout/stats_small_item" />
-        <include
-          android:id="@+id/stats_longitude"
-          layout="@layout/stats_small_item" />
-      </LinearLayout>
-    </TableLayout>
-    <!-- Vertical line -->
-    <View
-      android:background="@color/stats_separator"
-      android:id="@+id/stats_grade_elevation_separator"
-      android:layout_height="match_parent"
-      android:layout_width="1dp" />
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Distance, calorie, total time, and moving time -->
     <LinearLayout
-      android:id="@+id/stats_grade_elevation_container"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_width="0dp" >
-      <!-- Grade -->
-      <LinearLayout style="@style/StatsSmallGroupContainer" >
-        <!-- Grade label -->
-        <TextView
-          android:text="@string/stats_grade"
-          style="@style/StatsSmallLabel" />
-        <TableLayout
-          android:layout_gravity="center"
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content" >
-          <!-- Grade min -->
-          <include
-            android:id="@+id/stats_grade_min"
-            layout="@layout/stats_small_group_item" />
-          <!-- Grade max -->
-          <include
-            android:id="@+id/stats_grade_max"
-            layout="@layout/stats_small_group_item" />
-        </TableLayout>
-      </LinearLayout>
-      <!-- Elevation -->
-      <LinearLayout style="@style/StatsSmallGroupContainer" >
-        <!-- Elevation label -->
-        <TextView
-          android:text="@string/stats_elevation"
-          style="@style/StatsSmallLabel" />
-        <TableLayout
-          android:layout_gravity="center"
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content" >
-          <!-- Elevation -->
-          <include
-            android:id="@+id/stats_elevation"
-            layout="@layout/stats_small_group_item" />
-          <!-- Elevation gain -->
-          <include
-            android:id="@+id/stats_elevation_gain"
-            layout="@layout/stats_small_group_item" />
-          <!-- Elevation min -->
-          <include
-            android:id="@+id/stats_elevation_min"
-            layout="@layout/stats_small_group_item" />
-          <!-- Elevation max -->
-          <include
-            android:id="@+id/stats_elevation_max"
-            layout="@layout/stats_small_group_item" />
-        </TableLayout>
-      </LinearLayout>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/stats_distance"
+            layout="@layout/stats_large_item" />
+
+        <include
+            android:id="@+id/stats_calorie"
+            layout="@layout/stats_activity_type" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:visibility="invisible" />
+
+        <include
+            android:id="@+id/stats_total_time"
+            layout="@layout/stats_large_item" />
+
+        <include
+            android:id="@+id/stats_moving_time"
+            layout="@layout/stats_large_item" />
+    </LinearLayout>
+    <!-- Horizontal line -->
+    <View style="@style/StatsHorizontalLine" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TableLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <!-- Speed and average speed -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include
+                    android:id="@+id/stats_speed"
+                    layout="@layout/stats_small_item" />
+
+                <include
+                    android:id="@+id/stats_average_speed"
+                    layout="@layout/stats_small_item" />
+            </LinearLayout>
+            <!-- Max speed and average moving speed -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include
+                    android:id="@+id/stats_max_speed"
+                    layout="@layout/stats_small_item" />
+
+                <include
+                    android:id="@+id/stats_average_moving_speed"
+                    layout="@layout/stats_small_item" />
+            </LinearLayout>
+            <!-- Latitude and longitude -->
+            <LinearLayout
+                android:id="@+id/stats_coordinate_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include
+                    android:id="@+id/stats_latitude"
+                    layout="@layout/stats_small_item" />
+
+                <include
+                    android:id="@+id/stats_longitude"
+                    layout="@layout/stats_small_item" />
+            </LinearLayout>
+        </TableLayout>
+        <!-- Vertical line -->
+        <View
+            android:id="@+id/stats_grade_elevation_separator"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/stats_separator" />
+
+        <LinearLayout
+            android:id="@+id/stats_grade_elevation_container"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <!-- Grade -->
+            <LinearLayout style="@style/StatsSmallGroupContainer">
+                <!-- Grade label -->
+                <TextView
+                    style="@style/StatsSmallLabel"
+                    android:text="@string/stats_grade" />
+
+                <TableLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center">
+                    <!-- Grade min -->
+                    <include
+                        android:id="@+id/stats_grade_min"
+                        layout="@layout/stats_small_group_item" />
+                    <!-- Grade max -->
+                    <include
+                        android:id="@+id/stats_grade_max"
+                        layout="@layout/stats_small_group_item" />
+                </TableLayout>
+            </LinearLayout>
+            <!-- Elevation -->
+            <LinearLayout style="@style/StatsSmallGroupContainer">
+                <!-- Elevation label -->
+                <TextView
+                    style="@style/StatsSmallLabel"
+                    android:text="@string/stats_elevation" />
+
+                <TableLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center">
+                    <!-- Elevation -->
+                    <include
+                        android:id="@+id/stats_elevation"
+                        layout="@layout/stats_small_group_item" />
+                    <!-- Elevation gain -->
+                    <include
+                        android:id="@+id/stats_elevation_gain"
+                        layout="@layout/stats_small_group_item" />
+                    <!-- Elevation min -->
+                    <include
+                        android:id="@+id/stats_elevation_min"
+                        layout="@layout/stats_small_group_item" />
+                    <!-- Elevation max -->
+                    <include
+                        android:id="@+id/stats_elevation_max"
+                        layout="@layout/stats_small_group_item" />
+                </TableLayout>
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
-  </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout-land/track_controller.xml b/src/main/res/layout-land/track_controller.xml
index 7057ed42a..0f81bdff8 100644
--- a/src/main/res/layout-land/track_controller.xml
+++ b/src/main/res/layout-land/track_controller.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,57 +13,65 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <LinearLayout
-    android:background="@color/track_controller_background"
-    android:id="@+id/track_controller_container"
-    android:layout_height="match_parent"
-    android:layout_width="wrap_content"
-    android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp" >
-    <View
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      android:layout_width="match_parent" />
-    <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_record"
-      android:id="@+id/track_controller_record"
-      android:layout_height="0dp"
-      android:layout_weight="10"
-      android:layout_width="wrap_content" />
-    <RelativeLayout
-      android:layout_height="0dp"
-      android:layout_weight="6"
-      android:layout_width="match_parent" >
-      <TextView
-        android:id="@+id/track_controller_total_time"
-        android:layout_centerInParent="true"
-        android:layout_height="wrap_content"
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/track_controller_container"
         android:layout_width="wrap_content"
-        android:textColor="@android:color/white"
-        style="@style/TextSmall" />
-      <TextView
-        android:id="@+id/track_controller_status"
-        android:layout_above="@id/track_controller_total_time"
-        android:layout_centerHorizontal="true"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:singleLine="true"
-        style="@style/TextMicro" />
-    </RelativeLayout>
-    <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_stop"
-      android:id="@+id/track_controller_stop"
-      android:layout_height="0dp"
-      android:layout_weight="10"
-      android:layout_width="match_parent"
-      android:src="@drawable/ic_button_stop_disabled" />
-    <View
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      android:layout_width="match_parent" />
-  </LinearLayout>
+        android:layout_height="match_parent"
+        android:background="@color/track_controller_background"
+        android:orientation="vertical"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <ImageButton
+            android:id="@+id/track_controller_record"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="10"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_record" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="6">
+
+            <TextView
+                android:id="@+id/track_controller_total_time"
+                style="@style/TextSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textColor="@android:color/white" />
+
+            <TextView
+                android:id="@+id/track_controller_status"
+                style="@style/TextMicro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/track_controller_total_time"
+                android:layout_centerHorizontal="true"
+                android:singleLine="true" />
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/track_controller_stop"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="10"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_stop"
+            android:src="@drawable/ic_button_stop_disabled" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout-land/track_detail.xml b/src/main/res/layout-land/track_detail.xml
index a0c972a63..20b54d5c2 100644
--- a/src/main/res/layout-land/track_detail.xml
+++ b/src/main/res/layout-land/track_detail.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:baselineAligned="false"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <include layout="@layout/track_controller" />
-  <TabHost
-    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_weight="1"
-    android:layout_width="0dp" >
-    <include layout="@layout/track_details_tab" />
-  </TabHost>
+    android:baselineAligned="false">
+
+    <include layout="@layout/track_controller" />
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <include layout="@layout/track_details_tab" />
+    </TabHost>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml
index 8529bdd4e..911d62f88 100644
--- a/src/main/res/layout-land/track_list.xml
+++ b/src/main/res/layout-land/track_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,69 +14,80 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:baselineAligned="false"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <include layout="@layout/track_controller" />
-  <ListView
-    android:id="@+id/track_list"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_weight="1.0"
-    android:layout_width="0dp" />
-  <RelativeLayout
-    android:id="@+id/track_list_empty_view"
-    android:layout_height="match_parent"
-    android:layout_weight="1.0"
-    android:layout_width="0dp" >
-    <LinearLayout
-      android:id="@+id/track_list_arrow_long"
-      android:layout_alignParentLeft="true"
-      android:layout_height="match_parent"
-      android:layout_width="wrap_content"
-      android:orientation="vertical"
-      android:paddingLeft="12dp"
-      android:paddingRight="16dp" >
-      <View
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_width="match_parent" />
-      <ImageView
-        android:contentDescription="@string/image_arrow"
-        android:layout_height="0dp"
-        android:layout_weight="10"
-        android:layout_width="wrap_content"
-        android:src="@drawable/ic_arrow_long" />
-      <View
-        android:layout_height="0dp"
-        android:layout_weight="17"
-        android:layout_width="match_parent" />
-    </LinearLayout>
-    <LinearLayout
-      android:layout_height="match_parent"
-      android:layout_toRightOf="@id/track_list_arrow_long"
-      android:layout_width="match_parent"
-      android:orientation="vertical" >
-      <View
-        android:layout_height="0dp"
-        android:layout_weight="4"
-        android:layout_width="match_parent" />
-      <LinearLayout
-        android:layout_height="0dp"
-        android:layout_weight="24"
-        android:layout_width="match_parent" >
-        <TextView
-          android:layout_height="wrap_content"
-          android:layout_weight=".7"
-          android:layout_width="0dp"
-          android:text="@string/track_list_empty_message"
-          android:textColor="@color/list_empty_text"
-          style="@style/TextLarge" >
-        </TextView>
-        <View
-          android:layout_height="match_parent"
-          android:layout_weight=".3"
-          android:layout_width="0dp" />
-      </LinearLayout>
-    </LinearLayout>
-  </RelativeLayout>
+    android:baselineAligned="false">
+
+    <include layout="@layout/track_controller" />
+
+    <ListView
+        android:id="@+id/track_list"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0" />
+
+    <RelativeLayout
+        android:id="@+id/track_list_empty_view"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0">
+
+        <LinearLayout
+            android:id="@+id/track_list_arrow_long"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:orientation="vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="16dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="10"
+                android:contentDescription="@string/image_arrow"
+                android:src="@drawable/ic_arrow_long" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="17" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/track_list_arrow_long"
+            android:orientation="vertical">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="4" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="24">
+
+                <TextView
+                    style="@style/TextLarge"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight=".7"
+                    android:text="@string/track_list_empty_message"
+                    android:textColor="@color/list_empty_text"></TextView>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight=".3" />
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_type_preference.xml b/src/main/res/layout/activity_type_preference.xml
index b56c2205c..5d55574c6 100644
--- a/src/main/res/layout/activity_type_preference.xml
+++ b/src/main/res/layout/activity_type_preference.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="16dp" >
-    <AutoCompleteTextView
-      android:hint="@string/track_edit_activity_type_hint"
-      android:id="@+id/activity_type_preference_text_view"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:layout_width="0dp"
-      style="@style/EditCategory" />
-    <Spinner
-      android:id="@+id/activity_type_preference_spinner"
-      android:layout_gravity="bottom"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content" />
-  </LinearLayout>
+    style="@style/ScrollView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:paddingTop="16dp"
+        android:paddingRight="8dp">
+
+        <AutoCompleteTextView
+            android:id="@+id/activity_type_preference_text_view"
+            style="@style/EditCategory"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:hint="@string/track_edit_activity_type_hint" />
+
+        <Spinner
+            android:id="@+id/activity_type_preference_spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom" />
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/chart.xml b/src/main/res/layout/chart.xml
index 3e5906f07..6d896b08c 100644
--- a/src/main/res/layout/chart.xml
+++ b/src/main/res/layout/chart.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,21 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <LinearLayout
-    android:id="@+id/chart_view_layout"
-    android:layout_height="0dp"
-    android:layout_weight="1"
     android:layout_width="match_parent"
-    android:orientation="vertical" >
-  </LinearLayout>
-  <ZoomControls
-    android:background="@android:color/white"
-    android:gravity="right"
-    android:id="@+id/chart_zoom_controls"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:paddingRight="8dp" />
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/chart_view_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"></LinearLayout>
+
+    <ZoomControls
+        android:id="@+id/chart_zoom_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/white"
+        android:gravity="right"
+        android:paddingRight="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/choose_activity_list_item.xml b/src/main/res/layout/choose_activity_list_item.xml
index d975d5813..559ee85c1 100644
--- a/src/main/res/layout/choose_activity_list_item.xml
+++ b/src/main/res/layout/choose_activity_list_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,36 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:gravity="center_vertical"
-  android:layout_height="wrap_content"
-  android:layout_width="match_parent"
-  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:paddingLeft="16dp"
-  android:paddingRight="16dp" >
-  <ImageView
-    android:contentDescription="@string/image_application"
-    android:id="@+id/choose_activity_list_item_icon"
-    android:layout_height="@android:dimen/app_icon_size"
-    android:layout_width="@android:dimen/app_icon_size"
-    android:scaleType="fitCenter" />
-  <LinearLayout
-    android:gravity="center_vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:orientation="vertical" >
-    <TextView
-      android:id="@+id/choose_activity_list_item_text1"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:maxLines="2"
-      android:paddingLeft="16dp"
-      style="@style/TextChooseActivity" />
-    <TextView
-      android:id="@+id/choose_activity_list_item_text2"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:maxLines="2"
-      android:paddingLeft="16dp"
-      style="@style/TextChooseActivity" />
-  </LinearLayout>
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
+
+    <ImageView
+        android:id="@+id/choose_activity_list_item_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:contentDescription="@string/image_application"
+        android:scaleType="fitCenter" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/choose_activity_list_item_text1"
+            style="@style/TextChooseActivity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:paddingLeft="16dp" />
+
+        <TextView
+            android:id="@+id/choose_activity_list_item_text2"
+            style="@style/TextChooseActivity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:paddingLeft="16dp" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/choose_activity_type.xml b/src/main/res/layout/choose_activity_type.xml
index cf00d81e4..647848dc7 100644
--- a/src/main/res/layout/choose_activity_type.xml
+++ b/src/main/res/layout/choose_activity_type.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <GridView
-    android:id="@+id/choose_activity_type_grid_view"
-    android:layout_height="0dp"
-    android:layout_weight="1"
     android:layout_width="match_parent"
-    android:numColumns="4"
-    android:padding="4dp"
-    android:stretchMode="spacingWidth"
-    android:verticalSpacing="4dp" />
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <GridView
+        android:id="@+id/choose_activity_type_grid_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:numColumns="4"
+        android:padding="4dp"
+        android:stretchMode="spacingWidth"
+        android:verticalSpacing="4dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 6a79ae700..39c2ddfc3 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,120 +14,128 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="match_parent" >
-  <!-- Photo -->
-  <ImageView
-    android:contentDescription="@string/image_photo_marker"
-    android:id="@+id/list_item_photo"
-    android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:layout_marginBottom="4dp"
-    android:scaleType="centerCrop" />
-  <FrameLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <!-- A gradient on top of the text -->
+    android:layout_height="wrap_content">
+    <!-- Photo -->
     <ImageView
-      android:alpha=".6"
-      android:contentDescription="@string/image_photo_marker"
-      android:id="@+id/list_item_text_gradient"
-      android:layout_height="match_parent"
-      android:layout_width="match_parent"
-      android:src="@drawable/text_gradient" />
-    <!-- Table 1 -->
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:minHeight="?android:attr/listPreferredItemHeight"
-      android:paddingBottom="12dp"
-      android:paddingRight="12dp"
-      android:paddingTop="8dp"
-      android:shrinkColumns="1"
-      android:stretchColumns="1" >
-      <!-- Table 1: Row 1 -->
-      <TableRow>
-        <!-- Table 1: Row 1: Column 1: (icon) -->
+        android:id="@+id/list_item_photo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="4dp"
+        android:contentDescription="@string/image_photo_marker"
+        android:scaleType="centerCrop" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <!-- A gradient on top of the text -->
         <ImageView
-          android:contentDescription="@string/image_track"
-          android:id="@+id/list_item_icon"
-          android:layout_gravity="center_vertical"
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="8dp"
-          android:layout_marginRight="8dp"
-          android:layout_width="wrap_content" />
-        <!-- Table 1: Row 1: Column 2: (Table 2) -->
+            android:id="@+id/list_item_text_gradient"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha=".6"
+            android:contentDescription="@string/image_photo_marker"
+            android:src="@drawable/text_gradient" />
+        <!-- Table 1 -->
         <TableLayout
-          android:layout_height="wrap_content"
-          android:layout_width="match_parent"
-          android:shrinkColumns="0"
-          android:stretchColumns="0" >
-          <TableRow>
-            <!-- Table 2: Row 1: Column 1: (name) -->
-            <TextView
-              android:ellipsize="end"
-              android:id="@+id/list_item_name"
-              android:layout_gravity="bottom"
-              android:layout_width="match_parent"
-              android:singleLine="true"
-              style="@style/TextMedium" />
-            <!-- Table 2: Row 1: Column 2: (date) -->
-            <TextView
-              android:id="@+id/list_item_date"
-              style="@style/ListItemDate" />
-          </TableRow>
-          <TableRow>
-            <!-- Need to match the style set in ListItemUtils.setListItem -->
-            <!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
-            <LinearLayout
-              android:layout_gravity="bottom"
-              android:layout_height="wrap_content"
-              android:layout_width="match_parent" >
-              <TextView
-                android:ellipsize="end"
-                android:id="@+id/list_item_time_distance"
-                android:layout_gravity="bottom"
-                android:singleLine="true"
-                style="@style/TextSmall" />
-              <ImageView
-                android:contentDescription="@string/image_marker_count"
-                android:id="@+id/list_item_marker_count_icon"
-                android:layout_gravity="bottom"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="1dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_width="wrap_content"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_menu_insert_marker" />
-              <TextView
-                android:ellipsize="end"
-                android:id="@+id/list_item_marker_count"
-                android:layout_gravity="bottom"
-                android:singleLine="true"
-                style="@style/TextSmall" />
-            </LinearLayout>
-            <!-- Table 2: Row 2: Column 2: (time) -->
-            <TextView
-              android:id="@+id/list_item_time"
-              style="@style/ListItemDate" />
-          </TableRow>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingTop="8dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="12dp"
+            android:shrinkColumns="1"
+            android:stretchColumns="1">
+            <!-- Table 1: Row 1 -->
+            <TableRow>
+                <!-- Table 1: Row 1: Column 1: (icon) -->
+                <ImageView
+                    android:id="@+id/list_item_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:contentDescription="@string/image_track" />
+                <!-- Table 1: Row 1: Column 2: (Table 2) -->
+                <TableLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:shrinkColumns="0"
+                    android:stretchColumns="0">
+
+                    <TableRow>
+                        <!-- Table 2: Row 1: Column 1: (name) -->
+                        <TextView
+                            android:id="@+id/list_item_name"
+                            style="@style/TextMedium"
+                            android:layout_width="match_parent"
+                            android:layout_gravity="bottom"
+                            android:ellipsize="end"
+                            android:singleLine="true" />
+                        <!-- Table 2: Row 1: Column 2: (date) -->
+                        <TextView
+                            android:id="@+id/list_item_date"
+                            style="@style/ListItemDate" />
+                    </TableRow>
+
+                    <TableRow>
+                        <!-- Need to match the style set in ListItemUtils.setListItem -->
+                        <!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom">
+
+                            <TextView
+                                android:id="@+id/list_item_time_distance"
+                                style="@style/TextSmall"
+                                android:layout_gravity="bottom"
+                                android:ellipsize="end"
+                                android:singleLine="true" />
+
+                            <ImageView
+                                android:id="@+id/list_item_marker_count_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="bottom"
+                                android:layout_marginLeft="2dp"
+                                android:layout_marginRight="2dp"
+                                android:layout_marginBottom="1dp"
+                                android:contentDescription="@string/image_marker_count"
+                                android:scaleType="centerInside"
+                                android:src="@drawable/ic_menu_insert_marker" />
+
+                            <TextView
+                                android:id="@+id/list_item_marker_count"
+                                style="@style/TextSmall"
+                                android:layout_gravity="bottom"
+                                android:ellipsize="end"
+                                android:singleLine="true" />
+                        </LinearLayout>
+                        <!-- Table 2: Row 2: Column 2: (time) -->
+                        <TextView
+                            android:id="@+id/list_item_time"
+                            style="@style/ListItemDate" />
+                    </TableRow>
+                </TableLayout>
+            </TableRow>
+
+            <TableRow>
+                <!-- Table 1: Row 2: (category and description) -->
+                <TextView
+                    android:id="@+id/list_item_category_description"
+                    style="@style/TextSmall"
+                    android:layout_column="1"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:singleLine="false" />
+            </TableRow>
         </TableLayout>
-      </TableRow>
-      <TableRow>
-        <!-- Table 1: Row 2: (category and description) -->
-        <TextView
-          android:ellipsize="end"
-          android:id="@+id/list_item_category_description"
-          android:layout_column="1"
-          android:maxLines="2"
-          android:singleLine="false"
-          style="@style/TextSmall" />
-      </TableRow>
-    </TableLayout>
-  </FrameLayout>
-  <View
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    style="@style/ListItem" />
+    </FrameLayout>
+
+    <View
+        style="@style/ListItem"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/marker_detail_activity.xml b/src/main/res/layout/marker_detail_activity.xml
index dd5e2806c..2ef25af27 100644
--- a/src/main/res/layout/marker_detail_activity.xml
+++ b/src/main/res/layout/marker_detail_activity.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <androidx.viewpager.widget.ViewPager
-    android:id="@+id/maker_detail_activity_view_pager"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/maker_detail_activity_view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/marker_detail_fragment.xml b/src/main/res/layout/marker_detail_fragment.xml
index 9112060b5..733e64d84 100644
--- a/src/main/res/layout/marker_detail_fragment.xml
+++ b/src/main/res/layout/marker_detail_fragment.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,74 +14,88 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <FrameLayout
-    android:id="@+id/marker_detail_waypoint"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent" >
-    <ImageView
-      android:background="@android:color/black"
-      android:contentDescription="@string/image_photo_marker"
-      android:id="@+id/marker_detail_waypoint_photo"
-      android:layout_height="match_parent"
-      android:layout_width="match_parent"
-      android:scaleType="fitCenter" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <FrameLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent" >
-      <!-- A gradient on top of the text -->
-      <ImageView
-        android:alpha=".6"
-        android:contentDescription="@string/image_photo_marker"
-        android:id="@+id/marker_detail_waypoint_text_gradient"
-        android:layout_height="match_parent"
+        android:id="@+id/marker_detail_waypoint"
         android:layout_width="match_parent"
-        android:src="@drawable/text_gradient" />
-      <LinearLayout
-        android:id="@+id/marker_detail_waypoint_info"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="80dp"
-        android:layout_width="match_parent"
-        android:orientation="vertical"
-        android:padding="8dp" >
-        <TextView
-          android:id="@+id/marker_detail_waypoint_name"
-          android:paddingTop="8dp"
-          style="@style/TextMedium" />
-        <TextView
-          android:id="@+id/marker_detail_waypoint_category"
-          style="@style/TextSmall" />
-        <TextView
-          android:id="@+id/marker_detail_waypoint_description"
-          style="@style/TextSmall" />
-        <TextView
-          android:id="@+id/marker_detail_waypoint_location"
-          style="@style/TextSmall" />
-      </LinearLayout>
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/marker_detail_waypoint_photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            android:contentDescription="@string/image_photo_marker"
+            android:scaleType="fitCenter" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <!-- A gradient on top of the text -->
+            <ImageView
+                android:id="@+id/marker_detail_waypoint_text_gradient"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:alpha=".6"
+                android:contentDescription="@string/image_photo_marker"
+                android:src="@drawable/text_gradient" />
+
+            <LinearLayout
+                android:id="@+id/marker_detail_waypoint_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="80dp"
+                android:orientation="vertical"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/marker_detail_waypoint_name"
+                    style="@style/TextMedium"
+                    android:paddingTop="8dp" />
+
+                <TextView
+                    android:id="@+id/marker_detail_waypoint_category"
+                    style="@style/TextSmall" />
+
+                <TextView
+                    android:id="@+id/marker_detail_waypoint_description"
+                    style="@style/TextSmall" />
+
+                <TextView
+                    android:id="@+id/marker_detail_waypoint_location"
+                    style="@style/TextSmall" />
+            </LinearLayout>
+        </FrameLayout>
     </FrameLayout>
-  </FrameLayout>
-  <ScrollView
-    android:id="@+id/marker_detail_statistics"
-    style="@style/StatsScrollView" >
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical"
-      android:padding="8dp" >
-      <TextView
-        android:id="@+id/marker_detail_statistics_name"
-        android:paddingTop="8dp"
-        style="@style/TextMedium" />
-      <TextView
-        android:id="@+id/marker_detail_statistics_location"
-        style="@style/TextSmall" />
-      <TextView
-        android:paddingBottom="6dp"
-        android:paddingTop="4dp"
-        android:text="@string/marker_detail_statistics_title"
-        style="@style/TextSmall" />
-      <include layout="@layout/stats_content" />
-    </LinearLayout>
-  </ScrollView>
+
+    <ScrollView
+        android:id="@+id/marker_detail_statistics"
+        style="@style/StatsScrollView">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+            <TextView
+                android:id="@+id/marker_detail_statistics_name"
+                style="@style/TextMedium"
+                android:paddingTop="8dp" />
+
+            <TextView
+                android:id="@+id/marker_detail_statistics_location"
+                style="@style/TextSmall" />
+
+            <TextView
+                style="@style/TextSmall"
+                android:paddingTop="4dp"
+                android:paddingBottom="6dp"
+                android:text="@string/marker_detail_statistics_title" />
+
+            <include layout="@layout/stats_content" />
+        </LinearLayout>
+    </ScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index 0b3c47df6..597c9b132 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,77 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical"
-      android:padding="8dp" >
-      <TextView
-        android:text="@string/generic_name"
-        style="@style/EditLabel" />
-      <LinearLayout
-        android:id="@+id/marker_edit_statistics_section"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:orientation="vertical" >
-        <EditText
-          android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
-          android:hint="@string/generic_name"
-          android:id="@+id/marker_edit_statistics_name"
-          android:imeOptions="actionDone"
-          style="@style/EditNameMarker" />
-      </LinearLayout>
-      <LinearLayout
-        android:id="@+id/marker_edit_waypoint_section"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:orientation="vertical" >
-        <EditText
-          android:drawableLeft="@drawable/ic_marker_blue_pushpin"
-          android:hint="@string/generic_name"
-          android:id="@+id/marker_edit_waypoint_name"
-          android:imeOptions="actionNext"
-          style="@style/EditNameMarker" />
-        <TextView
-          android:text="@string/marker_edit_marker_type"
-          style="@style/EditLabel.WithPaddingTop" />
-        <AutoCompleteTextView
-          android:hint="@string/marker_edit_marker_type_hint"
-          android:id="@+id/marker_edit_waypoint_marker_type"
-          android:imeOptions="actionNext"
-          android:layout_width="match_parent"
-          style="@style/EditCategory" />
-        <TextView
-          android:text="@string/generic_description"
-          style="@style/EditLabel.WithPaddingTop" />
-        <EditText
-          android:hint="@string/generic_description"
-          android:id="@+id/marker_edit_waypoint_description"
-          android:imeOptions="actionDone"
-          style="@style/EditDescription" />
-      </LinearLayout>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+            <TextView
+                style="@style/EditLabel"
+                android:text="@string/generic_name" />
+
+            <LinearLayout
+                android:id="@+id/marker_edit_statistics_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/marker_edit_statistics_name"
+                    style="@style/EditNameMarker"
+                    android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
+                    android:hint="@string/generic_name"
+                    android:imeOptions="actionDone" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/marker_edit_waypoint_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/marker_edit_waypoint_name"
+                    style="@style/EditNameMarker"
+                    android:drawableLeft="@drawable/ic_marker_blue_pushpin"
+                    android:hint="@string/generic_name"
+                    android:imeOptions="actionNext" />
+
+                <TextView
+                    style="@style/EditLabel.WithPaddingTop"
+                    android:text="@string/marker_edit_marker_type" />
+
+                <AutoCompleteTextView
+                    android:id="@+id/marker_edit_waypoint_marker_type"
+                    style="@style/EditCategory"
+                    android:layout_width="match_parent"
+                    android:hint="@string/marker_edit_marker_type_hint"
+                    android:imeOptions="actionNext" />
+
+                <TextView
+                    style="@style/EditLabel.WithPaddingTop"
+                    android:text="@string/generic_description" />
+
+                <EditText
+                    android:id="@+id/marker_edit_waypoint_description"
+                    style="@style/EditDescription"
+                    android:hint="@string/generic_description"
+                    android:imeOptions="actionDone" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <View style="@style/BottomButtonDivider" />
+
+    <LinearLayout style="@style/BottomButtonBar">
+
+        <include layout="@layout/marker_edit_buttons" />
     </LinearLayout>
-  </ScrollView>
-  <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/marker_edit_buttons" />
-  </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/marker_edit_buttons.xml b/src/main/res/layout/marker_edit_buttons.xml
index 238ec79cc..be8f94bee 100644
--- a/src/main/res/layout/marker_edit_buttons.xml
+++ b/src/main/res/layout/marker_edit_buttons.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/marker_edit_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/marker_edit_done"
-    android:layout_gravity="right"
-    style="@style/BottomButton" />
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- In v14, postive button on the right. -->
+    <Button
+        android:id="@+id/marker_edit_cancel"
+        style="@style/BottomButton"
+        android:layout_gravity="left"
+        android:text="@string/generic_cancel" />
+
+    <Button
+        android:id="@+id/marker_edit_done"
+        style="@style/BottomButton"
+        android:layout_gravity="right" />
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/marker_list.xml b/src/main/res/layout/marker_list.xml
index 623a4f0fa..f42d57294 100644
--- a/src/main/res/layout/marker_list.xml
+++ b/src/main/res/layout/marker_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <ListView
-    android:id="@+id/marker_list"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent" />
-  <TextView
-    android:id="@+id/marker_list_empty"
-    android:text="@string/marker_list_empty_message"
-    style="@style/ListEmptyTextView" >
-  </TextView>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/marker_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/marker_list_empty"
+        style="@style/ListEmptyTextView"
+        android:text="@string/marker_list_empty_message"></TextView>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/search_list.xml b/src/main/res/layout/search_list.xml
index 59a81774a..616f27522 100644
--- a/src/main/res/layout/search_list.xml
+++ b/src/main/res/layout/search_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent" >
-  <ListView
-    android:id="@+id/search_list"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent" />
-  <TextView
-    android:id="@+id/search_list_empty"
-    android:text="@string/search_list_empty_message"
-    style="@style/ListEmptyTextView" >
-  </TextView>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/search_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/search_list_empty"
+        style="@style/ListEmptyTextView"
+        android:text="@string/search_list_empty_message"></TextView>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/sensor_state.xml b/src/main/res/layout/sensor_state.xml
index b0dabf2ac..fda490094 100644
--- a/src/main/res/layout/sensor_state.xml
+++ b/src/main/res/layout/sensor_state.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,52 +14,60 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:text="@string/menu_sensor_state"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state"
-      style="@style/SensorStateValue" />
-    <!-- Last sensor time -->
-    <TextView
-      android:text="@string/sensor_state_last_sensor_time"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state_last_sensor_time"
-      style="@style/SensorStateValue" />
-    <!-- Heart rate -->
-    <TextView
-      android:text="@string/sensor_state_heart_rate"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state_heart_rate"
-      style="@style/SensorStateValue" />
-    <!-- Cadence -->
-    <TextView
-      android:text="@string/sensor_state_cadence"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state_cadence"
-      style="@style/SensorStateValue" />
-    <!-- Power -->
-    <TextView
-      android:text="@string/sensor_state_power"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state_power"
-      style="@style/SensorStateValue" />
-    <!-- Battery level -->
-    <TextView
-      android:text="@string/sensor_state_battery"
-      style="@style/TextMedium" />
-    <TextView
-      android:id="@+id/sensor_state_battery"
-      style="@style/SensorStateValue" />
-  </LinearLayout>
+    style="@style/ScrollView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/menu_sensor_state" />
+
+        <TextView
+            android:id="@+id/sensor_state"
+            style="@style/SensorStateValue" />
+        <!-- Last sensor time -->
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/sensor_state_last_sensor_time" />
+
+        <TextView
+            android:id="@+id/sensor_state_last_sensor_time"
+            style="@style/SensorStateValue" />
+        <!-- Heart rate -->
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/sensor_state_heart_rate" />
+
+        <TextView
+            android:id="@+id/sensor_state_heart_rate"
+            style="@style/SensorStateValue" />
+        <!-- Cadence -->
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/sensor_state_cadence" />
+
+        <TextView
+            android:id="@+id/sensor_state_cadence"
+            style="@style/SensorStateValue" />
+        <!-- Power -->
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/sensor_state_power" />
+
+        <TextView
+            android:id="@+id/sensor_state_power"
+            style="@style/SensorStateValue" />
+        <!-- Battery level -->
+        <TextView
+            style="@style/TextMedium"
+            android:text="@string/sensor_state_battery" />
+
+        <TextView
+            android:id="@+id/sensor_state_battery"
+            style="@style/SensorStateValue" />
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/stats.xml b/src/main/res/layout/stats.xml
index dd6634530..98b3ad68a 100644
--- a/src/main/res/layout/stats.xml
+++ b/src/main/res/layout/stats.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical">
-    <include layout="@layout/stats_content" />
-  </LinearLayout>
+    style="@style/StatsScrollView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/stats_content" />
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_activity_type.xml b/src/main/res/layout/stats_activity_type.xml
index c1cb28e91..d433b13d0 100644
--- a/src/main/res/layout/stats_activity_type.xml
+++ b/src/main/res/layout/stats_activity_type.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,18 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsLargeItemContainer" >
-  <!-- Label -->
-  <TextView
-    android:id="@+id/stats_label"
-    android:text="@string/track_edit_activity_type_hint"
-    style="@style/StatsLargeLabel" />
-  <!-- Value container -->
-  <LinearLayout style="@style/StatsLargeValueContainer" >
-    <Spinner
-      android:id="@+id/stats_activity_type_icon"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="4dp"
-      android:layout_width="wrap_content" />
-  </LinearLayout>
+    style="@style/StatsLargeItemContainer">
+    <!-- Label -->
+    <TextView
+        android:id="@+id/stats_label"
+        style="@style/StatsLargeLabel"
+        android:text="@string/track_edit_activity_type_hint" />
+    <!-- Value container -->
+    <LinearLayout style="@style/StatsLargeValueContainer">
+
+        <Spinner
+            android:id="@+id/stats_activity_type_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_content.xml b/src/main/res/layout/stats_content.xml
index 70ea89c57..bdee448b4 100644
--- a/src/main/res/layout/stats_content.xml
+++ b/src/main/res/layout/stats_content.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,151 +13,164 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- Distance and activity type -->
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_distance"
-      layout="@layout/stats_large_item" />
-    <include
-      android:id="@+id/stats_calorie"
-      layout="@layout/stats_activity_type" />
-  </LinearLayout>
-  <!-- Total time and moving time -->
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_total_time"
-      layout="@layout/stats_large_item" />
-    <include
-      android:id="@+id/stats_moving_time"
-      layout="@layout/stats_large_item" />
-  </LinearLayout>
-  <!-- Horizontal line -->
-  <View style="@style/StatsHorizontalLine" />
-  <!-- Speed and average speed -->
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_speed"
-      layout="@layout/stats_small_item" />
-    <include
-      android:id="@+id/stats_average_speed"
-      layout="@layout/stats_small_item" />
-  </LinearLayout>
-  <!-- Max speed and average moving speed -->
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_max_speed"
-      layout="@layout/stats_small_item" />
-    <include
-      android:id="@+id/stats_average_moving_speed"
-      layout="@layout/stats_small_item" />
-  </LinearLayout>
-  <!-- Horizontal line -->
-  <View
-    android:id="@+id/stats_grade_elevation_separator"
-    style="@style/StatsHorizontalLine" />
-  <LinearLayout
-    android:id="@+id/stats_grade_elevation_container"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <!-- Grade -->
-    <LinearLayout style="@style/StatsSmallGroupContainer" >
-      <!-- Grade label -->
-      <TextView
-        android:text="@string/stats_grade"
-        style="@style/StatsSmallLabel" />
-      <TableLayout
-        android:layout_gravity="center"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" >
-        <!-- Grade min -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Distance and activity type -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <include
-          android:id="@+id/stats_grade_min"
-          layout="@layout/stats_small_group_item" />
-        <!-- Grade max -->
+            android:id="@+id/stats_distance"
+            layout="@layout/stats_large_item" />
+
         <include
-          android:id="@+id/stats_grade_max"
-          layout="@layout/stats_small_group_item" />
-      </TableLayout>
+            android:id="@+id/stats_calorie"
+            layout="@layout/stats_activity_type" />
     </LinearLayout>
-    <!-- Elevation -->
-    <LinearLayout style="@style/StatsSmallGroupContainer" >
-      <!-- Elevation label -->
-      <TextView
-        android:text="@string/stats_elevation"
-        style="@style/StatsSmallLabel" />
-      <TableLayout
-        android:layout_gravity="center"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" >
+    <!-- Total time and moving time -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/stats_total_time"
+            layout="@layout/stats_large_item" />
+
+        <include
+            android:id="@+id/stats_moving_time"
+            layout="@layout/stats_large_item" />
+    </LinearLayout>
+    <!-- Horizontal line -->
+    <View style="@style/StatsHorizontalLine" />
+    <!-- Speed and average speed -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/stats_speed"
+            layout="@layout/stats_small_item" />
+
+        <include
+            android:id="@+id/stats_average_speed"
+            layout="@layout/stats_small_item" />
+    </LinearLayout>
+    <!-- Max speed and average moving speed -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/stats_max_speed"
+            layout="@layout/stats_small_item" />
+
+        <include
+            android:id="@+id/stats_average_moving_speed"
+            layout="@layout/stats_small_item" />
+    </LinearLayout>
+    <!-- Horizontal line -->
+    <View
+        android:id="@+id/stats_grade_elevation_separator"
+        style="@style/StatsHorizontalLine" />
+
+    <LinearLayout
+        android:id="@+id/stats_grade_elevation_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <!-- Grade -->
+        <LinearLayout style="@style/StatsSmallGroupContainer">
+            <!-- Grade label -->
+            <TextView
+                style="@style/StatsSmallLabel"
+                android:text="@string/stats_grade" />
+
+            <TableLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center">
+                <!-- Grade min -->
+                <include
+                    android:id="@+id/stats_grade_min"
+                    layout="@layout/stats_small_group_item" />
+                <!-- Grade max -->
+                <include
+                    android:id="@+id/stats_grade_max"
+                    layout="@layout/stats_small_group_item" />
+            </TableLayout>
+        </LinearLayout>
         <!-- Elevation -->
-        <include
-          android:id="@+id/stats_elevation"
-          layout="@layout/stats_small_group_item" />
-        <!-- Elevation gain -->
-        <include
-          android:id="@+id/stats_elevation_gain"
-          layout="@layout/stats_small_group_item" />
-        <!-- Elevation min -->
-        <include
-          android:id="@+id/stats_elevation_min"
-          layout="@layout/stats_small_group_item" />
-        <!-- Elevation max -->
-        <include
-          android:id="@+id/stats_elevation_max"
-          layout="@layout/stats_small_group_item" />
-      </TableLayout>
+        <LinearLayout style="@style/StatsSmallGroupContainer">
+            <!-- Elevation label -->
+            <TextView
+                style="@style/StatsSmallLabel"
+                android:text="@string/stats_elevation" />
+
+            <TableLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center">
+                <!-- Elevation -->
+                <include
+                    android:id="@+id/stats_elevation"
+                    layout="@layout/stats_small_group_item" />
+                <!-- Elevation gain -->
+                <include
+                    android:id="@+id/stats_elevation_gain"
+                    layout="@layout/stats_small_group_item" />
+                <!-- Elevation min -->
+                <include
+                    android:id="@+id/stats_elevation_min"
+                    layout="@layout/stats_small_group_item" />
+                <!-- Elevation max -->
+                <include
+                    android:id="@+id/stats_elevation_max"
+                    layout="@layout/stats_small_group_item" />
+            </TableLayout>
+        </LinearLayout>
     </LinearLayout>
-  </LinearLayout>
-  <!-- Horizontal line -->
-  <View
-    android:id="@+id/stats_coordinate_separator"
-    style="@style/StatsHorizontalLine" />
-  <!-- Latitude and longitude -->
-  <LinearLayout
-    android:id="@+id/stats_coordinate_container"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <include
-      android:id="@+id/stats_latitude"
-      layout="@layout/stats_small_item" />
-    <include
-      android:id="@+id/stats_longitude"
-      layout="@layout/stats_small_item" />
-  </LinearLayout>
-  <!-- Sensor data: heart rate-->
-  <View
-      android:id="@+id/stats_sensor_separator"
-      style="@style/StatsHorizontalLine" />
-
-  <LinearLayout
-      android:id="@+id/stats_sensor_container"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-    <include
-        android:id="@+id/stats_sensor_heart_rate_value"
-        layout="@layout/stats_large_item" />
-
-    <LinearLayout style="@style/StatsSmallGroupContainer">
-
-      <TableLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center">
+    <!-- Horizontal line -->
+    <View
+        android:id="@+id/stats_coordinate_separator"
+        style="@style/StatsHorizontalLine" />
+    <!-- Latitude and longitude -->
+    <LinearLayout
+        android:id="@+id/stats_coordinate_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <include
-            android:id="@+id/stats_sensor_heart_rate_sensor"
-            layout="@layout/stats_tiny_item" />
-      </TableLayout>
+            android:id="@+id/stats_latitude"
+            layout="@layout/stats_small_item" />
+
+        <include
+            android:id="@+id/stats_longitude"
+            layout="@layout/stats_small_item" />
+    </LinearLayout>
+    <!-- Sensor data: heart rate-->
+    <View
+        android:id="@+id/stats_sensor_separator"
+        style="@style/StatsHorizontalLine" />
+
+    <LinearLayout
+        android:id="@+id/stats_sensor_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/stats_sensor_heart_rate_value"
+            layout="@layout/stats_large_item" />
+
+        <LinearLayout style="@style/StatsSmallGroupContainer">
+
+            <TableLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center">
+
+                <include
+                    android:id="@+id/stats_sensor_heart_rate_sensor"
+                    layout="@layout/stats_tiny_item" />
+            </TableLayout>
+        </LinearLayout>
     </LinearLayout>
-  </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_large_item.xml b/src/main/res/layout/stats_large_item.xml
index 8ccfb7c13..462ba4f0a 100644
--- a/src/main/res/layout/stats_large_item.xml
+++ b/src/main/res/layout/stats_large_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsLargeItemContainer" >
-  <!-- Label -->
-  <TextView
-    android:id="@+id/stats_label"
-    style="@style/StatsLargeLabel" />
-  <!-- Value container -->
-  <LinearLayout style="@style/StatsLargeValueContainer" >
-    <!-- Value -->
+    style="@style/StatsLargeItemContainer">
+    <!-- Label -->
     <TextView
-      android:id="@+id/stats_value"
-      style="@style/StatsLargeValue" />
-    <!-- Unit -->
-    <TextView
-      android:id="@+id/stats_unit"
-      style="@style/StatsUnit" />
-  </LinearLayout>
+        android:id="@+id/stats_label"
+        style="@style/StatsLargeLabel" />
+    <!-- Value container -->
+    <LinearLayout style="@style/StatsLargeValueContainer">
+        <!-- Value -->
+        <TextView
+            android:id="@+id/stats_value"
+            style="@style/StatsLargeValue" />
+        <!-- Unit -->
+        <TextView
+            android:id="@+id/stats_unit"
+            style="@style/StatsUnit" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_small_group_item.xml b/src/main/res/layout/stats_small_group_item.xml
index def50fa74..c3c93f9e1 100644
--- a/src/main/res/layout/stats_small_group_item.xml
+++ b/src/main/res/layout/stats_small_group_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,33 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="wrap_content" >
-  <!-- Value container -->
-  <LinearLayout
-    android:layout_gravity="right|bottom"
-    style="@style/StatsSmallValueContainer" >
-    <!-- Value -->
-    <TextView
-      android:id="@+id/stats_value"
-      style="@style/StatsSmallValue" />
-    <!-- Unit -->
-    <TextView
-      android:id="@+id/stats_unit"
-      style="@style/StatsUnit" />
-  </LinearLayout>
-  <!-- Label container -->
-  <LinearLayout
-    android:layout_gravity="left|bottom"
-    style="@style/StatsSmallValueContainer" >
-    <TextView
-      android:visibility="invisible"
-      style="@style/StatsSmallValue" />
-    <!-- Label -->
-    <TextView
-      android:id="@+id/stats_label"
-      android:layout_gravity="bottom"
-      android:paddingLeft="8dp"
-      style="@style/StatsSmallLabel" />
-  </LinearLayout>
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <!-- Value container -->
+    <LinearLayout
+        style="@style/StatsSmallValueContainer"
+        android:layout_gravity="right|bottom">
+        <!-- Value -->
+        <TextView
+            android:id="@+id/stats_value"
+            style="@style/StatsSmallValue" />
+        <!-- Unit -->
+        <TextView
+            android:id="@+id/stats_unit"
+            style="@style/StatsUnit" />
+    </LinearLayout>
+    <!-- Label container -->
+    <LinearLayout
+        style="@style/StatsSmallValueContainer"
+        android:layout_gravity="left|bottom">
+
+        <TextView
+            style="@style/StatsSmallValue"
+            android:visibility="invisible" />
+        <!-- Label -->
+        <TextView
+            android:id="@+id/stats_label"
+            style="@style/StatsSmallLabel"
+            android:layout_gravity="bottom"
+            android:paddingLeft="8dp" />
+    </LinearLayout>
 </TableRow>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_small_item.xml b/src/main/res/layout/stats_small_item.xml
index a6653b3ae..81e20aad0 100644
--- a/src/main/res/layout/stats_small_item.xml
+++ b/src/main/res/layout/stats_small_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsSmallItemContainer" >
-  <!-- Label -->
-  <TextView
-    android:id="@+id/stats_label"
-    style="@style/StatsSmallLabel" />
-  <!-- Value container -->
-  <LinearLayout style="@style/StatsSmallValueContainer" >
-    <!-- Value -->
+    style="@style/StatsSmallItemContainer">
+    <!-- Label -->
     <TextView
-      android:id="@+id/stats_value"
-      style="@style/StatsSmallValue" />
-    <!-- Unit -->
-    <TextView
-      android:id="@+id/stats_unit"
-      style="@style/StatsUnit" />
-  </LinearLayout>
+        android:id="@+id/stats_label"
+        style="@style/StatsSmallLabel" />
+    <!-- Value container -->
+    <LinearLayout style="@style/StatsSmallValueContainer">
+        <!-- Value -->
+        <TextView
+            android:id="@+id/stats_value"
+            style="@style/StatsSmallValue" />
+        <!-- Unit -->
+        <TextView
+            android:id="@+id/stats_unit"
+            style="@style/StatsUnit" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/stats_tiny_item.xml b/src/main/res/layout/stats_tiny_item.xml
index 6ce3721dc..0e31af8b5 100644
--- a/src/main/res/layout/stats_tiny_item.xml
+++ b/src/main/res/layout/stats_tiny_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsSmallItemContainer" >
-  <!-- Label -->
-  <TextView
-    android:id="@+id/stats_label"
-    style="@style/StatsSmallLabel" />
-  <!-- Value container -->
-  <LinearLayout style="@style/StatsSmallValueContainer" >
-    <!-- Value -->
+    style="@style/StatsSmallItemContainer">
+    <!-- Label -->
     <TextView
-      android:id="@+id/stats_value"
-      style="@style/StatsTinyValue" />
-    <!-- Unit -->
-    <TextView
-      android:id="@+id/stats_unit"
-      style="@style/StatsUnit" />
-  </LinearLayout>
+        android:id="@+id/stats_label"
+        style="@style/StatsSmallLabel" />
+    <!-- Value container -->
+    <LinearLayout style="@style/StatsSmallValueContainer">
+        <!-- Value -->
+        <TextView
+            android:id="@+id/stats_value"
+            style="@style/StatsTinyValue" />
+        <!-- Unit -->
+        <TextView
+            android:id="@+id/stats_unit"
+            style="@style/StatsUnit" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_controller.xml b/src/main/res/layout/track_controller.xml
index 3523dbf5a..10b6e34cf 100644
--- a/src/main/res/layout/track_controller.xml
+++ b/src/main/res/layout/track_controller.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,57 +13,65 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <LinearLayout
-    android:background="@color/track_controller_background"
-    android:id="@+id/track_controller_container"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp" >
-    <View
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:layout_width="0dp" />
-    <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_record"
-      android:id="@+id/track_controller_record"
-      android:layout_height="wrap_content"
-      android:layout_weight="10"
-      android:layout_width="0dp" />
-    <RelativeLayout
-      android:layout_height="match_parent"
-      android:layout_weight="6"
-      android:layout_width="0dp" >
-      <TextView
-        android:id="@+id/track_controller_total_time"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/track_controller_container"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:textColor="@android:color/white"
-        style="@style/TextSmall" />
-      <TextView
-        android:id="@+id/track_controller_status"
-        android:layout_above="@id/track_controller_total_time"
-        android:layout_alignParentLeft="true"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:singleLine="true"
-        style="@style/TextMicro" />
-    </RelativeLayout>
-    <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_stop"
-      android:id="@+id/track_controller_stop"
-      android:layout_height="wrap_content"
-      android:layout_weight="10"
-      android:layout_width="0dp"
-      android:src="@drawable/ic_button_stop_disabled" />
-    <View
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:layout_width="0dp" />
-  </LinearLayout>
+        android:background="@color/track_controller_background"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <ImageButton
+            android:id="@+id/track_controller_record"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="10"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_record" />
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="6">
+
+            <TextView
+                android:id="@+id/track_controller_total_time"
+                style="@style/TextSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:textColor="@android:color/white" />
+
+            <TextView
+                android:id="@+id/track_controller_status"
+                style="@style/TextMicro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/track_controller_total_time"
+                android:layout_alignParentLeft="true"
+                android:singleLine="true" />
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/track_controller_stop"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="10"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_stop"
+            android:src="@drawable/ic_button_stop_disabled" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/track_detail.xml b/src/main/res/layout/track_detail.xml
index 8489bbab5..efb461e69 100644
--- a/src/main/res/layout/track_detail.xml
+++ b/src/main/res/layout/track_detail.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <TabHost
-    android:id="@android:id/tabhost"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="match_parent" >
-    <include layout="@layout/track_details_tab" />
-  </TabHost>
-  <include layout="@layout/track_controller" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <include layout="@layout/track_details_tab" />
+    </TabHost>
+
+    <include layout="@layout/track_controller" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_details_tab.xml b/src/main/res/layout/track_details_tab.xml
index f18f1e821..98fe4c675 100644
--- a/src/main/res/layout/track_details_tab.xml
+++ b/src/main/res/layout/track_details_tab.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,29 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <LinearLayout
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical" >
-    <TabWidget
-      android:id="@android:id/tabs"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:layout_width="match_parent" />
-    <FrameLayout
-      android:id="@android:id/tabcontent"
-      android:layout_height="0dp"
-      android:layout_weight="0"
-      android:layout_width="0dp" />
-    <androidx.viewpager.widget.ViewPager
-      android:id="@+id/pager"
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      android:layout_width="match_parent" />
-  </LinearLayout>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0" />
+
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="0" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index 180669bf2..d9c4b0756 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,56 +14,69 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical"
-      android:padding="8dp" >
-      <TextView
-        android:text="@string/generic_name"
-        style="@style/EditLabel" />
-      <EditText
-        android:hint="@string/generic_name"
-        android:id="@+id/track_edit_name"
-        android:imeOptions="actionNext"
-        style="@style/EditNameTrack" />
-      <TextView
-        android:id="@+id/track_edit_activity_type_label"
-        android:text="@string/track_edit_activity_type"
-        style="@style/EditLabel.WithPaddingTop" />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" >
-        <AutoCompleteTextView
-          android:hint="@string/track_edit_activity_type_hint"
-          android:id="@+id/track_edit_activity_type"
-          android:imeOptions="actionNext"
-          android:layout_height="match_parent"
-          android:layout_weight="1"
-          android:layout_width="0dp"
-          style="@style/EditCategory" />
-        <Spinner
-          android:id="@+id/track_edit_activity_type_icon"
-          android:layout_gravity="bottom"
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content" />
-      </LinearLayout>
-      <TextView
-        android:text="@string/generic_description"
-        style="@style/EditLabel.WithPaddingTop" />
-      <EditText
-        android:hint="@string/generic_description"
-        android:id="@+id/track_edit_description"
-        android:imeOptions="actionDone"
-        style="@style/EditDescription" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+            <TextView
+                style="@style/EditLabel"
+                android:text="@string/generic_name" />
+
+            <EditText
+                android:id="@+id/track_edit_name"
+                style="@style/EditNameTrack"
+                android:hint="@string/generic_name"
+                android:imeOptions="actionNext" />
+
+            <TextView
+                android:id="@+id/track_edit_activity_type_label"
+                style="@style/EditLabel.WithPaddingTop"
+                android:text="@string/track_edit_activity_type" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <AutoCompleteTextView
+                    android:id="@+id/track_edit_activity_type"
+                    style="@style/EditCategory"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:hint="@string/track_edit_activity_type_hint"
+                    android:imeOptions="actionNext" />
+
+                <Spinner
+                    android:id="@+id/track_edit_activity_type_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom" />
+            </LinearLayout>
+
+            <TextView
+                style="@style/EditLabel.WithPaddingTop"
+                android:text="@string/generic_description" />
+
+            <EditText
+                android:id="@+id/track_edit_description"
+                style="@style/EditDescription"
+                android:hint="@string/generic_description"
+                android:imeOptions="actionDone" />
+        </LinearLayout>
+    </ScrollView>
+
+    <View style="@style/BottomButtonDivider" />
+
+    <LinearLayout style="@style/BottomButtonBar">
+
+        <include layout="@layout/track_edit_buttons" />
     </LinearLayout>
-  </ScrollView>
-  <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/track_edit_buttons" />
-  </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_edit_buttons.xml b/src/main/res/layout/track_edit_buttons.xml
index f1757114a..2595c8812 100644
--- a/src/main/res/layout/track_edit_buttons.xml
+++ b/src/main/res/layout/track_edit_buttons.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/track_edit_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/track_edit_save"
-    android:layout_gravity="right"
-    android:text="@string/generic_save"
-    style="@style/BottomButton" />
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- In v14, postive button on the right. -->
+    <Button
+        android:id="@+id/track_edit_cancel"
+        style="@style/BottomButton"
+        android:layout_gravity="left"
+        android:text="@string/generic_cancel" />
+
+    <Button
+        android:id="@+id/track_edit_save"
+        style="@style/BottomButton"
+        android:layout_gravity="right"
+        android:text="@string/generic_save" />
 </merge>
\ No newline at end of file
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 33aa147a7..f6e004917 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,73 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <ListView
-    android:id="@+id/track_list"
-    android:layout_height="0dp"
-    android:layout_weight="1.0"
-    android:layout_width="match_parent" />
-  <RelativeLayout
-    android:id="@+id/track_list_empty_view"
-    android:layout_height="0dp"
-    android:layout_weight="1.0"
-    android:layout_width="match_parent" >
-    <LinearLayout
-      android:id="@+id/track_list_arrow_long"
-      android:layout_alignParentBottom="true"
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:paddingBottom="12dp"
-      android:paddingTop="16dp" >
-      <View
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:layout_width="0dp" />
-      <ImageView
-        android:contentDescription="@string/image_arrow"
-        android:layout_height="wrap_content"
-        android:layout_weight="10"
-        android:layout_width="0dp"
-        android:src="@drawable/ic_arrow_long" />
-      <View
-        android:layout_height="match_parent"
-        android:layout_weight="17"
-        android:layout_width="0dp" />
-    </LinearLayout>
-    <LinearLayout
-      android:layout_above="@id/track_list_arrow_long"
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent" >
-      <View
-        android:layout_height="match_parent"
-        android:layout_weight="5"
-        android:layout_width="0dp" />
-      <TextView
-        android:gravity="left"
-        android:layout_height="wrap_content"
-        android:layout_weight="22"
-        android:layout_width="0dp"
-        android:text="@string/track_list_empty_message"
-        android:textColor="@color/list_empty_text"
-        style="@style/TextLarge" >
-      </TextView>
-      <View
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:layout_width="0dp" />
-    </LinearLayout>
-  </RelativeLayout>
-  <include layout="@layout/track_controller" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@+id/track_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0" />
+
+    <RelativeLayout
+        android:id="@+id/track_list_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0">
+
+        <LinearLayout
+            android:id="@+id/track_list_arrow_long"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:paddingTop="16dp"
+            android:paddingBottom="12dp">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="10"
+                android:contentDescription="@string/image_arrow"
+                android:src="@drawable/ic_arrow_long" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="17" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/track_list_arrow_long">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="5" />
+
+            <TextView
+                style="@style/TextLarge"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="22"
+                android:gravity="left"
+                android:text="@string/track_list_empty_message"
+                android:textColor="@color/list_empty_text"></TextView>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <include layout="@layout/track_controller" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_4x1.xml b/src/main/res/layout/track_widget_4x1.xml
index f751ae4ee..ecf0dc632 100644
--- a/src/main/res/layout/track_widget_4x1.xml
+++ b/src/main/res/layout/track_widget_4x1.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,91 +14,112 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
-  <!-- android:orientation="horizontal", override from the style -->
-  <LinearLayout
-    android:orientation="horizontal"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
-    style="@style/TrackWidgetFrame" >
+    style="@style/TrackWidgetBoundingBox">
+    <!-- android:orientation="horizontal", override from the style -->
     <LinearLayout
-      android:layout_weight="1"
-      style="@style/TrackWidgetVerticalSpacer" />
-    <ImageButton
-      android:contentDescription="@string/image_record"
-      android:id="@+id/track_widget_record_button"
-      android:src="@drawable/button_record"
-      style="@style/TrackWidgetButton" />
-    <LinearLayout
-      android:id="@+id/track_widget_stats_container"
-      android:layout_height="match_parent"
-      android:layout_weight="18"
-      android:layout_width="0dp"
-      android:padding="0dp"
-      style="@style/TrackWidgetStatsContainer" >
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer" >
-          <TextView
-            android:id="@+id/track_widget_item1_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
-            <TextView
-              android:id="@+id/track_widget_item1_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item1_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item1_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
+        style="@style/TrackWidgetFrame"
+        android:orientation="horizontal"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+
+        <LinearLayout
+            style="@style/TrackWidgetVerticalSpacer"
+            android:layout_weight="1" />
+
+        <ImageButton
+            android:id="@+id/track_widget_record_button"
+            style="@style/TrackWidgetButton"
+            android:contentDescription="@string/image_record"
+            android:src="@drawable/button_record" />
+
+        <LinearLayout
+            android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="18"
+            android:padding="0dp">
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item1 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer">
+
+                    <TextView
+                        android:id="@+id/track_widget_item1_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item1_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+            <!-- horizontal separator -->
+            <LinearLayout
+                style="@style/TrackWidgetHorizontalSeparator"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalLine"
+                    android:layout_weight="38" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+
+                <LinearLayout style="@style/TrackWidgetItemContainer">
+                    <!-- item2 -->
+                    <TextView
+                        android:id="@+id/track_widget_item2_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item2_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
-      </LinearLayout>
-      <!-- horizontal separator -->
-      <LinearLayout
-        android:baselineAligned="false"
-        style="@style/TrackWidgetHorizontalSeparator" >
+
+        <ImageButton
+            android:id="@+id/track_widget_stop_button"
+            style="@style/TrackWidgetButton"
+            android:contentDescription="@string/image_stop"
+            android:src="@drawable/ic_button_stop_disabled" />
+
         <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-        <LinearLayout
-          android:layout_weight="38"
-          style="@style/TrackWidgetHorizontalLine" />
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <LinearLayout style="@style/TrackWidgetItemContainer" >
-          <!-- item2 -->
-          <TextView
-            android:id="@+id/track_widget_item2_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
-            <TextView
-              android:id="@+id/track_widget_item2_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item2_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item2_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
-        </LinearLayout>
-      </LinearLayout>
+            style="@style/TrackWidgetVerticalSpacer"
+            android:layout_weight="1" />
     </LinearLayout>
-    <ImageButton
-      android:contentDescription="@string/image_stop"
-      android:id="@+id/track_widget_stop_button"
-      android:src="@drawable/ic_button_stop_disabled"
-      style="@style/TrackWidgetButton" />
-    <LinearLayout
-      android:layout_weight="1"
-      style="@style/TrackWidgetVerticalSpacer" />
-  </LinearLayout>
-  <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
-    style="@style/TrackWidgetLogo" />
+
+    <ImageView
+        style="@style/TrackWidgetLogo"
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_4x2.xml b/src/main/res/layout/track_widget_4x2.xml
index 9cce20309..a2f1f1b00 100644
--- a/src/main/res/layout/track_widget_4x2.xml
+++ b/src/main/res/layout/track_widget_4x2.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,147 +14,185 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
-  <LinearLayout
-    android:baselineAligned="false"
-    style="@style/TrackWidgetFrame" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-      android:baselineAligned="false"
-      android:id="@+id/track_widget_stats_container"
-      android:layout_weight="1"
-      style="@style/TrackWidgetStatsContainer" >
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
-          <TextView
-            android:id="@+id/track_widget_item1_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
-            <TextView
-              android:id="@+id/track_widget_item1_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item1_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item1_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
-        </LinearLayout>
-        <!-- vertical separator -->
+        style="@style/TrackWidgetFrame"
+        android:baselineAligned="false">
+
         <LinearLayout
-          android:baselineAligned="false"
-          style="@style/TrackWidgetVerticalSeparator" >
-          <LinearLayout
-            android:layout_weight="2"
-            style="@style/TrackWidgetVerticalSpacer" />
-          <LinearLayout
+            android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
             android:layout_weight="1"
-            style="@style/TrackWidgetVerticalLine" />
+            android:baselineAligned="false">
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item1 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
+                    <TextView
+                        android:id="@+id/track_widget_item1_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item1_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- vertical separator -->
+                <LinearLayout
+                    style="@style/TrackWidgetVerticalSeparator"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalSpacer"
+                        android:layout_weight="2" />
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalLine"
+                        android:layout_weight="1" />
+                </LinearLayout>
+                <!-- item3 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
+                    <TextView
+                        android:id="@+id/track_widget_item3_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item3_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+            <!-- horizontal separator -->
+            <LinearLayout
+                style="@style/TrackWidgetHorizontalSeparator"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalLine"
+                    android:layout_weight="38" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item2 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
+                    <TextView
+                        android:id="@+id/track_widget_item2_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item2_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- vertical separator -->
+                <LinearLayout
+                    style="@style/TrackWidgetVerticalSeparator"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalLine"
+                        android:layout_weight="1" />
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalSpacer"
+                        android:layout_weight="2" />
+                </LinearLayout>
+                <!-- item4 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
+                    <TextView
+                        android:id="@+id/track_widget_item4_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_value"
+                            style="@style/TrackWidgetValue" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_unit"
+                            style="@style/TrackWidgetUnit" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item4_chronometer"
+                            style="@style/TrackWidgetValue" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
-        <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
-          <TextView
-            android:id="@+id/track_widget_item3_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/track_widget_record_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
-              android:id="@+id/track_widget_item3_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item3_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item3_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
+                android:id="@+id/track_widget_record_status"
+                style="@style/TrackWidgetRecordStatus" />
+
+            <ImageButton
+                android:id="@+id/track_widget_stop_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
         </LinearLayout>
-      </LinearLayout>
-      <!-- horizontal separator -->
-      <LinearLayout
-        android:baselineAligned="false"
-        style="@style/TrackWidgetHorizontalSeparator" >
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-        <LinearLayout
-          android:layout_weight="38"
-          style="@style/TrackWidgetHorizontalLine" />
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
-          <TextView
-            android:id="@+id/track_widget_item2_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
-            <TextView
-              android:id="@+id/track_widget_item2_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item2_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item2_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
-        </LinearLayout>
-        <!-- vertical separator -->
-        <LinearLayout
-          android:baselineAligned="false"
-          style="@style/TrackWidgetVerticalSeparator" >
-          <LinearLayout
-            android:layout_weight="1"
-            style="@style/TrackWidgetVerticalLine" />
-          <LinearLayout
-            android:layout_weight="2"
-            style="@style/TrackWidgetVerticalSpacer" />
-        </LinearLayout>
-        <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
-          <TextView
-            android:id="@+id/track_widget_item4_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
-            <TextView
-              android:id="@+id/track_widget_item4_value"
-              style="@style/TrackWidgetValue" />
-            <TextView
-              android:id="@+id/track_widget_item4_unit"
-              style="@style/TrackWidgetUnit" />
-            <Chronometer
-              android:id="@+id/track_widget_item4_chronometer"
-              style="@style/TrackWidgetValue" />
-          </LinearLayout>
-        </LinearLayout>
-      </LinearLayout>
     </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-      <ImageButton
-        android:contentDescription="@string/image_record"
-        android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
-        style="@style/TrackWidgetButton" />
-      <TextView
-        android:id="@+id/track_widget_record_status"
-        style="@style/TrackWidgetRecordStatus" />
-      <ImageButton
-        android:contentDescription="@string/image_stop"
-        android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
-        style="@style/TrackWidgetButton" />
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-    </LinearLayout>
-  </LinearLayout>
-  <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
-    style="@style/TrackWidgetLogo" />
+
+    <ImageView
+        style="@style/TrackWidgetLogo"
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_4x3.xml b/src/main/res/layout/track_widget_4x3.xml
index c5deedb08..3aeff1bfb 100644
--- a/src/main/res/layout/track_widget_4x3.xml
+++ b/src/main/res/layout/track_widget_4x3.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,147 +14,185 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
-  <LinearLayout
-    android:baselineAligned="false"
-    style="@style/TrackWidgetFrame" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-      android:baselineAligned="false"
-      android:id="@+id/track_widget_stats_container"
-      android:layout_weight="2"
-      style="@style/TrackWidgetStatsContainer" >
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item1_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item1_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item1_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item1_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
-        </LinearLayout>
-        <!-- vertical separator -->
+        style="@style/TrackWidgetFrame"
+        android:baselineAligned="false">
+
         <LinearLayout
-          android:baselineAligned="false"
-          style="@style/TrackWidgetVerticalSeparator" >
-          <LinearLayout
+            android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
             android:layout_weight="2"
-            style="@style/TrackWidgetVerticalSpacer" />
-          <LinearLayout
-            android:layout_weight="1"
-            style="@style/TrackWidgetVerticalLine" />
+            android:baselineAligned="false">
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item1 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item1_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item1_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- vertical separator -->
+                <LinearLayout
+                    style="@style/TrackWidgetVerticalSeparator"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalSpacer"
+                        android:layout_weight="2" />
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalLine"
+                        android:layout_weight="1" />
+                </LinearLayout>
+                <!-- item3 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item3_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item3_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+            <!-- horizontal separator -->
+            <LinearLayout
+                style="@style/TrackWidgetHorizontalSeparator"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalLine"
+                    android:layout_weight="38" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item2 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item2_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item2_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- vertical separator -->
+                <LinearLayout
+                    style="@style/TrackWidgetVerticalSeparator"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalLine"
+                        android:layout_weight="1" />
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalSpacer"
+                        android:layout_weight="2" />
+                </LinearLayout>
+                <!-- item4 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item4_label"
+                        style="@style/TrackWidgetLabel" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item4_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
-        <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item3_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/track_widget_record_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
-              android:id="@+id/track_widget_item3_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item3_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item3_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
+                android:id="@+id/track_widget_record_status"
+                style="@style/TrackWidgetRecordStatus" />
+
+            <ImageButton
+                android:id="@+id/track_widget_stop_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
         </LinearLayout>
-      </LinearLayout>
-      <!-- horizontal separator -->
-      <LinearLayout
-        android:baselineAligned="false"
-        style="@style/TrackWidgetHorizontalSeparator" >
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-        <LinearLayout
-          android:layout_weight="38"
-          style="@style/TrackWidgetHorizontalLine" />
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item2_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item2_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item2_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item2_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
-        </LinearLayout>
-        <!-- vertical separator -->
-        <LinearLayout
-          android:baselineAligned="false"
-          style="@style/TrackWidgetVerticalSeparator" >
-          <LinearLayout
-            android:layout_weight="1"
-            style="@style/TrackWidgetVerticalLine" />
-          <LinearLayout
-            android:layout_weight="2"
-            style="@style/TrackWidgetVerticalSpacer" />
-        </LinearLayout>
-        <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item4_label"
-            style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item4_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item4_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item4_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
-        </LinearLayout>
-      </LinearLayout>
     </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-      <ImageButton
-        android:contentDescription="@string/image_record"
-        android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
-        style="@style/TrackWidgetButton" />
-      <TextView
-        android:id="@+id/track_widget_record_status"
-        style="@style/TrackWidgetRecordStatus" />
-      <ImageButton
-        android:contentDescription="@string/image_stop"
-        android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
-        style="@style/TrackWidgetButton" />
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-    </LinearLayout>
-  </LinearLayout>
-  <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
-    style="@style/TrackWidgetLogo" />
+
+    <ImageView
+        style="@style/TrackWidgetLogo"
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_4x4.xml b/src/main/res/layout/track_widget_4x4.xml
index e3f2bee85..d89027f35 100644
--- a/src/main/res/layout/track_widget_4x4.xml
+++ b/src/main/res/layout/track_widget_4x4.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,151 +14,192 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
-  <LinearLayout
-    android:baselineAligned="false"
-    style="@style/TrackWidgetFrame" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-      android:baselineAligned="false"
-      android:id="@+id/track_widget_stats_container"
-      android:layout_weight="3"
-      style="@style/TrackWidgetStatsContainer" >
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
-          <TextView
-            android:id="@+id/track_widget_item1_label"
-            style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item1_value"
-              style="@style/TrackWidgetValue4x4" />
-            <TextView
-              android:id="@+id/track_widget_item1_unit"
-              style="@style/TrackWidgetUnit4x4" />
-            <Chronometer
-              android:id="@+id/track_widget_item1_chronometer"
-              style="@style/TrackWidgetValue4x4" />
-          </LinearLayout>
+        style="@style/TrackWidgetFrame"
+        android:baselineAligned="false">
+
+        <LinearLayout
+            android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
+            android:layout_weight="3"
+            android:baselineAligned="false">
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item1 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x4">
+
+                    <TextView
+                        android:id="@+id/track_widget_item1_label"
+                        style="@style/TrackWidgetLabel4x4" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_value"
+                            style="@style/TrackWidgetValue4x4" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item1_unit"
+                            style="@style/TrackWidgetUnit4x4" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item1_chronometer"
+                            style="@style/TrackWidgetValue4x4" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+            <!-- horizontal separator -->
+            <LinearLayout
+                style="@style/TrackWidgetHorizontalSeparator"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalLine"
+                    android:layout_weight="4" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item3 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x4">
+
+                    <TextView
+                        android:id="@+id/track_widget_item3_label"
+                        style="@style/TrackWidgetLabel4x4" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_value"
+                            style="@style/TrackWidgetValue4x4" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item3_unit"
+                            style="@style/TrackWidgetUnit4x4" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item3_chronometer"
+                            style="@style/TrackWidgetValue4x4" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/TrackWidgetHorizontalSeparator"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalLine"
+                    android:layout_weight="38" />
+
+                <LinearLayout
+                    style="@style/TrackWidgetHorizontalSpacer"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+                <!-- item2 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item2_label"
+                        style="@style/TrackWidgetLabel4x4" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item2_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item2_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- vertical separator -->
+                <LinearLayout
+                    style="@style/TrackWidgetVerticalSeparator"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalLine"
+                        android:layout_weight="1" />
+
+                    <LinearLayout
+                        style="@style/TrackWidgetVerticalSpacer"
+                        android:layout_weight="2" />
+                </LinearLayout>
+                <!-- item4 -->
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
+                    <TextView
+                        android:id="@+id/track_widget_item4_label"
+                        style="@style/TrackWidgetLabel4x4" />
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_value"
+                            style="@style/TrackWidgetValue4x3" />
+
+                        <TextView
+                            android:id="@+id/track_widget_item4_unit"
+                            style="@style/TrackWidgetUnit4x3" />
+
+                        <Chronometer
+                            android:id="@+id/track_widget_item4_chronometer"
+                            style="@style/TrackWidgetValue4x3" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
-      </LinearLayout>
-      <!-- horizontal separator -->
-      <LinearLayout
-        android:baselineAligned="false"
-        style="@style/TrackWidgetHorizontalSeparator" >
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-        <LinearLayout
-          android:layout_weight="4"
-          style="@style/TrackWidgetHorizontalLine" />
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
-          <TextView
-            android:id="@+id/track_widget_item3_label"
-            style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/track_widget_record_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
-              android:id="@+id/track_widget_item3_value"
-              style="@style/TrackWidgetValue4x4" />
-            <TextView
-              android:id="@+id/track_widget_item3_unit"
-              style="@style/TrackWidgetUnit4x4" />
-            <Chronometer
-              android:id="@+id/track_widget_item3_chronometer"
-              style="@style/TrackWidgetValue4x4" />
-          </LinearLayout>
+                android:id="@+id/track_widget_record_status"
+                style="@style/TrackWidgetRecordStatus" />
+
+            <ImageButton
+                android:id="@+id/track_widget_stop_button"
+                style="@style/TrackWidgetButton"
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
+            <LinearLayout
+                style="@style/TrackWidgetVerticalSpacer"
+                android:layout_weight="1" />
         </LinearLayout>
-      </LinearLayout>
-      <LinearLayout
-        android:baselineAligned="false"
-        style="@style/TrackWidgetHorizontalSeparator" >
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-        <LinearLayout
-          android:layout_weight="38"
-          style="@style/TrackWidgetHorizontalLine" />
-        <LinearLayout
-          android:layout_weight="1"
-          style="@style/TrackWidgetHorizontalSpacer" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
-        <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item2_label"
-            style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item2_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item2_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item2_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
-        </LinearLayout>
-        <!-- vertical separator -->
-        <LinearLayout
-          android:baselineAligned="false"
-          style="@style/TrackWidgetVerticalSeparator" >
-          <LinearLayout
-            android:layout_weight="1"
-            style="@style/TrackWidgetVerticalLine" />
-          <LinearLayout
-            android:layout_weight="2"
-            style="@style/TrackWidgetVerticalSpacer" />
-        </LinearLayout>
-        <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
-          <TextView
-            android:id="@+id/track_widget_item4_label"
-            style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
-            <TextView
-              android:id="@+id/track_widget_item4_value"
-              style="@style/TrackWidgetValue4x3" />
-            <TextView
-              android:id="@+id/track_widget_item4_unit"
-              style="@style/TrackWidgetUnit4x3" />
-            <Chronometer
-              android:id="@+id/track_widget_item4_chronometer"
-              style="@style/TrackWidgetValue4x3" />
-          </LinearLayout>
-        </LinearLayout>
-      </LinearLayout>
     </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-      <ImageButton
-        android:contentDescription="@string/image_record"
-        android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
-        style="@style/TrackWidgetButton" />
-      <TextView
-        android:id="@+id/track_widget_record_status"
-        style="@style/TrackWidgetRecordStatus" />
-      <ImageButton
-        android:contentDescription="@string/image_stop"
-        android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
-        style="@style/TrackWidgetButton" />
-      <LinearLayout
-        android:layout_weight="1"
-        style="@style/TrackWidgetVerticalSpacer" />
-    </LinearLayout>
-  </LinearLayout>
-  <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
-    style="@style/TrackWidgetLogo4x4" />
+
+    <ImageView
+        style="@style/TrackWidgetLogo4x4"
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_config.xml b/src/main/res/layout/track_widget_config.xml
index 851daed20..0eacd582f 100644
--- a/src/main/res/layout/track_widget_config.xml
+++ b/src/main/res/layout/track_widget_config.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,31 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical"
-      android:padding="8dp" >
-      <Spinner
-        android:id="@+id/track_widget_config_item1"
-        style="@style/TrackWidgetConfigSpinner" />
-      <Spinner
-        android:id="@+id/track_widget_config_item2"
-        style="@style/TrackWidgetConfigSpinner" />
-      <Spinner
-        android:id="@+id/track_widget_config_item3"
-        style="@style/TrackWidgetConfigSpinner" />
-      <Spinner
-        android:id="@+id/track_widget_config_item4"
-        style="@style/TrackWidgetConfigSpinner" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+            <Spinner
+                android:id="@+id/track_widget_config_item1"
+                style="@style/TrackWidgetConfigSpinner" />
+
+            <Spinner
+                android:id="@+id/track_widget_config_item2"
+                style="@style/TrackWidgetConfigSpinner" />
+
+            <Spinner
+                android:id="@+id/track_widget_config_item3"
+                style="@style/TrackWidgetConfigSpinner" />
+
+            <Spinner
+                android:id="@+id/track_widget_config_item4"
+                style="@style/TrackWidgetConfigSpinner" />
+        </LinearLayout>
+    </ScrollView>
+
+    <View style="@style/BottomButtonDivider" />
+
+    <LinearLayout style="@style/BottomButtonBar">
+
+        <include layout="@layout/track_widget_config_buttons" />
     </LinearLayout>
-  </ScrollView>
-  <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/track_widget_config_buttons" />
-  </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_widget_config_buttons.xml b/src/main/res/layout/track_widget_config_buttons.xml
index 3f37518f4..f61294cf6 100644
--- a/src/main/res/layout/track_widget_config_buttons.xml
+++ b/src/main/res/layout/track_widget_config_buttons.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/track_widget_config_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/track_widget_config_add"
-    android:layout_gravity="right"
-    android:text="@string/generic_add"
-    style="@style/BottomButton" />
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- In v14, postive button on the right. -->
+    <Button
+        android:id="@+id/track_widget_config_cancel"
+        style="@style/BottomButton"
+        android:layout_gravity="left"
+        android:text="@string/generic_cancel" />
+
+    <Button
+        android:id="@+id/track_widget_config_add"
+        style="@style/BottomButton"
+        android:layout_gravity="right"
+        android:text="@string/generic_add" />
 </merge>
\ No newline at end of file
diff --git a/src/main/res/menu/list_context_menu.xml b/src/main/res/menu/list_context_menu.xml
index 2bc604dca..f815fd16e 100644
--- a/src/main/res/menu/list_context_menu.xml
+++ b/src/main/res/menu/list_context_menu.xml
@@ -16,27 +16,27 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/list_context_menu_share"
-        android:title="@string/menu_share"
         android:actionProviderClass="android.widget.ShareActionProvider"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_share" />
     <item
         android:id="@+id/list_context_menu_show_on_map"
         android:icon="@drawable/ic_menu_show_on_map"
-        android:title="@string/menu_show_on_map"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/list_context_menu_edit"
         android:icon="@drawable/ic_menu_edit"
-        android:title="@string/menu_edit"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_edit" />
     <item
         android:id="@+id/list_context_menu_delete"
         android:icon="@drawable/ic_menu_delete"
-        android:title="@string/menu_delete"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_delete" />
     <item
         android:id="@+id/list_context_menu_select_all"
         android:icon="@drawable/ic_menu_select_all"
-        android:title="@string/menu_select_all"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_select_all" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/marker_detail.xml b/src/main/res/menu/marker_detail.xml
index b7c90a05b..5d513ed59 100644
--- a/src/main/res/menu/marker_detail.xml
+++ b/src/main/res/menu/marker_detail.xml
@@ -17,16 +17,16 @@ limitations under the License.
     <item
         android:id="@+id/marker_detail_show_on_map"
         android:icon="@drawable/ic_menu_show_on_map"
-        android:title="@string/menu_show_on_map"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/marker_detail_edit"
         android:icon="@drawable/ic_menu_edit"
-        android:title="@string/menu_edit"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_edit" />
     <item
         android:id="@+id/marker_detail_delete"
         android:icon="@drawable/ic_menu_delete"
-        android:title="@string/menu_delete"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_delete" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/marker_list.xml b/src/main/res/menu/marker_list.xml
index 76ab16a0e..f31c568ae 100644
--- a/src/main/res/menu/marker_list.xml
+++ b/src/main/res/menu/marker_list.xml
@@ -17,11 +17,11 @@ limitations under the License.
     <item
         android:id="@+id/marker_list_insert_marker"
         android:icon="@drawable/ic_menu_insert_marker"
-        android:title="@string/menu_insert_marker"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_insert_marker" />
     <item
         android:id="@+id/marker_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/search_list.xml b/src/main/res/menu/search_list.xml
index b05382495..0ff10cdd2 100644
--- a/src/main/res/menu/search_list.xml
+++ b/src/main/res/menu/search_list.xml
@@ -16,7 +16,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/search_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/track_detail.xml b/src/main/res/menu/track_detail.xml
index 8f1fe3bdb..2dd286393 100644
--- a/src/main/res/menu/track_detail.xml
+++ b/src/main/res/menu/track_detail.xml
@@ -18,26 +18,26 @@ limitations under the License.
         android:id="@+id/track_detail_insert_marker"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="1"
-        android:title="@string/menu_insert_marker"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_insert_marker" />
     <item
         android:id="@+id/track_detail_insert_photo"
         android:icon="@drawable/ic_menu_insert_photo"
         android:orderInCategory="2"
-        android:title="@string/menu_insert_photo"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_insert_photo" />
     <item
         android:id="@+id/track_detail_share"
-        android:orderInCategory="4"
-        android:title="@string/menu_share"
         android:actionProviderClass="android.widget.ShareActionProvider"
-        android:showAsAction="ifRoom" />
+        android:orderInCategory="4"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_share" />
     <item
         android:id="@+id/track_detail_markers"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="5"
-        android:title="@string/menu_markers"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_detail_edit"
         android:icon="@drawable/ic_menu_edit"
diff --git a/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml
index 87985c6bd..dab702a05 100644
--- a/src/main/res/menu/track_list.xml
+++ b/src/main/res/menu/track_list.xml
@@ -16,20 +16,20 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
     <item
         android:id="@+id/track_list_start_gps"
         android:icon="@drawable/ic_menu_start_gps"
-        android:title="@string/menu_start_gps"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_start_gps" />
     <item
         android:id="@+id/track_list_markers"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="5"
-        android:title="@string/menu_markers"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_list_aggregated_statistics"
         android:icon="@drawable/ic_menu_aggregated_statistics"
diff --git a/src/main/res/values/arrays_do_not_translate.xml b/src/main/res/values/arrays_do_not_translate.xml
index 743cd13d8..6e0c76033 100644
--- a/src/main/res/values/arrays_do_not_translate.xml
+++ b/src/main/res/values/arrays_do_not_translate.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,243 +14,243 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Do not translate any arrays in this file. -->
-  <string-array name="activity_types">
-    <item>@string/activity_type_airplane</item>
-    <item>@string/activity_type_atv</item>
-    <item>@string/activity_type_biking</item>
-    <item>@string/activity_type_blimp</item>
-    <item>@string/activity_type_boat</item>
-    <item>@string/activity_type_climbing</item>
-    <item>@string/activity_type_commercial_airplane</item>
-    <item>@string/activity_type_cross_country_skiing</item>
-    <item>@string/activity_type_cycling</item>
-    <item>@string/activity_type_dirt_bike</item>
-    <item>@string/activity_type_donkey_back_riding</item>
-    <item>@string/activity_type_driving</item>
-    <item>@string/activity_type_driving_bus</item>
-    <item>@string/activity_type_driving_car</item>
-    <item>@string/activity_type_ferry</item>
-    <item>@string/activity_type_frisbee</item>
-    <item>@string/activity_type_gliding</item>
-    <item>@string/activity_type_hang_gliding</item>
-    <item>@string/activity_type_helicopter</item>
-    <item>@string/activity_type_hiking</item>
-    <item>@string/activity_type_horse_back_riding</item>
-    <item>@string/activity_type_hot_air_balloon</item>
-    <item>@string/activity_type_ice_sailing</item>
-    <item>@string/activity_type_inline_skating</item>
-    <item>@string/activity_type_kayaking</item>
-    <item>@string/activity_type_kite_surfing</item>
-    <item>@string/activity_type_land_sailing</item>
-    <item>@string/activity_type_mixed_type</item>
-    <item>@string/activity_type_motor_bike</item>
-    <item>@string/activity_type_motor_boating</item>
-    <item>@string/activity_type_mountain_biking</item>
-    <item>@string/activity_type_off_trail_hiking</item>
-    <item>@string/activity_type_other</item>
-    <item>@string/activity_type_paddling</item>
-    <item>@string/activity_type_para_gliding</item>
-    <item>@string/activity_type_rc_airplane</item>
-    <item>@string/activity_type_rc_boat</item>
-    <item>@string/activity_type_rc_helicopter</item>
-    <item>@string/activity_type_riding</item>
-    <item>@string/activity_type_road_biking</item>
-    <item>@string/activity_type_roller_skiing</item>
-    <item>@string/activity_type_rowing</item>
-    <item>@string/activity_type_running</item>
-    <item>@string/activity_type_sailing</item>
-    <item>@string/activity_type_seaplane</item>
-    <item>@string/activity_type_skate_boarding</item>
-    <item>@string/activity_type_skating</item>
-    <item>@string/activity_type_skiing</item>
-    <item>@string/activity_type_sky_jumping</item>
-    <item>@string/activity_type_sled</item>
-    <item>@string/activity_type_snow_boarding</item>
-    <item>@string/activity_type_snow_shoeing</item>
-    <item>@string/activity_type_speed_walking</item>
-    <item>@string/activity_type_street_running</item>
-    <item>@string/activity_type_surfing</item>
-    <item>@string/activity_type_track_cycling</item>
-    <item>@string/activity_type_track_running</item>
-    <item>@string/activity_type_trail_hiking</item>
-    <item>@string/activity_type_trail_running</item>
-    <item>@string/activity_type_train</item>
-    <item>@string/activity_type_ultimate_frisbee</item>
-    <item>@string/activity_type_unknown</item>
-    <item>@string/activity_type_wakeboarding</item>
-    <item>@string/activity_type_walking</item>
-    <item>@string/activity_type_water_skiing</item>
-    <item>@string/activity_type_wind_surfing</item>
-  </string-array>
-  <string-array name="auto_resume_track_timeout_values">
-    <item>0</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>-1</item>
-  </string-array>
-  <string-array name="chart_x_axis_options">
-    <item>@string/settings_chart_by_distance</item>
-    <item>@string/settings_chart_by_time</item>
-  </string-array>
-  <string-array name="chart_x_axis_values">
-    <item>@string/chart_x_axis_distance</item>
-    <item>@string/chart_x_axis_time</item>
-  </string-array>
-  <string-array name="frequency_values">
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>30</item>
-    <item>60</item>
-    <item>-1</item>
-    <item>-5</item>
-    <item>-10</item>
-    <item>-25</item>
-    <item>-50</item>
-    <item>-100</item>
-  </string-array>
-  <string-array name="max_recording_distance_values">
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>5000</item>
-  </string-array>
-  <string-array name="min_recording_interval_values">
-    <item>-2</item>
-    <item>-1</item>
-    <item>0</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>60</item>
-    <item>120</item>
-    <item>300</item>
-    <item>480</item>
-    <item>900</item>
-    <item>1800</item>
-  </string-array>
-  <string-array name="photo_size_values">
-    <item>500</item>
-    <item>1024</item>
-    <item>2048</item>
-    <item>-1</item>
-  </string-array>
-  <string-array name="recording_distance_interval_values">
-    <item>1</item>
-    <item>2</item>
-    <item>5</item>
-    <item>10</item>
-    <item>20</item>
-    <item>50</item>
-    <item>100</item>
-  </string-array>
-  <string-array name="recording_gps_accuracy_values">
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>2000</item>
-  </string-array>
-  <string-array name="stats_rate_imperial_options">
-    <item>@string/description_speed_imperial</item>
-    <item>@string/description_pace_imperial</item>
-  </string-array>
-  <string-array name="stats_rate_metric_options">
-    <item>@string/description_speed_metric</item>
-    <item>@string/description_pace_metric</item>
-  </string-array>
-  <string-array name="stats_rate_values">
-    <item>@string/stats_rate_speed</item>
-    <item>@string/stats_rate_pace</item>
-  </string-array>
-  <string-array name="stats_units_options">
-    <item>@string/settings_stats_units_metric</item>
-    <item>@string/settings_stats_units_imperial</item>
-  </string-array>
-  <string-array name="stats_units_values">
-    <item>@string/stats_units_metric</item>
-    <item>@string/stats_units_imperial</item>
-  </string-array>
-  <string-array name="track_name_options">
-    <item>@string/settings_recording_track_name_location_option</item>
-    <item>@string/settings_recording_track_name_date_local_option</item>
-    <item>@string/settings_recording_track_name_date_iso_8601_option</item>
-    <item>@string/settings_recording_track_name_date_iso_8601_location_option</item>
-    <item>@string/settings_recording_track_name_number_option</item>
-  </string-array>
-  <string-array name="track_name_values">
-    <item>@string/settings_recording_track_name_location_value</item>
-    <item>@string/settings_recording_track_name_date_local_value</item>
-    <item>@string/settings_recording_track_name_date_iso_8601_value</item>
-    <item>@string/settings_recording_track_name_date_iso_8601_location_value</item>
-    <item>@string/settings_recording_track_name_number_value</item>
-  </string-array>
-  <string-array name="waypoint_types">
-    <item>@string/waypoint_type_atm</item>
-    <item>@string/waypoint_type_bank</item>
-    <item>@string/waypoint_type_bar</item>
-    <item>@string/waypoint_type_barbecue</item>
-    <item>@string/waypoint_type_building</item>
-    <item>@string/waypoint_type_bus_stop</item>
-    <item>@string/waypoint_type_cafe</item>
-    <item>@string/waypoint_type_campfire</item>
-    <item>@string/waypoint_type_campground</item>
-    <item>@string/waypoint_type_church</item>
-    <item>@string/waypoint_type_coffee_house</item>
-    <item>@string/waypoint_type_convenience_store</item>
-    <item>@string/waypoint_type_drinking_water</item>
-    <item>@string/waypoint_type_falling_rocks</item>
-    <item>@string/waypoint_type_ferry</item>
-    <item>@string/waypoint_type_fire_place</item>
-    <item>@string/waypoint_type_fire_station</item>
-    <item>@string/waypoint_type_fishing</item>
-    <item>@string/waypoint_type_gas_station</item>
-    <item>@string/waypoint_type_golf_course</item>
-    <item>@string/waypoint_type_grocery_store</item>
-    <item>@string/waypoint_type_hair_dresser</item>
-    <item>@string/waypoint_type_harbor</item>
-    <item>@string/waypoint_type_hiking_path</item>
-    <item>@string/waypoint_type_hotel</item>
-    <item>@string/waypoint_type_house</item>
-    <item>@string/waypoint_type_information</item>
-    <item>@string/waypoint_type_intersection</item>
-    <item>@string/waypoint_type_mail_box</item>
-    <item>@string/waypoint_type_market</item>
-    <item>@string/waypoint_type_meeting_point</item>
-    <item>@string/waypoint_type_opera</item>
-    <item>@string/waypoint_type_parking</item>
-    <item>@string/waypoint_type_police_station</item>
-    <item>@string/waypoint_type_post_office</item>
-    <item>@string/waypoint_type_pothole</item>
-    <item>@string/waypoint_type_railway_crossing</item>
-    <item>@string/waypoint_type_restaurant</item>
-    <item>@string/waypoint_type_shopping</item>
-    <item>@string/waypoint_type_sight</item>
-    <item>@string/waypoint_type_store</item>
-    <item>@string/waypoint_type_swimming_pool</item>
-    <item>@string/waypoint_type_telephone</item>
-    <item>@string/waypoint_type_theater</item>
-    <item>@string/waypoint_type_toilet</item>
-    <item>@string/waypoint_type_tourist_information</item>
-    <item>@string/waypoint_type_tree</item>
-    <item>@string/waypoint_type_tunnel</item>
-    <item>@string/waypoint_type_waterfall</item>
-    <item>@string/waypoint_type_water_fountain</item>
-    <item>@string/waypoint_type_waypoint</item>
-  </string-array>
+    <!-- Do not translate any arrays in this file. -->
+    <string-array name="activity_types">
+        <item>@string/activity_type_airplane</item>
+        <item>@string/activity_type_atv</item>
+        <item>@string/activity_type_biking</item>
+        <item>@string/activity_type_blimp</item>
+        <item>@string/activity_type_boat</item>
+        <item>@string/activity_type_climbing</item>
+        <item>@string/activity_type_commercial_airplane</item>
+        <item>@string/activity_type_cross_country_skiing</item>
+        <item>@string/activity_type_cycling</item>
+        <item>@string/activity_type_dirt_bike</item>
+        <item>@string/activity_type_donkey_back_riding</item>
+        <item>@string/activity_type_driving</item>
+        <item>@string/activity_type_driving_bus</item>
+        <item>@string/activity_type_driving_car</item>
+        <item>@string/activity_type_ferry</item>
+        <item>@string/activity_type_frisbee</item>
+        <item>@string/activity_type_gliding</item>
+        <item>@string/activity_type_hang_gliding</item>
+        <item>@string/activity_type_helicopter</item>
+        <item>@string/activity_type_hiking</item>
+        <item>@string/activity_type_horse_back_riding</item>
+        <item>@string/activity_type_hot_air_balloon</item>
+        <item>@string/activity_type_ice_sailing</item>
+        <item>@string/activity_type_inline_skating</item>
+        <item>@string/activity_type_kayaking</item>
+        <item>@string/activity_type_kite_surfing</item>
+        <item>@string/activity_type_land_sailing</item>
+        <item>@string/activity_type_mixed_type</item>
+        <item>@string/activity_type_motor_bike</item>
+        <item>@string/activity_type_motor_boating</item>
+        <item>@string/activity_type_mountain_biking</item>
+        <item>@string/activity_type_off_trail_hiking</item>
+        <item>@string/activity_type_other</item>
+        <item>@string/activity_type_paddling</item>
+        <item>@string/activity_type_para_gliding</item>
+        <item>@string/activity_type_rc_airplane</item>
+        <item>@string/activity_type_rc_boat</item>
+        <item>@string/activity_type_rc_helicopter</item>
+        <item>@string/activity_type_riding</item>
+        <item>@string/activity_type_road_biking</item>
+        <item>@string/activity_type_roller_skiing</item>
+        <item>@string/activity_type_rowing</item>
+        <item>@string/activity_type_running</item>
+        <item>@string/activity_type_sailing</item>
+        <item>@string/activity_type_seaplane</item>
+        <item>@string/activity_type_skate_boarding</item>
+        <item>@string/activity_type_skating</item>
+        <item>@string/activity_type_skiing</item>
+        <item>@string/activity_type_sky_jumping</item>
+        <item>@string/activity_type_sled</item>
+        <item>@string/activity_type_snow_boarding</item>
+        <item>@string/activity_type_snow_shoeing</item>
+        <item>@string/activity_type_speed_walking</item>
+        <item>@string/activity_type_street_running</item>
+        <item>@string/activity_type_surfing</item>
+        <item>@string/activity_type_track_cycling</item>
+        <item>@string/activity_type_track_running</item>
+        <item>@string/activity_type_trail_hiking</item>
+        <item>@string/activity_type_trail_running</item>
+        <item>@string/activity_type_train</item>
+        <item>@string/activity_type_ultimate_frisbee</item>
+        <item>@string/activity_type_unknown</item>
+        <item>@string/activity_type_wakeboarding</item>
+        <item>@string/activity_type_walking</item>
+        <item>@string/activity_type_water_skiing</item>
+        <item>@string/activity_type_wind_surfing</item>
+    </string-array>
+    <string-array name="auto_resume_track_timeout_values">
+        <item>0</item>
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="chart_x_axis_options">
+        <item>@string/settings_chart_by_distance</item>
+        <item>@string/settings_chart_by_time</item>
+    </string-array>
+    <string-array name="chart_x_axis_values">
+        <item>@string/chart_x_axis_distance</item>
+        <item>@string/chart_x_axis_time</item>
+    </string-array>
+    <string-array name="frequency_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>-1</item>
+        <item>-5</item>
+        <item>-10</item>
+        <item>-25</item>
+        <item>-50</item>
+        <item>-100</item>
+    </string-array>
+    <string-array name="max_recording_distance_values">
+        <item>50</item>
+        <item>100</item>
+        <item>200</item>
+        <item>500</item>
+        <item>1000</item>
+        <item>5000</item>
+    </string-array>
+    <string-array name="min_recording_interval_values">
+        <item>-2</item>
+        <item>-1</item>
+        <item>0</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>60</item>
+        <item>120</item>
+        <item>300</item>
+        <item>480</item>
+        <item>900</item>
+        <item>1800</item>
+    </string-array>
+    <string-array name="photo_size_values">
+        <item>500</item>
+        <item>1024</item>
+        <item>2048</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="recording_distance_interval_values">
+        <item>1</item>
+        <item>2</item>
+        <item>5</item>
+        <item>10</item>
+        <item>20</item>
+        <item>50</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="recording_gps_accuracy_values">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50</item>
+        <item>100</item>
+        <item>200</item>
+        <item>500</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+    <string-array name="stats_rate_imperial_options">
+        <item>@string/description_speed_imperial</item>
+        <item>@string/description_pace_imperial</item>
+    </string-array>
+    <string-array name="stats_rate_metric_options">
+        <item>@string/description_speed_metric</item>
+        <item>@string/description_pace_metric</item>
+    </string-array>
+    <string-array name="stats_rate_values">
+        <item>@string/stats_rate_speed</item>
+        <item>@string/stats_rate_pace</item>
+    </string-array>
+    <string-array name="stats_units_options">
+        <item>@string/settings_stats_units_metric</item>
+        <item>@string/settings_stats_units_imperial</item>
+    </string-array>
+    <string-array name="stats_units_values">
+        <item>@string/stats_units_metric</item>
+        <item>@string/stats_units_imperial</item>
+    </string-array>
+    <string-array name="track_name_options">
+        <item>@string/settings_recording_track_name_location_option</item>
+        <item>@string/settings_recording_track_name_date_local_option</item>
+        <item>@string/settings_recording_track_name_date_iso_8601_option</item>
+        <item>@string/settings_recording_track_name_date_iso_8601_location_option</item>
+        <item>@string/settings_recording_track_name_number_option</item>
+    </string-array>
+    <string-array name="track_name_values">
+        <item>@string/settings_recording_track_name_location_value</item>
+        <item>@string/settings_recording_track_name_date_local_value</item>
+        <item>@string/settings_recording_track_name_date_iso_8601_value</item>
+        <item>@string/settings_recording_track_name_date_iso_8601_location_value</item>
+        <item>@string/settings_recording_track_name_number_value</item>
+    </string-array>
+    <string-array name="waypoint_types">
+        <item>@string/waypoint_type_atm</item>
+        <item>@string/waypoint_type_bank</item>
+        <item>@string/waypoint_type_bar</item>
+        <item>@string/waypoint_type_barbecue</item>
+        <item>@string/waypoint_type_building</item>
+        <item>@string/waypoint_type_bus_stop</item>
+        <item>@string/waypoint_type_cafe</item>
+        <item>@string/waypoint_type_campfire</item>
+        <item>@string/waypoint_type_campground</item>
+        <item>@string/waypoint_type_church</item>
+        <item>@string/waypoint_type_coffee_house</item>
+        <item>@string/waypoint_type_convenience_store</item>
+        <item>@string/waypoint_type_drinking_water</item>
+        <item>@string/waypoint_type_falling_rocks</item>
+        <item>@string/waypoint_type_ferry</item>
+        <item>@string/waypoint_type_fire_place</item>
+        <item>@string/waypoint_type_fire_station</item>
+        <item>@string/waypoint_type_fishing</item>
+        <item>@string/waypoint_type_gas_station</item>
+        <item>@string/waypoint_type_golf_course</item>
+        <item>@string/waypoint_type_grocery_store</item>
+        <item>@string/waypoint_type_hair_dresser</item>
+        <item>@string/waypoint_type_harbor</item>
+        <item>@string/waypoint_type_hiking_path</item>
+        <item>@string/waypoint_type_hotel</item>
+        <item>@string/waypoint_type_house</item>
+        <item>@string/waypoint_type_information</item>
+        <item>@string/waypoint_type_intersection</item>
+        <item>@string/waypoint_type_mail_box</item>
+        <item>@string/waypoint_type_market</item>
+        <item>@string/waypoint_type_meeting_point</item>
+        <item>@string/waypoint_type_opera</item>
+        <item>@string/waypoint_type_parking</item>
+        <item>@string/waypoint_type_police_station</item>
+        <item>@string/waypoint_type_post_office</item>
+        <item>@string/waypoint_type_pothole</item>
+        <item>@string/waypoint_type_railway_crossing</item>
+        <item>@string/waypoint_type_restaurant</item>
+        <item>@string/waypoint_type_shopping</item>
+        <item>@string/waypoint_type_sight</item>
+        <item>@string/waypoint_type_store</item>
+        <item>@string/waypoint_type_swimming_pool</item>
+        <item>@string/waypoint_type_telephone</item>
+        <item>@string/waypoint_type_theater</item>
+        <item>@string/waypoint_type_toilet</item>
+        <item>@string/waypoint_type_tourist_information</item>
+        <item>@string/waypoint_type_tree</item>
+        <item>@string/waypoint_type_tunnel</item>
+        <item>@string/waypoint_type_waterfall</item>
+        <item>@string/waypoint_type_water_fountain</item>
+        <item>@string/waypoint_type_waypoint</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 4dffa4605..d9a81d769 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <color name="chart_cadence_border">#FFF128F3</color> <!-- pink -->
-  <color name="chart_cadence_fill">#40F128F3</color> <!-- transparent pink -->
-  <color name="chart_elevation_border">#FF339933</color> <!-- green -->
-  <color name="chart_elevation_fill">#40B3CFB3</color> <!-- transparent green -->
-  <color name="chart_heart_rate_border">#FFCC3300</color> <!-- red -->
-  <color name="chart_heart_rate_fill">#40E88A70</color> <!-- transparent red -->
-  <color name="chart_pace_border">#FF0066FF</color> <!-- blue -->
-  <color name="chart_pace_fill">#40C8E0FF</color> <!-- transparent blue -->
-  <color name="chart_power_border">#FF401465</color> <!-- purple -->
-  <color name="chart_power_fill">#40401465</color> <!-- transparent purple -->
-  <color name="chart_speed_border">#FF0066FF</color> <!-- blue -->
-  <color name="chart_speed_fill">#40C8E0FF</color> <!-- transparent blue -->
-  <color name="holo_orange_dark">#FFFF8800</color>
-  <color name="list_empty_text">#FFCCCCCC</color>
-  <color name="recording_text">#FFBE161B</color> <!-- red -->
-  <color name="stats_large_label">#FFFAAD2C</color> <!-- orange -->
-  <color name="stats_separator">#99999999</color> <!-- light gray -->
-  <color name="text_gradient_center">#B2000000</color> <!-- black 70% opacity -->
-  <color name="text_gradient_end">#00000000</color> <!-- black 0% opacity -->
-  <color name="text_gradient_start">#FF000000</color> <!-- black 100% opacity -->
-  <color name="track_color_fast">#F7DF0101</color> <!-- red color -->
-  <color name="track_color_normal">#F75858FA</color> <!-- blue color -->
-  <color name="track_color_slow">#F774DF00</color> <!-- green color -->
-  <color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
+    <color name="chart_cadence_border">#FFF128F3</color> <!-- pink -->
+    <color name="chart_cadence_fill">#40F128F3</color> <!-- transparent pink -->
+    <color name="chart_elevation_border">#FF339933</color> <!-- green -->
+    <color name="chart_elevation_fill">#40B3CFB3</color> <!-- transparent green -->
+    <color name="chart_heart_rate_border">#FFCC3300</color> <!-- red -->
+    <color name="chart_heart_rate_fill">#40E88A70</color> <!-- transparent red -->
+    <color name="chart_pace_border">#FF0066FF</color> <!-- blue -->
+    <color name="chart_pace_fill">#40C8E0FF</color> <!-- transparent blue -->
+    <color name="chart_power_border">#FF401465</color> <!-- purple -->
+    <color name="chart_power_fill">#40401465</color> <!-- transparent purple -->
+    <color name="chart_speed_border">#FF0066FF</color> <!-- blue -->
+    <color name="chart_speed_fill">#40C8E0FF</color> <!-- transparent blue -->
+    <color name="holo_orange_dark">#FFFF8800</color>
+    <color name="list_empty_text">#FFCCCCCC</color>
+    <color name="recording_text">#FFBE161B</color> <!-- red -->
+    <color name="stats_large_label">#FFFAAD2C</color> <!-- orange -->
+    <color name="stats_separator">#99999999</color> <!-- light gray -->
+    <color name="text_gradient_center">#B2000000</color> <!-- black 70% opacity -->
+    <color name="text_gradient_end">#00000000</color> <!-- black 0% opacity -->
+    <color name="text_gradient_start">#FF000000</color> <!-- black 100% opacity -->
+    <color name="track_color_fast">#F7DF0101</color> <!-- red color -->
+    <color name="track_color_normal">#F75858FA</color> <!-- blue color -->
+    <color name="track_color_slow">#F774DF00</color> <!-- green color -->
+    <color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 344b6ad05..76a81f661 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <dimen name="widget_margin">0dp</dimen>
+    <dimen name="widget_margin">0dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index 46eef34e4..072e50c75 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- DO NOT TRANSLATE ANY STRINGS IN THIS FILE. -->
-  <string name="chart_x_axis_distance" translatable="false">DISTANCE</string>
-  <string name="chart_x_axis_time" translatable="false">TIME</string>
-  <string name="marker_statistics_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
-  <string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
-  <string name="app_web_url" translatable="false">TODO</string>
-  <string name="permission_notification_value" translatable="false">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
-  <string name="sensor_type_value_none" translatable="false">NONE</string>
-  <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
-  <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
-  <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
-  <string name="settings_recording_track_name_date_iso_8601_location_value" translatable="false">DATE_ISO_8601_LOCATION</string>
-  <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>
-  <string name="settings_recording_track_name_location_value" translatable="false">LOCATION</string>
-  <string name="settings_recording_track_name_number_value" translatable="false">NUMBER</string>
-  <string name="stats_rate_pace" translatable="false">PACE</string>
-  <string name="stats_rate_speed" translatable="false">SPEED</string>
-  <string name="stats_units_imperial" translatable="false">IMPERIAL</string>
-  <string name="stats_units_metric" translatable="false">METRIC</string>
-  <string name="track_action_end" translatable="false">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
-  <string name="track_action_pause" translatable="false">com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK</string>
-  <string name="track_action_resume" translatable="false">com.google.android.apps.mytracks.RESUME_CURRENT_TRACK</string>
-  <string name="track_action_start" translatable="false">com.google.android.apps.mytracks.START_NEW_TRACK</string>
-  <string name="value_unknown" translatable="false">-</string>
+    <!-- DO NOT TRANSLATE ANY STRINGS IN THIS FILE. -->
+    <string name="chart_x_axis_distance" translatable="false">DISTANCE</string>
+    <string name="chart_x_axis_time" translatable="false">TIME</string>
+    <string name="marker_statistics_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
+    <string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
+    <string name="app_web_url" translatable="false">TODO</string>
+    <string name="permission_notification_value" translatable="false">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
+    <string name="sensor_type_value_none" translatable="false">NONE</string>
+    <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
+    <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
+    <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
+    <string name="settings_recording_track_name_date_iso_8601_location_value" translatable="false">DATE_ISO_8601_LOCATION</string>
+    <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>
+    <string name="settings_recording_track_name_location_value" translatable="false">LOCATION</string>
+    <string name="settings_recording_track_name_number_value" translatable="false">NUMBER</string>
+    <string name="stats_rate_pace" translatable="false">PACE</string>
+    <string name="stats_rate_speed" translatable="false">SPEED</string>
+    <string name="stats_units_imperial" translatable="false">IMPERIAL</string>
+    <string name="stats_units_metric" translatable="false">METRIC</string>
+    <string name="track_action_end" translatable="false">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
+    <string name="track_action_pause" translatable="false">com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK</string>
+    <string name="track_action_resume" translatable="false">com.google.android.apps.mytracks.RESUME_CURRENT_TRACK</string>
+    <string name="track_action_start" translatable="false">com.google.android.apps.mytracks.START_NEW_TRACK</string>
+    <string name="value_unknown" translatable="false">-</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index ce6a0aa44..b493302cb 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,44 +14,44 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
-  <string name="auto_resume_track_timeout_key" translatable="false">autoResumeTrackTimeout</string>
-  <string name="chart_show_cadence_key" translatable="false">chartShowCadence</string>
-  <string name="chart_show_elevation_key" translatable="false">chartShowElevation</string>
-  <string name="chart_show_heart_rate_key" translatable="false">chartShowHeartRate</string>
-  <string name="chart_show_power_key" translatable="false">chartShowPower</string>
-  <string name="chart_show_speed_key" translatable="false">chartShowSpeed</string>
-  <string name="chart_x_axis_key" translatable="false">chartXAxis</string>
-  <string name="default_activity_key" translatable="false">defaultActivity</string>
-  <string name="max_recording_distance_key" translatable="false">maxRecordingDistance</string>
-  <string name="min_recording_interval_key" translatable="false">minRecordingInterval</string>
-  <string name="photo_size_key" translatable="false">photoSize</string>
-  <string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
-  <string name="recording_gps_accuracy_key" translatable="false">recordingGpsAccuracy</string>
-  <string name="split_frequency_key" translatable="false">splitFrequency</string>
-  <string name="stats_rate_key" translatable="false">statsRate</string>
-  <string name="stats_show_coordinate_key" translatable="false">statsShowCoordinate</string>
-  <string name="stats_show_grade_elevation_key" translatable="false">statsShowGradeElevation</string>
-  <string name="stats_units_key" translatable="false">statsUnits</string>
-  <string name="track_name_key" translatable="false">trackName</string>
-  <string name="track_widget_item1" translatable="false">trackWidgetItem1</string>
-  <string name="track_widget_item2" translatable="false">trackWidgetItem2</string>
-  <string name="track_widget_item3" translatable="false">trackWidgetItem3</string>
-  <string name="track_widget_item4" translatable="false">trackWidgetItem4</string>
-  <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
-  <!-- Keys for persistend preferences. But they should not get backed up or restored. -->
-  <string name="auto_resume_track_current_retry_key" translatable="false">autoResumeTrackCurrentRetry</string>
-  <string name="bluetooth_sensor_key" translatable="false">bluetoothSensor</string>
-  <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
-  <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
-  <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
-  <string name="settings_advanced_key" translatable="false">settingsAdvanced</string>
-  <string name="settings_chart_key" translatable="false">settingsChart</string>
-  <string name="settings_recording_key" translatable="false">settingsRecording</string>
-  <string name="settings_reset_key" translatable="false">settingsReset</string>
-  <string name="settings_sensor_key" translatable="false">settingsSensor</string>
-  <string name="settings_sensor_bluetooth_key" translatable="false">settingsSensorBluetooth</string>
-  <string name="settings_sensor_bluetooth_pairing_key" translatable="false">settingsSensorBluetoothPairing</string>
-  <string name="settings_sensor_root_key" translatable="false">settingsSensorRoot</string>
-  <string name="settings_stats_key" translatable="false">settingsStats</string>
+    <!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
+    <string name="auto_resume_track_timeout_key" translatable="false">autoResumeTrackTimeout</string>
+    <string name="chart_show_cadence_key" translatable="false">chartShowCadence</string>
+    <string name="chart_show_elevation_key" translatable="false">chartShowElevation</string>
+    <string name="chart_show_heart_rate_key" translatable="false">chartShowHeartRate</string>
+    <string name="chart_show_power_key" translatable="false">chartShowPower</string>
+    <string name="chart_show_speed_key" translatable="false">chartShowSpeed</string>
+    <string name="chart_x_axis_key" translatable="false">chartXAxis</string>
+    <string name="default_activity_key" translatable="false">defaultActivity</string>
+    <string name="max_recording_distance_key" translatable="false">maxRecordingDistance</string>
+    <string name="min_recording_interval_key" translatable="false">minRecordingInterval</string>
+    <string name="photo_size_key" translatable="false">photoSize</string>
+    <string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
+    <string name="recording_gps_accuracy_key" translatable="false">recordingGpsAccuracy</string>
+    <string name="split_frequency_key" translatable="false">splitFrequency</string>
+    <string name="stats_rate_key" translatable="false">statsRate</string>
+    <string name="stats_show_coordinate_key" translatable="false">statsShowCoordinate</string>
+    <string name="stats_show_grade_elevation_key" translatable="false">statsShowGradeElevation</string>
+    <string name="stats_units_key" translatable="false">statsUnits</string>
+    <string name="track_name_key" translatable="false">trackName</string>
+    <string name="track_widget_item1" translatable="false">trackWidgetItem1</string>
+    <string name="track_widget_item2" translatable="false">trackWidgetItem2</string>
+    <string name="track_widget_item3" translatable="false">trackWidgetItem3</string>
+    <string name="track_widget_item4" translatable="false">trackWidgetItem4</string>
+    <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
+    <!-- Keys for persistend preferences. But they should not get backed up or restored. -->
+    <string name="auto_resume_track_current_retry_key" translatable="false">autoResumeTrackCurrentRetry</string>
+    <string name="bluetooth_sensor_key" translatable="false">bluetoothSensor</string>
+    <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
+    <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
+    <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
+    <string name="settings_advanced_key" translatable="false">settingsAdvanced</string>
+    <string name="settings_chart_key" translatable="false">settingsChart</string>
+    <string name="settings_recording_key" translatable="false">settingsRecording</string>
+    <string name="settings_reset_key" translatable="false">settingsReset</string>
+    <string name="settings_sensor_key" translatable="false">settingsSensor</string>
+    <string name="settings_sensor_bluetooth_key" translatable="false">settingsSensorBluetooth</string>
+    <string name="settings_sensor_bluetooth_pairing_key" translatable="false">settingsSensorBluetoothPairing</string>
+    <string name="settings_sensor_root_key" translatable="false">settingsSensorRoot</string>
+    <string name="settings_stats_key" translatable="false">settingsStats</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/plurals.xml b/src/main/res/values/plurals.xml
index db8549cfd..bdb0c41d5 100644
--- a/src/main/res/values/plurals.xml
+++ b/src/main/res/values/plurals.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2011 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,76 +14,76 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <plurals name="files">
-    <item quantity="zero">@string/files_zero</item>
-    <item quantity="one">@string/files_one</item>
-    <item quantity="two">@string/files_two</item>
-    <item quantity="few">@string/files_few</item>
-    <item quantity="many">@string/files_many</item>
-    <item quantity="other">@string/files_other</item>
-  </plurals>
-  <plurals name="tracks">
-    <item quantity="zero">@string/tracks_zero</item>
-    <item quantity="one">@string/tracks_one</item>
-    <item quantity="two">@string/tracks_two</item>
-    <item quantity="few">@string/tracks_few</item>
-    <item quantity="many">@string/tracks_many</item>
-    <item quantity="other">@string/tracks_other</item>
-  </plurals>
-  <plurals name="voiceHours">
-    <item quantity="zero">@string/voice_hours_zero</item>
-    <item quantity="one">@string/voice_hours_one</item>
-    <item quantity="two">@string/voice_hours_two</item>
-    <item quantity="few">@string/voice_hours_few</item>
-    <item quantity="many">@string/voice_hours_many</item>
-    <item quantity="other">@string/voice_hours_other</item>
-  </plurals>
-  <plurals name="voiceMinutes">
-    <item quantity="zero">@string/voice_minutes_zero</item>
-    <item quantity="one">@string/voice_minutes_one</item>
-    <item quantity="two">@string/voice_minutes_two</item>
-    <item quantity="few">@string/voice_minutes_few</item>
-    <item quantity="many">@string/voice_minutes_many</item>
-    <item quantity="other">@string/voice_minutes_other</item>
-  </plurals>
-  <plurals name="voiceSeconds">
-    <item quantity="zero">@string/voice_seconds_zero</item>
-    <item quantity="one">@string/voice_seconds_one</item>
-    <item quantity="two">@string/voice_seconds_two</item>
-    <item quantity="few">@string/voice_seconds_few</item>
-    <item quantity="many">@string/voice_seconds_many</item>
-    <item quantity="other">@string/voice_seconds_other</item>
-  </plurals>
-  <plurals name="voiceSpeedKilometersPerHour">
-    <item quantity="zero">@string/voice_speed_kilometers_per_hour_zero</item>
-    <item quantity="one">@string/voice_speed_kilometers_per_hour_one</item>
-    <item quantity="two">@string/voice_speed_kilometers_per_hour_two</item>
-    <item quantity="few">@string/voice_speed_kilometers_per_hour_few</item>
-    <item quantity="many">@string/voice_speed_kilometers_per_hour_many</item>
-    <item quantity="other">@string/voice_speed_kilometers_per_hour_other</item>
-  </plurals>
-  <plurals name="voiceSpeedMilesPerHour">
-    <item quantity="zero">@string/voice_speed_miles_per_hour_zero</item>
-    <item quantity="one">@string/voice_speed_miles_per_hour_one</item>
-    <item quantity="two">@string/voice_speed_miles_per_hour_two</item>
-    <item quantity="few">@string/voice_speed_miles_per_hour_few</item>
-    <item quantity="many">@string/voice_speed_miles_per_hour_many</item>
-    <item quantity="other">@string/voice_speed_miles_per_hour_other</item>
-  </plurals>
-  <plurals name="voiceTotalDistanceKilometers">
-    <item quantity="zero">@string/voice_total_distance_kilometers_zero</item>
-    <item quantity="one">@string/voice_total_distance_kilometers_one</item>
-    <item quantity="two">@string/voice_total_distance_kilometers_two</item>
-    <item quantity="few">@string/voice_total_distance_kilometers_few</item>
-    <item quantity="many">@string/voice_total_distance_kilometers_many</item>
-    <item quantity="other">@string/voice_total_distance_kilometers_other</item>
-  </plurals>
-  <plurals name="voiceTotalDistanceMiles">
-    <item quantity="zero">@string/voice_total_distance_miles_zero</item>
-    <item quantity="one">@string/voice_total_distance_miles_one</item>
-    <item quantity="two">@string/voice_total_distance_miles_two</item>
-    <item quantity="few">@string/voice_total_distance_miles_few</item>
-    <item quantity="many">@string/voice_total_distance_miles_many</item>
-    <item quantity="other">@string/voice_total_distance_miles_other</item>
-  </plurals>
+    <plurals name="files">
+        <item quantity="zero">@string/files_zero</item>
+        <item quantity="one">@string/files_one</item>
+        <item quantity="two">@string/files_two</item>
+        <item quantity="few">@string/files_few</item>
+        <item quantity="many">@string/files_many</item>
+        <item quantity="other">@string/files_other</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="zero">@string/tracks_zero</item>
+        <item quantity="one">@string/tracks_one</item>
+        <item quantity="two">@string/tracks_two</item>
+        <item quantity="few">@string/tracks_few</item>
+        <item quantity="many">@string/tracks_many</item>
+        <item quantity="other">@string/tracks_other</item>
+    </plurals>
+    <plurals name="voiceHours">
+        <item quantity="zero">@string/voice_hours_zero</item>
+        <item quantity="one">@string/voice_hours_one</item>
+        <item quantity="two">@string/voice_hours_two</item>
+        <item quantity="few">@string/voice_hours_few</item>
+        <item quantity="many">@string/voice_hours_many</item>
+        <item quantity="other">@string/voice_hours_other</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="zero">@string/voice_minutes_zero</item>
+        <item quantity="one">@string/voice_minutes_one</item>
+        <item quantity="two">@string/voice_minutes_two</item>
+        <item quantity="few">@string/voice_minutes_few</item>
+        <item quantity="many">@string/voice_minutes_many</item>
+        <item quantity="other">@string/voice_minutes_other</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="zero">@string/voice_seconds_zero</item>
+        <item quantity="one">@string/voice_seconds_one</item>
+        <item quantity="two">@string/voice_seconds_two</item>
+        <item quantity="few">@string/voice_seconds_few</item>
+        <item quantity="many">@string/voice_seconds_many</item>
+        <item quantity="other">@string/voice_seconds_other</item>
+    </plurals>
+    <plurals name="voiceSpeedKilometersPerHour">
+        <item quantity="zero">@string/voice_speed_kilometers_per_hour_zero</item>
+        <item quantity="one">@string/voice_speed_kilometers_per_hour_one</item>
+        <item quantity="two">@string/voice_speed_kilometers_per_hour_two</item>
+        <item quantity="few">@string/voice_speed_kilometers_per_hour_few</item>
+        <item quantity="many">@string/voice_speed_kilometers_per_hour_many</item>
+        <item quantity="other">@string/voice_speed_kilometers_per_hour_other</item>
+    </plurals>
+    <plurals name="voiceSpeedMilesPerHour">
+        <item quantity="zero">@string/voice_speed_miles_per_hour_zero</item>
+        <item quantity="one">@string/voice_speed_miles_per_hour_one</item>
+        <item quantity="two">@string/voice_speed_miles_per_hour_two</item>
+        <item quantity="few">@string/voice_speed_miles_per_hour_few</item>
+        <item quantity="many">@string/voice_speed_miles_per_hour_many</item>
+        <item quantity="other">@string/voice_speed_miles_per_hour_other</item>
+    </plurals>
+    <plurals name="voiceTotalDistanceKilometers">
+        <item quantity="zero">@string/voice_total_distance_kilometers_zero</item>
+        <item quantity="one">@string/voice_total_distance_kilometers_one</item>
+        <item quantity="two">@string/voice_total_distance_kilometers_two</item>
+        <item quantity="few">@string/voice_total_distance_kilometers_few</item>
+        <item quantity="many">@string/voice_total_distance_kilometers_many</item>
+        <item quantity="other">@string/voice_total_distance_kilometers_other</item>
+    </plurals>
+    <plurals name="voiceTotalDistanceMiles">
+        <item quantity="zero">@string/voice_total_distance_miles_zero</item>
+        <item quantity="one">@string/voice_total_distance_miles_one</item>
+        <item quantity="two">@string/voice_total_distance_miles_two</item>
+        <item quantity="few">@string/voice_total_distance_miles_few</item>
+        <item quantity="many">@string/voice_total_distance_miles_many</item>
+        <item quantity="other">@string/voice_total_distance_miles_other</item>
+    </plurals>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 845a52c06..931367bdf 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,541 +15,437 @@ limitations under the License.
 -->
 <resources>
 
-  <!-- Activity Type -->
-  <string name="activity_type_airplane"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <!-- Activity Type -->
+    <string name="activity_type_airplane" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for airplane.">
     airplane
   </string>
-  <string name="activity_type_atv"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_atv" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for ATV (All Terrain Vehicles).">
     ATV
   </string>
-  <string name="activity_type_biking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_biking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for biking.">
     biking
   </string>
-  <string name="activity_type_blimp"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_blimp" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for blimp.">
     blimp
   </string>
-  <string name="activity_type_boat"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_boat" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for boat.">
     boat
   </string>
-  <string name="activity_type_climbing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_climbing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for climbing.">
     climbing
   </string>
-  <string name="activity_type_commercial_airplane"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_commercial_airplane" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for commercial airplane.">
     commercial airplane
   </string>
-  <string name="activity_type_cross_country_skiing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_cross_country_skiing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for cross-country skiing.">
     cross-country skiing
   </string>
-  <string name="activity_type_cycling"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_cycling" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for cycling.">
     cycling
   </string>
-  <string name="activity_type_dirt_bike"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_dirt_bike" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for dirt bike.">
     dirt bike
   </string>
-  <string name="activity_type_donkey_back_riding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_donkey_back_riding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for donkey back riding.">
     donkey back riding
   </string>
-  <string name="activity_type_driving"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_driving" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for driving.">
     driving
   </string>
-  <string name="activity_type_driving_bus"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_driving_bus" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for driving bus.">
     driving bus
   </string>
-  <string name="activity_type_driving_car"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_driving_car" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for driving car.">
     driving car
   </string>
-  <string name="activity_type_ferry"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_ferry" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for ferry.">
     ferry
   </string>
-  <string name="activity_type_frisbee"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_frisbee" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for frisbee.">
     frisbee
   </string>
-  <string name="activity_type_gliding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_gliding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for gliding.">
     gliding
   </string>
-  <string name="activity_type_hang_gliding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_hang_gliding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for hang gliding.">
     hang gliding
   </string>
-  <string name="activity_type_helicopter"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_helicopter" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for helicopter.">
     helicopter
   </string>
-  <string name="activity_type_hiking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_hiking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for hiking.">
     hiking
   </string>
-  <string name="activity_type_horse_back_riding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_horse_back_riding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for horse back riding.">
     horse back riding
   </string>
-  <string name="activity_type_hot_air_balloon"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_hot_air_balloon" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for hot air balloon.">
     hot air balloon
   </string>
-  <string name="activity_type_ice_sailing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_ice_sailing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for ice sailing.">
     ice sailing
   </string>
-  <string name="activity_type_inline_skating"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_inline_skating" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for inline skating.">
     inline skating
   </string>
-  <string name="activity_type_kayaking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_kayaking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for kayaking.">
     kayaking
   </string>
-  <string name="activity_type_kite_surfing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_kite_surfing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for kite surfing.">
     kite surfing
   </string>
-  <string name="activity_type_land_sailing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_land_sailing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for land sailing.">
     land sailing
   </string>
-  <string name="activity_type_mixed_type"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_mixed_type" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for mixed type.">
     mixed type
   </string>
-  <string name="activity_type_motor_bike"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_motor_bike" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for motor bike.">
     motor bike
   </string>
-  <string name="activity_type_motor_boating"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_motor_boating" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for motor boating.">
     motor boating
   </string>
-  <string name="activity_type_mountain_biking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_mountain_biking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for mountain biking.">
     mountain biking
   </string>
-  <string name="activity_type_off_trail_hiking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_off_trail_hiking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for off trail hiking.">
     off trail hiking
   </string>
-  <string name="activity_type_other"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_other" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for other.">
     other
   </string>
-  <string name="activity_type_paddling"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_paddling" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for paddling.">
     paddling
   </string>
-  <string name="activity_type_para_gliding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_para_gliding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for para gliding.">
     para gliding
   </string>
-  <string name="activity_type_rc_airplane"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_rc_airplane" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for RC (Remote Controlled) airplane.">
     RC airplane
   </string>
-  <string name="activity_type_rc_boat"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_rc_boat" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for RC (Remote Controlled) boat.">
     RC boat
   </string>
-  <string name="activity_type_rc_helicopter"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_rc_helicopter" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for RC (Remote Controlled) helicopter.">
     RC helicopter
   </string>
-  <string name="activity_type_riding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_riding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for riding.">
     riding
   </string>
-  <string name="activity_type_road_biking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_road_biking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for road biking.">
     road biking
   </string>
-  <string name="activity_type_roller_skiing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_roller_skiing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for roller skiing.">
     roller skiing
   </string>
-  <string name="activity_type_rowing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_rowing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for rowing.">
     rowing
   </string>
-  <string name="activity_type_running"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_running" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for running.">
     running
   </string>
-  <string name="activity_type_sailing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_sailing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for sailing.">
     sailing
   </string>
-  <string name="activity_type_seaplane"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_seaplane" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for seaplane.">
     seaplane
   </string>
-  <string name="activity_type_skate_boarding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_skate_boarding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for skate boarding.">
     skate boarding
   </string>
-  <string name="activity_type_skating"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_skating" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for skating.">
     skating
   </string>
-  <string name="activity_type_skiing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_skiing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for skiing.">
     skiing
   </string>
-  <string name="activity_type_sky_jumping"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_sky_jumping" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for sky jumping.">
     sky jumping
   </string>
-  <string name="activity_type_sled"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_sled" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for sled.">
     sled
   </string>
-  <string name="activity_type_snow_boarding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_snow_boarding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for snow boarding.">
     snow boarding
   </string>
-  <string name="activity_type_snow_shoeing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_snow_shoeing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for snow shoeing.">
     snow shoeing
   </string>
-  <string name="activity_type_speed_walking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_speed_walking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for speed walking.">
     speed walking
   </string>
-  <string name="activity_type_street_running"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_street_running" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for street running.">
     street running
   </string>
-  <string name="activity_type_surfing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_surfing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for surfing.">
     surfing
   </string>
-  <string name="activity_type_track_cycling"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_track_cycling" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for track cycling.">
     track cycling
   </string>
-  <string name="activity_type_track_running"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_track_running" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for track running.">
     track running
   </string>
-  <string name="activity_type_trail_hiking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_trail_hiking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for trail hiking.">
     trail hiking
   </string>
-  <string name="activity_type_trail_running"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_trail_running" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for trail running.">
     trail running
   </string>
-  <string name="activity_type_train"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_train" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for train.">
     train
   </string>
-  <string name="activity_type_ultimate_frisbee"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_ultimate_frisbee" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for ultimate frisbee.">
     ultimate frisbee
   </string>
-  <string name="activity_type_unknown"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_unknown" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for unknown.">
     unknown
   </string>
-  <string name="activity_type_wakeboarding"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_wakeboarding" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for wakeboarding.">
     wakeboarding
   </string>
-  <string name="activity_type_walking"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_walking" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for walking.">
     walking
   </string>
-  <string name="activity_type_water_skiing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_water_skiing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for water skiing.">
     water skiing
   </string>
-  <string name="activity_type_wind_surfing"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+    <string name="activity_type_wind_surfing" translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for wind surfing.">
     wind surfing
   </string>
 
-  <!-- Description -->
-  <string name="description_activity_type"
-    translation_description="Activity type description.
+    <!-- Description -->
+    <string name="description_activity_type" translation_description="Activity type description.
 
       %1$s activity type. E.g., 'hiking'.">
     Activity type: %1$s
   </string>
-  <string name="description_average_moving_pace_in_minute"
-    translation_description="Average moving pace description.
+    <string name="description_average_moving_pace_in_minute" translation_description="Average moving pace description.
 
       %1$s pace in minutes per kilometer
       %2$s pace in minutes per mile">
     Average moving pace: %1$s min/km (%2$s min/mi)
   </string>
-  <string name="description_average_moving_speed"
-    translation_description="Average moving speed description.
+    <string name="description_average_moving_speed" translation_description="Average moving speed description.
 
       %1$.2f speed in kilometers per hour
       %2$.1f speed in miles per hour">
     Average moving speed: %1$.2f km/h (%2$.1f mi/h)
   </string>
-  <string name="description_average_pace_in_minute"
-    translation_description="Average pace description.
+    <string name="description_average_pace_in_minute" translation_description="Average pace description.
 
       %1$s pace in minutes per kilometer
       %2$s pace in minutes per mile">
     Average pace: %1$s min/km (%2$s min/mi)
   </string>
-  <string name="description_average_speed"
-    translation_description="Average speed description.
+    <string name="description_average_speed" translation_description="Average speed description.
 
       %1$.2f speed in kilometers per hour
       %2$.1f speed in miles per hour">
     Average speed: %1$.2f km/h (%2$.1f mi/h)
   </string>
-  <string name="description_elevation_gain"
-    translation_description="Elevation gain description.
+    <string name="description_elevation_gain" translation_description="Elevation gain description.
 
       %1$d elevation in meters
       %2$d elevation in feet">
     Elevation gain: %1$d m (%2$d ft)
   </string>
-  <string name="description_elevation_imperial"
-   >
+    <string name="description_elevation_imperial">
     Elevation (ft)
   </string>
-  <string name="description_elevation_metric"
-   >
+    <string name="description_elevation_metric">
     Elevation (m)
   </string>
-  <string name="description_fastest_pace_in_minute"
-    translation_description="Fastest pace description.
+    <string name="description_fastest_pace_in_minute" translation_description="Fastest pace description.
 
       %1$s pace in minutes per kilometer
       %2$s pace in minutes per mile">
     Fastest pace: %1$s min/km (%2$s min/mi)
   </string>
-  <string name="description_location_accuracy"
-   >
+    <string name="description_location_accuracy">
     Accuracy (m)
   </string>
-  <string name="description_location_altitude"
-   >
+    <string name="description_location_altitude">
     Altitude (m)
   </string>
-  <string name="description_location_bearing"
-   >
+    <string name="description_location_bearing">
     Bearing (deg)
   </string>
-  <string name="description_location_latitude"
-   >
+    <string name="description_location_latitude">
     Latitude (deg)
   </string>
-  <string name="description_location_longitude"
-   >
+    <string name="description_location_longitude">
     Longitude (deg)
   </string>
-  <string name="description_location_speed"
-   >
+    <string name="description_location_speed">
     Speed (m/s)
   </string>
-  <string name="description_max_elevation"
-    translation_description="Max elevation description.
+    <string name="description_max_elevation" translation_description="Max elevation description.
 
       %1$d elevation in meters
       %2$d elevation in feet">
     Max elevation: %1$d m (%2$d ft)
   </string>
-  <string name="description_max_grade"
-    translation_description="Max grade description. %% is the escape sequence for the percent
+    <string name="description_max_grade" translation_description="Max grade description. %% is the escape sequence for the percent
       symbol.
 
       %1$d grade in percentage">
     Max grade: %1$d %%
   </string>
-  <string name="description_max_speed"
-    translation_description="Max speed description.
+    <string name="description_max_speed" translation_description="Max speed description.
 
       %1$.2f speed in kilometers per hour
       %2$.1f speed in miles per hour">
     Max speed: %1$.2f km/h (%2$.1f mi/h)
   </string>
-  <string name="description_min_elevation"
-    translation_description="Min elevation description.
+    <string name="description_min_elevation" translation_description="Min elevation description.
 
       %1$d elevation in meters
       %2$d elevation in feet">
     Min elevation: %1$d m (%2$d ft)
   </string>
-  <string name="description_min_grade"
-    translation_description="Min grade description. %% is the escape sequence for the percent
+    <string name="description_min_grade" translation_description="Min grade description. %% is the escape sequence for the percent
       symbol.
 
       %1$d grade in percentage">
     Min grade: %1$d %%
   </string>
-  <string name="description_moving_time"
-    translation_description="Moving time description.
+    <string name="description_moving_time" translation_description="Moving time description.
 
       %1$s time. E.g., '1:08:59'.">
     Moving time: %1$s
   </string>
-  <string name="description_pace_imperial"
-   >
+    <string name="description_pace_imperial">
     Pace (min/mi)
   </string>
-  <string name="description_pace_metric"
-   >
+    <string name="description_pace_metric">
     Pace (min/km)
   </string>
-  <string name="description_recorded_time"
-    translation_description="Recorded time description.
+    <string name="description_recorded_time" translation_description="Recorded time description.
 
       %1$s time. E.g., '2/15/2012 1:40 PM'.">
     Recorded: %1$s
   </string>
-  <string name="description_sensor_cadence"
-   >
+    <string name="description_sensor_cadence">
     Cadence (rpm)
   </string>
-  <string name="description_sensor_heart_rate"
-   >
+    <string name="description_sensor_heart_rate">
     Heart rate (bpm)
   </string>
-  <string name="description_sensor_power"
-   >
+    <string name="description_sensor_power">
     Power (W)
   </string>
-  <string name="description_speed_imperial"
-   >
+    <string name="description_speed_imperial">
     Speed (mi/hr)
   </string>
-  <string name="description_speed_metric"
-   >
+    <string name="description_speed_metric">
     Speed (km/hr)
   </string>
-  <string name="description_time"
-   >
+    <string name="description_time">
     Time
   </string>
-  <string name="description_total_distance"
-    translation_description="Total distance description.
+    <string name="description_total_distance" translation_description="Total distance description.
 
       %1$.2f distance in kilometers
       %2$.1f distance in miles">
     Total distance: %1$.2f km (%2$.1f mi)
   </string>
-  <string name="description_total_time"
-    translation_description="Total time description.
+    <string name="description_total_time" translation_description="Total time description.
 
       %1$s time. E.g., '1:08:59'.">
     Total time: %1$s
   </string>
-  <string name="description_track_point"
-   >
+    <string name="description_track_point">
     Point
   </string>
-  <string name="description_track_segment"
-   >
+    <string name="description_track_segment">
     Segment
   </string>
 
-  <!-- Eula -->
+    <!-- Eula -->
 
-  <!-- Export -->
-  <string name="export_all_option"
-    translation_description="When exporting all tracks to the external storage, the option to export
+    <!-- Export -->
+    <string name="export_all_option" translation_description="When exporting all tracks to the external storage, the option to export
       as a certain file format.
 
       %1$s the file format. E.g., 'KML'.
       %2$s the directory. E.g., '/kml'.">
     All as %1$s to %2$s
   </string>
-  <string name="export_all_title"
-   >
+    <string name="export_all_title">
     Export to external storage
   </string>
-  <string name="export_external_storage"
-   >
+    <string name="export_external_storage">
     External storage
   </string>
-  <string name="export_external_storage_error"
-    translation_description="When exporting tracks to the external storage, the error message
+    <string name="export_external_storage_error" translation_description="When exporting tracks to the external storage, the error message
       indicating that only some of the tracks are exported.
 
       %1$d the number of tracks successfully exported. E.g., '1'.
@@ -558,278 +453,225 @@ limitations under the License.
       %2$s the directory. E.g., '/kml'.">
     Exported %1$d of %2$s to %3$s
   </string>
-  <string name="export_external_storage_option"
-    translation_description="When exporting a track to the external storage, the option to export as
+    <string name="export_external_storage_option" translation_description="When exporting a track to the external storage, the option to export as
       a certain file format.
 
       %1$s the file format. E.g., 'KML'.
       %2$s the directory. E.g., '/kml'.">
     as %1$s to %2$s
   </string>
-  <string name="export_external_storage_progress_message"
-    translation_description="When exporting tracks to the external storage, the progress message.
+    <string name="export_external_storage_progress_message" translation_description="When exporting tracks to the external storage, the progress message.
 
       %1$s the directory. E.g., '/kml'.">
     Exporting to %1$s&#8230;
   </string>
-  <string name="export_external_storage_success"
-    translation_description="When exporting tracks to the external storage, the success message.
+    <string name="export_external_storage_success" translation_description="When exporting tracks to the external storage, the success message.
 
       %1$s the number of tracks. E.g., '2 tracks'.
       %2$s the directory. E.g., '/kml'.">
     Exported %1$s to %2$s
   </string>
-  <string name="export_title"
-   >
+    <string name="export_title">
     Export to&#8230;
   </string>
 
-  <!-- External Storage -->
-  <string name="external_storage_not_available"
-   >
+    <!-- External Storage -->
+    <string name="external_storage_not_available">
     External storage not available
   </string>
-  <string name="external_storage_not_writable"
-   >
+    <string name="external_storage_not_writable">
     External storage not writable
   </string>
 
-  <!-- Files -->
-  <string name="files_few"
-    translation_description="The phrase for 'few' files. This is used when the language requires
+    <!-- Files -->
+    <string name="files_few" translation_description="The phrase for 'few' files. This is used when the language requires
       special treatment of 'small' numbers. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number. The number is a small number.">
     %1$d files
   </string>
-  <string name="files_many"
-    translation_description="The phrase for 'many' files. This is used when the language requires
+    <string name="files_many" translation_description="The phrase for 'many' files. This is used when the language requires
       special treatment of 'large' numbers. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number. The number is a large number.">
     %1$d files
   </string>
-  <string name="files_one"
-    translation_description="The phrase for 1 file. This is used when the language requires special
+    <string name="files_one" translation_description="The phrase for 1 file. This is used when the language requires special
       treatment of numbers like one. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     1 file
   </string>
-  <string name="files_other"
-    translation_description="The phrase for 'other' files. This is used when the language does not
+    <string name="files_other" translation_description="The phrase for 'other' files. This is used when the language does not
       require special treatment of the given quantity (as with all numbers in Chinese). See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number.">
     %1$d files
   </string>
-  <string name="files_two"
-    translation_description="The phrase for 2 files. This is used when the language requires special
+    <string name="files_two" translation_description="The phrase for 2 files. This is used when the language requires special
       treatment of numbers like two. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     2 files
   </string>
-  <string name="files_zero"
-    translation_description="The phrase for 0 files. This is used when the language requires special
+    <string name="files_zero" translation_description="The phrase for 0 files. This is used when the language requires special
       treatment of the number 0. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     0 files
   </string>
 
-  <!-- Generic -->
-  <string name="generic_add"
-   >
+    <!-- Generic -->
+    <string name="generic_add">
     Add
   </string>
-  <string name="generic_cancel"
-   >
+    <string name="generic_cancel">
     Cancel
   </string>
-  <string name="generic_delete_all_confirm_title"
-   >
+    <string name="generic_delete_all_confirm_title">
     Delete all?
   </string>
-  <string name="generic_delete_selected_confirm_title"
-   >
+    <string name="generic_delete_selected_confirm_title">
     Delete selected?
   </string>
-  <string name="generic_description"
-   >
+    <string name="generic_description">
     Description
   </string>
-  <string name="generic_description_line"
-    translation_description="A line containing a description.
+    <string name="generic_description_line" translation_description="A line containing a description.
 
       %1$s description. E.g., 'At the top'.">
     Description: %1$s
   </string>
-  <string name="generic_error_title"
-   >
+    <string name="generic_error_title">
     Error
   </string>
-  <string name="generic_name"
-   >
+    <string name="generic_name">
     Name
   </string>
-  <string name="generic_name_line"
-    translation_description="A line containing a name.
+    <string name="generic_name_line" translation_description="A line containing a name.
 
       %1$s name. E.g., 'Track 1'.">
     Name: %1$s
   </string>
-  <string name="generic_no"
-   >
+    <string name="generic_no">
     No
   </string>
-  <string name="generic_ok"
-   >
+    <string name="generic_ok">
     OK
   </string>
-  <string name="generic_paused"
-   >
+    <string name="generic_paused">
     Paused
   </string>
-  <string name="generic_progress_title"
-   >
+    <string name="generic_progress_title">
     Please wait&#8230;
   </string>
-  <string name="generic_recording"
-   >
+    <string name="generic_recording">
     Recording&#8230;
   </string>
-  <string name="generic_save"
-   >
+    <string name="generic_save">
     Save
   </string>
-  <string name="generic_success_title"
-   >
+    <string name="generic_success_title">
     Success
   </string>
-  <string name="generic_tracks"
-   >
+    <string name="generic_tracks">
     Tracks
   </string>
-  <string name="generic_yes"
-   >
+    <string name="generic_yes">
     Yes
   </string>
 
-  <!-- Gps -->
-  <string name="gps_location_access"
-    translation_description="In Android, the location access settings to modify location settings
+    <!-- Gps -->
+    <string name="gps_location_access" translation_description="In Android, the location access settings to modify location settings
       for all applications. See Settings -> Location access.">
     &#8216;Location access&#8217;
   </string>
-  <string name="gps_disabled"
-    translation_description="In the main view, the message on the top asking the user to enable
+    <string name="gps_disabled" translation_description="In the main view, the message on the top asking the user to enable
       GPS.
 
       %1$s location settings.">
     GPS not enabled. Tap here to go to %1$s. Press the back button to return.
   </string>
-  <string name="gps_disabled_location_mode"
-    translation_description="In the main view, the message on the top asking the user to select the
+    <string name="gps_disabled_location_mode" translation_description="In the main view, the message on the top asking the user to select the
       high-accuracy location mode.
 
       %1$s location settings.">
     Select high-accuracy location mode. Tap here to go to %1$s. Press the back button to return.
   </string>
-  <string name="gps_disabled_my_location"
-    translation_description="When pressing the my location button, the message indicating that the
+    <string name="gps_disabled_my_location" translation_description="When pressing the my location button, the message indicating that the
       current location cannot be determined.
 
       %1$s location settings.">
     Current location cannot be determined. Enable more location sources at %1$s &amp; make sure the
     sky is visible. Try again later.
   </string>
-  <string name="gps_disabled_my_location_location_mode"
-    translation_description="When pressing the my location button, the message indicating that the
+    <string name="gps_disabled_my_location_location_mode" translation_description="When pressing the my location button, the message indicating that the
       current location cannot be determined.
 
       %1$s location settings.">
     Current location cannot be determined. Select the high-accuracy location mode at %1$s &amp; make
     sure the sky is visible. Try again later.
   </string>
-  <string name="gps_not_found"
-   >
+    <string name="gps_not_found">
     No GPS is found on the device
   </string>
-  <string name="gps_starting"
-   >
+    <string name="gps_starting">
     Starting GPS
   </string>
-  <string name="gps_starting_error"
-   >
+    <string name="gps_starting_error">
     Unable to start GPS
   </string>
-  <string name="gps_stopping"
-   >
+    <string name="gps_stopping">
     Stopping GPS
   </string>
-  <string name="gps_wait_for_better_signal"
-    translation_description="In the main view, the message on the top indicating My Tracks is
+    <string name="gps_wait_for_better_signal" translation_description="In the main view, the message on the top indicating My Tracks is
       waiting for a better GPS signal.">
     Waiting for a better GPS signal
   </string>
-  <string name="gps_wait_for_signal"
-    translation_description="In the main view, the message on the top indicating My Tracks is
+    <string name="gps_wait_for_signal" translation_description="In the main view, the message on the top indicating My Tracks is
       waiting for GPS signal.">
     Waiting for GPS signal
   </string>
 
-  <!-- Image -->
-  <string name="image_application"
-   >
+    <!-- Image -->
+    <string name="image_application">
     Application
   </string>
-  <string name="image_arrow"
-   >
+    <string name="image_arrow">
     Arrow
   </string>
-  <string name="image_marker"
-    translation_description="The accessibility description for a marker icon, as opposed to a track
+    <string name="image_marker" translation_description="The accessibility description for a marker icon, as opposed to a track
       icon.">
     Marker
   </string>
-  <string name="image_marker_count"
-   >
+    <string name="image_marker_count">
     Marker count
   </string>
-  <string name="image_my_location"
-   >
+    <string name="image_my_location">
     My Location
   </string>
-  <string name="image_my_tracks_logo"
-   >
+    <string name="image_my_tracks_logo">
     My Tracks logo
   </string>
-  <string name="image_pause"
-   >
+    <string name="image_pause">
     Pause
   </string>
-  <string name="image_photo_marker"
-   >
+    <string name="image_photo_marker">
     Photo marker
   </string>
-  <string name="image_record"
-   >
+    <string name="image_record">
     Record
   </string>
-  <string name="image_stop"
-   >
+    <string name="image_stop">
     Stop
   </string>
-  <string name="image_track"
-    translation_description="The accessibility description for a track icon, as opposed to a marker
+    <string name="image_track" translation_description="The accessibility description for a track icon, as opposed to a marker
       icon.">
     Track
   </string>
 
-  <!-- Import -->
-  <string name="import_error"
-    translation_description="When importing from the external storage, the error message indicating
+    <!-- Import -->
+    <string name="import_error" translation_description="When importing from the external storage, the error message indicating
       that only some of the files are imported.
 
       %1$d the number of files successfully imported. E.g., '2'.
@@ -837,1362 +679,1131 @@ limitations under the License.
       %3$s the directory. E.g., '/kml'.">
     Imported %1$d of %2$s from %3$s
   </string>
-  <string name="import_no_directory"
-    translation_description="When importing from the external storage, the error message when the
+    <string name="import_no_directory" translation_description="When importing from the external storage, the error message when the
       directory doesn't exist.
 
       %1$s the directory. E.g., '/kml'.">
     %1$s does not exist
   </string>
-  <string name="import_no_file"
-    translation_description="When importing from the external storage, the message in the result
+    <string name="import_no_file" translation_description="When importing from the external storage, the message in the result
       dialog when there is no files to import.
 
       %1$s the directory. E.g., '/kml'.">
     There were no files to import. Connect your device to your computer and place the files to
     import in %1$s.
   </string>
-  <string name="import_no_file_title"
-    translation_description="When importing from the external storage, the title in the result
+    <string name="import_no_file_title" translation_description="When importing from the external storage, the title in the result
       dialog when there is no files to import.">
     Import files
   </string>
-  <string name="import_progress_message"
-    translation_description="When importing from the external storage, the progress message.
+    <string name="import_progress_message" translation_description="When importing from the external storage, the progress message.
 
       %1$s the directory. E.g., '/kml'.">
     Importing from %1$s&#8230;
   </string>
-  <string name="import_selection_option"
-    translation_description="When importing all from external storage, the option to import all the
+    <string name="import_selection_option" translation_description="When importing all from external storage, the option to import all the
       files of a certain file format.
 
       %1$s the file format. E.g., 'KML'.
       %2$s the directory. E.g., '/kml'.">
     All %1$s from %2$s
   </string>
-  <string name="import_selection_title"
-    >
+    <string name="import_selection_title">
     Import from external storage
   </string>
-  <string name="import_success"
-    translation_description="When importing from the external storage, the success message.
+    <string name="import_success" translation_description="When importing from the external storage, the success message.
 
       %1$s the number of files. E.g., '2 files'.
       %2$s the directory. E.g., '/kml'.">
     Imported %1$s from %2$s
   </string>
 
-  <!-- Marker -->
-  <string name="marker_add_error"
-    translation_description="When adding a marker, the message indicating error due to no GPS
+    <!-- Marker -->
+    <string name="marker_add_error" translation_description="When adding a marker, the message indicating error due to no GPS
       signal.">
     Unable to insert a marker. No GPS signal. Try again.
   </string>
-  <string name="marker_add_success"
-   >
+    <string name="marker_add_success">
     A marker was inserted
   </string>
-  <string name="marker_add_canceled"
-   >
+    <string name="marker_add_canceled">
     Canceled, no marker added
   </string>
-  <string name="marker_delete_all_confirm_message"
-   >
+    <string name="marker_delete_all_confirm_message">
     All markers for this track will be permanently deleted from the device
   </string>
-  <string name="marker_delete_one_confirm_message"
-   >
+    <string name="marker_delete_one_confirm_message">
     The marker will be permanently deleted from the device
   </string>
-  <string name="marker_delete_one_confirm_title"
-   >
+    <string name="marker_delete_one_confirm_title">
     Delete marker?
   </string>
-  <string name="marker_delete_multiple_confirm_message"
-   >
+    <string name="marker_delete_multiple_confirm_message">
     The selected markers will be permanently deleted from the device
   </string>
-  <string name="marker_label_end"
-    translation_description="When inserting a marker to indicate the end of a track, the marker's
+    <string name="marker_label_end" translation_description="When inserting a marker to indicate the end of a track, the marker's
       name. E.g., 'track_name (End)'.
 
       %1$s track name. E.g., 'Grand Canyon trail'.">
     %1$s (End)
   </string>
-  <string name="marker_label_start"
-    translation_description="When inserting a marker to indicate the start of a track, the marker's
+    <string name="marker_label_start" translation_description="When inserting a marker to indicate the start of a track, the marker's
       name. E.g., 'track_name (Start)'.
 
       %1$s track name. E.g., 'Grand Canyon trail'.">
     %1$s (Start)
   </string>
-  <string name="marker_name_format"
-    translation_description="When adding a marker, the string format for the default name.
+    <string name="marker_name_format" translation_description="When adding a marker, the string format for the default name.
 
       %1$d number. E.g., '1'.">
     Marker %1$d
   </string>
-  <string name="marker_split_name_format"
-    translation_description="When adding a split marker, the string format for the default name.
+    <string name="marker_split_name_format" translation_description="When adding a split marker, the string format for the default name.
 
       %1$d number. E.g., '1'.">
     Split %1$d
   </string>
-  <string name="marker_title"
-    translation_description="The title of the marker detail page.
+    <string name="marker_title" translation_description="The title of the marker detail page.
 
       %1$d position. E.g., '1'.
       %1$d total. E.g., '5'.">
     %1$d of %2$d
   </string>
 
-  <!-- Marker Detail -->
-  <string name="marker_detail_statistics_title"
-    translation_description="In the marker detail page, the title for the statistics section
+    <!-- Marker Detail -->
+    <string name="marker_detail_statistics_title" translation_description="In the marker detail page, the title for the statistics section
       indicating that the data below are since the last split marker.">
     Since last split marker:
   </string>
 
-  <!-- Marker Edit -->
-  <string name="marker_edit_marker_type"
-    translation_description="In the marker edit page, the label for the marker type, including an
+    <!-- Marker Edit -->
+    <string name="marker_edit_marker_type" translation_description="In the marker edit page, the label for the marker type, including an
       example.">
     Marker type (e.g. waterfall)
   </string>
-  <string name="marker_edit_marker_type_hint"
-    translation_description="In the marker edit page, the hint in the marker type text field when it
+    <string name="marker_edit_marker_type_hint" translation_description="In the marker edit page, the hint in the marker type text field when it
       is empty.">
     Marker type
   </string>
 
-  <!-- Marker List -->
-  <string name="marker_list_empty_message"
-   >
+    <!-- Marker List -->
+    <string name="marker_list_empty_message">
     You don\'t have any markers
   </string>
 
-  <!-- Menu -->
-  <string name="menu_aggregated_statistics"
-    translation_description="In the menu, to go to the aggregated statistics page.
+    <!-- Menu -->
+    <string name="menu_aggregated_statistics" translation_description="In the menu, to go to the aggregated statistics page.
 
       Character limit: ~20 (1 line)">
     Aggregated stats
   </string>
-  <string name="menu_delete"
-    translation_description="In the menu, to delete a track or a marker.
+    <string name="menu_delete" translation_description="In the menu, to delete a track or a marker.
 
       Character limit: ~20 (1 line)">
     Delete
   </string>
-  <string name="menu_delete_all"
-    translation_description="In the menu, to delete all the tracks.
+    <string name="menu_delete_all" translation_description="In the menu, to delete all the tracks.
 
       Character limit: ~20 (1 line)">
     Delete all
   </string>
-  <string name="menu_edit"
-    translation_description="In the menu, to edit a track or a marker.
+    <string name="menu_edit" translation_description="In the menu, to edit a track or a marker.
 
       Character limit: ~20 (1 line)">
     Edit
   </string>
-  <string name="menu_export"
-    translation_description="In the menu, to export a track.
+    <string name="menu_export" translation_description="In the menu, to export a track.
 
       Character limit: ~20 (1 line)">
     Export
   </string>
-  <string name="menu_export_all"
-    translation_description="In the menu, to export all tracks.
+    <string name="menu_export_all" translation_description="In the menu, to export all tracks.
 
       Character limit: ~20 (1 line)">
     Export all
   </string>
-  <string name="menu_feedback"
-    translation_description="In the menu, to enter feedback.
+    <string name="menu_feedback" translation_description="In the menu, to enter feedback.
 
       Character limit: ~20 (1 line)">
     Feedback
   </string>
-  <string name="menu_help"
-    translation_description="In the menu, to go to the help page.
+    <string name="menu_help" translation_description="In the menu, to go to the help page.
 
       Character limit: ~20 (1 line)">
     Help
   </string>
-  <string name="menu_help_feedback"
-    translation_description="In the menu, to go to the help and feedback page.
+    <string name="menu_help_feedback" translation_description="In the menu, to go to the help and feedback page.
 
       Character limit: ~20 (1 line)">
     Help &amp; feedback
   </string>
-  <string name="menu_help_forum"
-    translation_description="In the menu, to go to the help forum.
+    <string name="menu_help_forum" translation_description="In the menu, to go to the help forum.
 
       Character limit: ~20 (1 line)">
     Help forum
   </string>
-  <string name="menu_import_all"
-    translation_description="In the menu, to import all the tracks from the external storage.
+    <string name="menu_import_all" translation_description="In the menu, to import all the tracks from the external storage.
 
       Character limit: ~20 (1 line)">
     Import all
   </string>
-  <string name="menu_insert_marker"
-    translation_description="In the menu, to insert a marker.
+    <string name="menu_insert_marker" translation_description="In the menu, to insert a marker.
 
       Character limit: ~20 (1 line)">
     Insert marker
   </string>
-  <string name="menu_insert_photo"
-    translation_description="In the menu, to insert a photo.
+    <string name="menu_insert_photo" translation_description="In the menu, to insert a photo.
 
       Character limit: ~20 (1 line)">
     Insert photo
   </string>
-  <string name="menu_map"
-    translation_description="In the menu, under the map layer option, the submenu to display normal
+    <string name="menu_map" translation_description="In the menu, under the map layer option, the submenu to display normal
       map.
 
       Character limit: ~20 (1 line)">
     Map
   </string>
-  <string name="menu_markers"
-    translation_description="In the menu, to show a list of markers for the current track.
+    <string name="menu_markers" translation_description="In the menu, to show a list of markers for the current track.
 
       Character limit: ~20 (1 line)">
     Markers
   </string>
-  <string name="menu_play"
-    translation_description="In the menu, to play a track.
+    <string name="menu_play" translation_description="In the menu, to play a track.
 
       Character limit: ~20 (1 line)">
     Play
   </string>
-  <string name="menu_search"
-    translation_description="In the menu, to start a textual search for tracks or markers.
+    <string name="menu_search" translation_description="In the menu, to start a textual search for tracks or markers.
 
       Character limit: ~20 (1 line)">
     Search
   </string>
-  <string name="menu_select_all"
-    translation_description="In the menu, to select all the items.
+    <string name="menu_select_all" translation_description="In the menu, to select all the items.
 
       Character limit: ~20 (1 line)">
     Select all
   </string>
-  <string name="menu_sensor_state"
-    translation_description="In the menu, to go to the sensor state page.
+    <string name="menu_sensor_state" translation_description="In the menu, to go to the sensor state page.
 
       Character limit: ~20 (1 line)">
     Sensor state
   </string>
-  <string name="menu_settings"
-    translation_description="In the menu, to go to the settings page.
+    <string name="menu_settings" translation_description="In the menu, to go to the settings page.
 
       Character limit: ~20 (1 line)">
     Settings
   </string>
-  <string name="menu_share"
-    translation_description="In the menu, to share a track.
+    <string name="menu_share" translation_description="In the menu, to share a track.
 
       Character limit: ~20 (1 line)">
     Share
   </string>
-  <string name="menu_show_on_map"
-    translation_description="In the menu, to show a track or a marker on the map.
+    <string name="menu_show_on_map" translation_description="In the menu, to show a track or a marker on the map.
 
       Character limit: ~20 (1 line)">
     Show on map
   </string>
-  <string name="menu_split_frequency"
-    translation_description="In the menu, to configure the split frequency, how frequent to insert a
+    <string name="menu_split_frequency" translation_description="In the menu, to configure the split frequency, how frequent to insert a
       split marker.
 
       Character limit: ~20 (1 line)">
     Split frequency
   </string>
-  <string name="menu_start_gps"
-    translation_description="In the menu, to start the GPS receiver on the device.
+    <string name="menu_start_gps" translation_description="In the menu, to start the GPS receiver on the device.
 
       Character limit: ~20 (1 line)">
     Start GPS
   </string>
-  <string name="menu_stop_gps"
-    translation_description="In the menu, to stop the GPS receiver on the device.
+    <string name="menu_stop_gps" translation_description="In the menu, to stop the GPS receiver on the device.
 
       Character limit: ~20 (1 line)">
     Stop GPS
   </string>
-  <string name="menu_view_photo"
-    translation_description="In the menu, to view a photo.
+    <string name="menu_view_photo" translation_description="In the menu, to view a photo.
 
       Character limit: ~20 (1 line)">
     View photo
   </string>
-  <string name="menu_voice_frequency"
-    translation_description="In the menu, to configure the voice frequency, how frequent to announce
+    <string name="menu_voice_frequency" translation_description="In the menu, to configure the voice frequency, how frequent to announce
       status.
 
       Character limit: ~20 (1 line)">
     Voice frequency
   </string>
 
-  <!-- My Tracks -->
-  <string name="app_name"
-   >
+    <!-- My Tracks -->
+    <string name="app_name">
       My Tracks
   </string>
-  <string name="recording_service"
-    translation_description="When viewing the 'Running services' on Android, the name of the My
+    <string name="recording_service" translation_description="When viewing the 'Running services' on Android, the name of the My
       Tracks service that is recording a track in the background.
 
       Character limit: ~23 (1 line)">
     Recording service
   </string>
 
-  <!-- Permission -->
-  <string name="permission_gps_failed">
+    <!-- Permission -->
+    <string name="permission_gps_failed">
     My Tracks requires permission to use GPS.
   </string>
 
-  <!-- Search -->
-  <string name="search_global_description"
-    translation_description="Description of what is searched in My Tracks, to be displayed in the
+    <!-- Search -->
+    <string name="search_global_description" translation_description="Description of what is searched in My Tracks, to be displayed in the
       global system search settings.">
     Tracks and markers
   </string>
-  <string name="search_list_empty_message"
-   >
+    <string name="search_list_empty_message">
     No tracks or markers matched your search
   </string>
-  <string name="search_list_marker_track_location"
-    translation_description="For a marker returned in the search result, the text field indicating
+    <string name="search_list_marker_track_location" translation_description="For a marker returned in the search result, the text field indicating
       the track that the marker belongs to.
 
       %1$s track name. E.g., 'Grand Canyon trail'.">
     In track &#8216;%1$s&#8217;.
   </string>
-  <string name="search_voice_prompt"
-    translation_description="Prompt shown when the user activates voice search, asking him to speak
+    <string name="search_voice_prompt" translation_description="Prompt shown when the user activates voice search, asking him to speak
       what will be searched for.">
     Speak the name of a track or marker
   </string>
-  <!-- Sensor State -->
-  <string name="sensor_state_battery"
-    translation_description="In the 'Sensor state' page, the label for the battery level on the bike
+    <!-- Sensor State -->
+    <string name="sensor_state_battery" translation_description="In the 'Sensor state' page, the label for the battery level on the bike
       sensor. E.g., 'Battery level: 50 %'.">
     Battery level
   </string>
-  <string name="sensor_state_cadence"
-    translation_description="In the 'Sensor state' page, the label for the cadence on the bike
+    <string name="sensor_state_cadence" translation_description="In the 'Sensor state' page, the label for the cadence on the bike
       sensor. Cadence is the number of revolutions of the crank per minute. E.g., 'Cadence: 80 rpm'.
 
       Character limit: ~23 (1 line)">
     Cadence
   </string>
-  <string name="sensor_state_cadence_value"
-    translation_description="In the 'Sensor state' page, the value for the 'Cadence'. Cadence is the
+    <string name="sensor_state_cadence_value" translation_description="In the 'Sensor state' page, the value for the 'Cadence'. Cadence is the
       number of revolutions of the crank per minute. E.g., 'Cadence: 80 rpm'.
 
       %1$d a number. E.g., '80'.">
     %1$d rpm
   </string>
-  <string name="sensor_state_connected"
-    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
+    <string name="sensor_state_connected" translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
       has connected.">
     Connected
   </string>
-  <string name="sensor_state_connecting"
-    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
+    <string name="sensor_state_connecting" translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
       connecting.">
     Connecting
   </string>
-  <string name="sensor_state_disconnected"
-    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
+    <string name="sensor_state_disconnected" translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
       has disconnected.">
     Disconnected
   </string>
-  <string name="sensor_state_heart_rate"
-    translation_description="In the 'Sensor state' page, the label for the heart rate from a heart
+    <string name="sensor_state_heart_rate" translation_description="In the 'Sensor state' page, the label for the heart rate from a heart
       rate sensor. E.g., 'Hear rate: 100 bpm'.
 
       Character limit: ~23 (1 line)">
     Heart rate
   </string>
-  <string name="sensor_state_heart_rate_value"
-    translation_description="In the 'Sensor state' page, the value for the 'Heart rate'. E.g.,
+    <string name="sensor_state_heart_rate_value" translation_description="In the 'Sensor state' page, the value for the 'Heart rate'. E.g.,
       'Heart rate: 100 bpm'.
 
       %1$d a number. E.g., '100'.">
     %1$d bpm
   </string>
-  <string name="sensor_state_last_sensor_time"
-    translation_description="In the 'Sensor state' page, the label for the last time the sensor has
+    <string name="sensor_state_last_sensor_time" translation_description="In the 'Sensor state' page, the label for the last time the sensor has
       sent a data. E.g., 'Last sensor time: 10:05 am'.">
     Last sensor time
   </string>
-  <string name="sensor_state_power"
-    translation_description="In the 'Sensor state' page, the label for the power from the bike
+    <string name="sensor_state_power" translation_description="In the 'Sensor state' page, the label for the power from the bike
       sensor. Power is the power output of the rider. E.g., 'Power: 50 W'.
 
       Character limit: ~23 (1 line)">
     Power
   </string>
-  <string name="sensor_state_power_value"
-    translation_description="In the 'Sensor state' page, the value for the 'Power'. Power is the
+    <string name="sensor_state_power_value" translation_description="In the 'Sensor state' page, the value for the 'Power'. Power is the
       power output of the rider. E.g., 'Power: 50 W'.
 
       %1$d a number. E.g., '50'.">
     %1$d W
   </string>
-  <string name="sensor_state_sending"
-    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
+    <string name="sensor_state_sending" translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
       sending data.">
     Sending
   </string>
 
-  <!-- Settings -->
-  <string name="settings_not_while_recording"
-    translation_description="In settings, the summary for an option that is not available during a
+    <!-- Settings -->
+    <string name="settings_not_while_recording" translation_description="In settings, the summary for an option that is not available during a
       track recording.">
     Not available while recording a track
   </string>
-  <string name="settings_show"
-    translation_description="In settings, the section label to show additional values.
+    <string name="settings_show" translation_description="In settings, the section label to show additional values.
 
       Character limit: ~26 (1 line)">
     Show
   </string>
 
-  <!-- Settings Advanced -->
-  <string name="settings_advanced"
-    translation_description="In the 'Settings' page, the 'Advanced' options.
+    <!-- Settings Advanced -->
+    <string name="settings_advanced" translation_description="In the 'Settings' page, the 'Advanced' options.
 
       Character limit: ~26 (1 line)">
     Advanced
   </string>
-  <string name="settings_advanced_photo_size_original"
-    translation_description="In the 'Advanced' settings, under the 'Photo size' option, the value to
+    <string name="settings_advanced_photo_size_original" translation_description="In the 'Advanced' settings, under the 'Photo size' option, the value to
       use the original photo size.">
     Original size
   </string>
-  <string name="settings_advanced_photo_size_summary"
-    translation_description="In the 'Advanced' settings, the summary for the 'Photo size' option.
+    <string name="settings_advanced_photo_size_summary" translation_description="In the 'Advanced' settings, the summary for the 'Photo size' option.
 
       %1$s value. E.g., '1 MB'.">
     Scale photo to %1$s for export
   </string>
-  <string name="settings_advanced_photo_size_title"
-   >
+    <string name="settings_advanced_photo_size_title">
     Photo size
   </string>
 
-  <!-- Settings Chart -->
-  <string name="settings_chart_by_distance"
-    translation_description="In the 'Chart' settings, the option to display the x axis by
+    <!-- Settings Chart -->
+    <string name="settings_chart_by_distance" translation_description="In the 'Chart' settings, the option to display the x axis by
       distance.">
     By distance
   </string>
-  <string name="settings_chart_by_time"
-   >
+    <string name="settings_chart_by_time">
     By time
   </string>
-  <string name="settings_chart_x_axis"
-    translation_description="In the 'Chart' settings, the option to change the x axis display,
+    <string name="settings_chart_x_axis" translation_description="In the 'Chart' settings, the option to change the x axis display,
       either by distance or by time.
 
       Character limit: ~23 (1 line)">
     X axis
   </string>
 
-  <!-- Settings Map -->
+    <!-- Settings Map -->
 
-  <!-- Settings Recording -->
-  <string name="settings_recording"
-    translation_description="In the 'Settings' page, the option to change the recording settings.
+    <!-- Settings Recording -->
+    <string name="settings_recording" translation_description="In the 'Settings' page, the option to change the recording settings.
 
       Character limit: ~26 (1 line)">
     Recording
   </string>
-  <string name="settings_recording_auto_resume_track_timeout_always_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
+    <string name="settings_recording_auto_resume_track_timeout_always_summary" translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
       when 'Always' is selected.">
     Always resume a recording after reboot
   </string>
-  <string name="settings_recording_auto_resume_track_timeout_never_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
+    <string name="settings_recording_auto_resume_track_timeout_never_summary" translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
       when 'Never' is selected.">
     Never resume a recording after reboot
   </string>
-  <string name="settings_recording_auto_resume_track_timeout_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
+    <string name="settings_recording_auto_resume_track_timeout_summary" translation_description="In the 'Recording' settings, the summary for the 'Auto-resume' setting
       when a time value is selected.
 
       %1$s time value. E.g., '5 min'.">
     Resume a recording after reboot if the last recorded location was within the last %1$s
   </string>
-  <string name="settings_recording_auto_resume_track_timeout_title"
-    translation_description="In the 'Recording' settings, the title to configure automatically
+    <string name="settings_recording_auto_resume_track_timeout_title" translation_description="In the 'Recording' settings, the title to configure automatically
       resuming a recording after reboot.
 
       Character limit: ~23 (1 line)">
     Auto-resume
   </string>
-  <string name="settings_recording_default_activity_title"
-    translation_description="In the 'Recording' settings, the title to configure the default
+    <string name="settings_recording_default_activity_title" translation_description="In the 'Recording' settings, the title to configure the default
       activity type for a new track. E.g., 'hiking'.
 
       Character limit: ~23 (1 line)">
     Default activity type
   </string>
-  <string name="settings_recording_location_frequency_summary"
-    translation_description="In the 'Recording' settings, the summary for how frequent a location
+    <string name="settings_recording_location_frequency_summary" translation_description="In the 'Recording' settings, the summary for how frequent a location
       should be recorded.
 
       %1$s distance or time. E.g., '5 m' or '1 s'.">
     %1$s between recorded locations
   </string>
-  <string name="settings_recording_max_recording_distance_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Max distance'
+    <string name="settings_recording_max_recording_distance_summary" translation_description="In the 'Recording' settings, the summary for the 'Max distance'
       setting.
 
       %1$s distance value. E.g., '5 m'.">
     A new segment is created if the distance between two locations is greater than %1$s
   </string>
-  <string name="settings_recording_max_recording_distance_title"
-    translation_description="In the 'Recording' settings, the title to configure the maximum
+    <string name="settings_recording_max_recording_distance_title" translation_description="In the 'Recording' settings, the title to configure the maximum
       distance between 2 locations in a segment. A new segment is created if the distance between 2
       locations is greater than this value.
 
       Character limit: ~23 (1 line)">
     Max distance
   </string>
-  <string name="settings_recording_min_recording_distance_title"
-    translation_description="In the 'Recording' settings, the title to configure the distance
+    <string name="settings_recording_min_recording_distance_title" translation_description="In the 'Recording' settings, the title to configure the distance
       between two recorded locations.
 
       Character limit: ~23 (1 line)">
     Recording distance interval
   </string>
-  <string name="settings_recording_min_recording_interval_title"
-    translation_description="In the 'Recording' settings, the title to configure the time between
+    <string name="settings_recording_min_recording_interval_title" translation_description="In the 'Recording' settings, the title to configure the time between
       two recorded locations.
 
       Character limit: ~23 (1 line)">
     Recording time interval
   </string>
-  <string name="settings_recording_min_required_accuracy_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'GPS accuracy'
+    <string name="settings_recording_min_required_accuracy_summary" translation_description="In the 'Recording' settings, the summary for the 'GPS accuracy'
       setting.
 
       %1$s distance value. E.g., '10 m'.">
     Location is ignored if its accuracy is less than %1$s
   </string>
-  <string name="settings_recording_min_required_accuracy_title"
-    translation_description="In the 'Recording' settings, the title to configure the GPS accuracy.
+    <string name="settings_recording_min_required_accuracy_title" translation_description="In the 'Recording' settings, the title to configure the GPS accuracy.
 
       Character limit: ~23 (1 line)">
     GPS accuracy
   </string>
-  <string name="settings_recording_track_name_date_iso_8601_location_option"
-    translation_description="In the 'Recording' settings, the option in the 'Default track name'
+    <string name="settings_recording_track_name_date_iso_8601_location_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use the track starting time in the ISO-8601 format and the track starting location
       as the default track name.
 
       Character limit: ~20 (1 line)">
     Date (ISO 8601) + Location
   </string>
-  <string name="settings_recording_track_name_date_iso_8601_option"
-    translation_description="In the 'Recording' settings, the option in the 'Default track name'
+    <string name="settings_recording_track_name_date_iso_8601_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use the track starting time in the ISO-8601 format as the default track name.
 
       Character limit: ~20 (1 line)">
     Date (ISO 8601)
   </string>
-  <string name="settings_recording_track_name_date_local_option"
-    translation_description="In the 'Recording' settings, the option in the 'Default track name'
+    <string name="settings_recording_track_name_date_local_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
      setting to use the track starting time in the local format as the default track name.
 
       Character limit: ~20 (1 line)">
     Date (local)
   </string>
-  <string name="settings_recording_track_name_location_option"
-    translation_description="In the 'Recording' settings, the option in the 'Default track name'
+    <string name="settings_recording_track_name_location_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use the track starting location as the default track name.
 
       Character limit: ~20 (1 line)">
     Location
   </string>
-  <string name="settings_recording_track_name_number_option"
-    translation_description="In the 'Recording' settings, the option in the 'Default track name'
+    <string name="settings_recording_track_name_number_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use number as the default track name.
 
       Character limit: ~20 (1 line)">
     Number
   </string>
-  <string name="settings_recording_track_name_title"
-    translation_description="In the 'Recording' settings, the option to configure how the default
+    <string name="settings_recording_track_name_title" translation_description="In the 'Recording' settings, the option to configure how the default
       track name is named.
 
       Character limit: ~23 (1 line)">
     Default track name
   </string>
 
-  <!-- Settings Reset -->
-  <string name="settings_reset"
-    translation_description="In the 'Backup and reset' settings, the option to reset all settings to
+    <!-- Settings Reset -->
+    <string name="settings_reset" translation_description="In the 'Backup and reset' settings, the option to reset all settings to
       the default values.
 
       Character limit: ~26 (1 line)">
     Reset
   </string>
-  <string name="settings_reset_confirm_message"
-    translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
+    <string name="settings_reset_confirm_message" translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
       the confirmation dialog message informing the user that all settings will be reverted.">
     All settings will be reverted to the default values. This will not delete any tracks on the
     device.
   </string>
-  <string name="settings_reset_confirm_title"
-    translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
+    <string name="settings_reset_confirm_title" translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
       the title of the confirmation dialog.">
     Reset now?
   </string>
-  <string name="settings_reset_done"
-    translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
+    <string name="settings_reset_done" translation_description="In the 'Backup and reset' settings, after pressing the 'Reset' option,
       the confirmation dialog informing the user that all settings have been reverted to the default
       values.">
     All settings have been reverted to the default values
   </string>
 
-  <!-- Settings Sensor -->
-  <string name="settings_sensor"
-    translation_description="In the 'Settings' page, the option to change the sensor settings.
+    <!-- Settings Sensor -->
+    <string name="settings_sensor" translation_description="In the 'Settings' page, the option to change the sensor settings.
 
       Character limit: ~26 (1 line)">
     Sensor
   </string>
-  <string name="settings_sensor_ant_reset_bike_cadence_sensor"
-    translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
+    <string name="settings_sensor_ant_reset_bike_cadence_sensor" translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
       an ANT+ bike cadence sensor. Note that ANT+ is a radio standard.
 
       Character limit: ~26 (1 line)">
     Reset bike cadence
   </string>
-  <string name="settings_sensor_ant_reset_combined_bike_sensor"
-    translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
+    <string name="settings_sensor_ant_reset_combined_bike_sensor" translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
       an ANT+ combined bike cadence and speed sensor. Note that ANT+ is a radio standard.
 
       Character limit: ~26 (1 line)">
     Reset combined bike
   </string>
-  <string name="settings_sensor_ant_reset_heart_rate_monitor"
-    translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
+    <string name="settings_sensor_ant_reset_heart_rate_monitor" translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
       an ANT+ heart rate monitor. Note that ANT+ is a radio standard.
 
       Character limit: ~26 (1 line)">
     Reset heart rate
   </string>
-  <string name="settings_sensor_ant_reset_speed_distance_monitor"
-    translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
+    <string name="settings_sensor_ant_reset_speed_distance_monitor" translation_description="In the 'Sensor' settings, under the 'ANT+' section, the option to reset
       an ANT+ stride based speed distance monitor, also known as foot pod. Note that ANT+ is a radio
       standard.
 
       Character limit: ~26 (1 line)">
     Reset foot pod
   </string>
-  <string name="settings_sensor_bluetooth"
-    translation_description="In the 'Sensor' settings, the section to configure the Bluetooth
+    <string name="settings_sensor_bluetooth" translation_description="In the 'Sensor' settings, the section to configure the Bluetooth
       settings.
 
       Character limit: ~26 (1 line)">
     Bluetooth
   </string>
-  <string name="settings_sensor_bluetooth_pairing"
-    translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the option to
+    <string name="settings_sensor_bluetooth_pairing" translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the option to
       pair with a Bluetooth sensor.
 
       Character limit: ~26 (1 line)">
     Bluetooth pairing
   </string>
-  <string name="settings_sensor_bluetooth_pairing_summary"
-    translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the summary
+    <string name="settings_sensor_bluetooth_pairing_summary" translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the summary
       for the 'Bluetooth pairing' option explaining that it will open the Android's Bluetooth
       settings to pair a sensor.">
     Open Android\'s Bluetooth settings to pair a sensor
   </string>
-  <string name="settings_sensor_bluetooth_sensor"
-    translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the picker to
+    <string name="settings_sensor_bluetooth_sensor" translation_description="In the 'Sensor' settings, under the 'Bluetooth' section, the picker to
       choose a Bluetooth sensor.
 
       Character limit: ~23 (1 line)">
     Bluetooth sensor
   </string>
-  <string name="settings_sensor_connected"
-    translation_description="A message when a sensor is connected.
+    <string name="settings_sensor_connected" translation_description="A message when a sensor is connected.
 
       %1$s sensor name. E.g., 'Polar Bluetooth'.">
    Connected to %1$s
   </string>
 
-  <!-- Settings Stats -->
-  <string name="settings_stats_coordinate"
-    translation_description="In the 'Stats settings, the option to show latitude and longitude.
+    <!-- Settings Stats -->
+    <string name="settings_stats_coordinate" translation_description="In the 'Stats settings, the option to show latitude and longitude.
 
       Character limit: ~23 (1 line)">
     Latitude/Longitude
   </string>
-  <string name="settings_stats_grade_elevation"
-    translation_description="In the 'Stats settings, the option to show grade and elevation. Grade
+    <string name="settings_stats_grade_elevation" translation_description="In the 'Stats settings, the option to show grade and elevation. Grade
       is the amount of inclination to the horizontal, also known as slope or incline.
 
       Character limit: ~23 (1 line)">
     Grade/Elevation
   </string>
-  <string name="settings_stats_rate_title"
-    translation_description="In the 'Stats' settings, the option to change the preferred rate,
+    <string name="settings_stats_rate_title" translation_description="In the 'Stats' settings, the option to change the preferred rate,
       either speed (mi/hr) or pace (min/mi).
 
       Character limit: ~23 (1 line)">
     Preferred rate
   </string>
-  <string name="settings_stats_units_imperial"
-    translation_description="In the 'Stats' settings, the option to use imperial units, with
+    <string name="settings_stats_units_imperial" translation_description="In the 'Stats' settings, the option to use imperial units, with
       examples.">
     Imperial (mi, ft)
   </string>
-  <string name="settings_stats_units_metric"
-    translation_description="In the 'Stats' settings, the option to use metric units, with
+    <string name="settings_stats_units_metric" translation_description="In the 'Stats' settings, the option to use metric units, with
       examples.">
     Metric (km, m)
   </string>
-  <string name="settings_stats_units_title"
-    translation_description="In the 'Stats' settings page, the option to change the preferred units,
+    <string name="settings_stats_units_title" translation_description="In the 'Stats' settings page, the option to change the preferred units,
       either metric (km) or imperial (mi).
 
       Character limit: ~23 (1 line)">
     Preferred units
   </string>
 
-  <!-- Share Track -->
-  <string name="share_track_emails_hint"
-   >
+    <!-- Share Track -->
+    <string name="share_track_emails_hint">
     Email addresses
   </string>
-  <string name="share_track_picker_title"
-    translation_description="When sharing a track with friends, the title on the picker to ask the
+    <string name="share_track_picker_title" translation_description="When sharing a track with friends, the title on the picker to ask the
       user to select an application.">
     Select an application
   </string>
-  <string name="share_track_share_file"
-    translation_description="After saving a track to the external storage, the button on the result
+    <string name="share_track_share_file" translation_description="After saving a track to the external storage, the button on the result
       dialog to share the saved track file with friends.">
     Share track file
   </string>
-  <string name="share_track_share_file_body"
-    translation_description="When sharing a track file with friends, the body of the message. Note
+    <string name="share_track_share_file_body" translation_description="When sharing a track file with friends, the body of the message. Note
       that \n is the new line character.
 
       %1$s track description.">
     I think you might be interested in this track.\n\n%1$s
   </string>
-  <string name="share_track_subject"
-     >
+    <string name="share_track_subject">
     I would like to share a track with you
   </string>
 
-  <!-- Stats -->
-  <string name="stats_average_moving_pace"
-   >
+    <!-- Stats -->
+    <string name="stats_average_moving_pace">
     Avg moving pace
   </string>
-  <string name="stats_average_moving_speed"
-   >
+    <string name="stats_average_moving_speed">
     Avg moving speed
   </string>
-  <string name="stats_average_pace"
-   >
+    <string name="stats_average_pace">
     Avg pace
   </string>
-  <string name="stats_average_speed"
-   >
+    <string name="stats_average_speed">
     Avg speed
   </string>
-  <string name="stats_elevation"
-    translation_description="In the 'Stats' page, the elevation.
+    <string name="stats_elevation" translation_description="In the 'Stats' page, the elevation.
 
       Character limit: ~23 (1 line)">
     Elevation
   </string>
-  <string name="stats_fastest_pace"
-   >
+    <string name="stats_fastest_pace">
     Fastest pace
   </string>
-  <string name="stats_gain"
-   >
+    <string name="stats_gain">
     Gain
   </string>
-  <string name="stats_grade"
-    translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
+    <string name="stats_grade" translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
       the horizontal, also known as slope or incline.">
     Grade
   </string>
-  <string name="stats_latitude"
-   >
+    <string name="stats_latitude">
     Latitude
   </string>
-  <string name="stats_longitude"
-   >
+    <string name="stats_longitude">
     Longitude
   </string>
-  <string name="stats_max"
-   >
+    <string name="stats_max">
     Max
   </string>
-  <string name="stats_max_speed"
-   >
+    <string name="stats_max_speed">
     Max speed
   </string>
-  <string name="stats_min"
-   >
+    <string name="stats_min">
     Min
   </string>
-  <string name="stats_moving_time"
-   >
+    <string name="stats_moving_time">
     Moving time
   </string>
-  <string name="stats_pace"
-    translation_description="In the 'Stats' page, the pace like minutes per mile.
+    <string name="stats_pace" translation_description="In the 'Stats' page, the pace like minutes per mile.
 
       Character limit: ~23 (1 line)">
     Pace
   </string>
-  <string name="stats_speed"
-    translation_description="In the 'Stats' page, the speed like miles per hour.
+    <string name="stats_speed" translation_description="In the 'Stats' page, the speed like miles per hour.
 
       Character limit: ~23 (1 line)">
     Speed
   </string>
-  <string name="stats_distance"
-   >
+    <string name="stats_distance">
     Distance
   </string>
-  <string name="stats_total_time"
-   >
+    <string name="stats_total_time">
     Total time
   </string>
 
-  <!-- Track -->
-  <string name="track_name_format"
-    translation_description="When creating a new track, the string format to name the track.
+    <!-- Track -->
+    <string name="track_name_format" translation_description="When creating a new track, the string format to name the track.
 
       %1$d track number. E.g., '1'.">
     Track %1$d
   </string>
-  <string name="track_record_notification"
-    translation_description="When recording a track, the message on the My Tracks notification
+    <string name="track_record_notification" translation_description="When recording a track, the message on the My Tracks notification
       informing the user that My Tracks is actively recording his track.">
     Recording your track&#8230;
   </string>
-  <string name="track_markers"
-    translation_description="Title indicating a particular track's markers.
+    <string name="track_markers" translation_description="Title indicating a particular track's markers.
 
       %1$s track name. E.g., 'Grand Canyon trail'.">
     %1$s Markers
   </string>
 
-  <!-- Track Delete -->
-  <string name="track_delete_one_confirm_message"
-   >
+    <!-- Track Delete -->
+    <string name="track_delete_one_confirm_message">
     The track and its markers will be permanently deleted from the device.
   </string>
-  <string name="track_delete_one_confirm_title"
-   >
+    <string name="track_delete_one_confirm_title">
     Delete track?
   </string>
-  <string name="track_delete_multiple_confirm_message"
-   >
+    <string name="track_delete_multiple_confirm_message">
     The selected tracks and their markers will be permanently deleted from the device.
   </string>
-  <string name="track_delete_progress_message"
-   >
+    <string name="track_delete_progress_message">
     Deleting&#8230;
   </string>
 
-  <!-- Track Detail -->
-  <string name="track_detail_chart_tab"
-   >
+    <!-- Track Detail -->
+    <string name="track_detail_chart_tab">
     Chart
   </string>
-  <string name="track_detail_stats_tab"
-   >
+    <string name="track_detail_stats_tab">
     Stats
   </string>
 
-  <!-- Track Edit -->
-  <string name="track_edit_activity_type"
-    translation_description="In the page to edit a track, the label for the text field to edit the
+    <!-- Track Edit -->
+    <string name="track_edit_activity_type" translation_description="In the page to edit a track, the label for the text field to edit the
       activity type, including an example.">
     Activity type (e.g. hiking)
   </string>
-  <string name="track_edit_activity_type_hint"
-    translation_description="In the page to edit a track, the hint in the 'Activity type' text field
+    <string name="track_edit_activity_type_hint" translation_description="In the page to edit a track, the hint in the 'Activity type' text field
       when it is empty.">
     Activity type
   </string>
-  <string name="track_edit_new_track_title"
-   >
+    <string name="track_edit_new_track_title">
     New Track
   </string>
 
-  <!-- Track List -->
-  <string name="track_list_empty_message"
-    translation_description="When the track list is empty, the message informing the user to click
+    <!-- Track List -->
+    <string name="track_list_empty_message" translation_description="When the track list is empty, the message informing the user to click
       on the record button to start a new recording">
     Start recording your next adventure here
   </string>
-  <string name="track_list_record_error"
-    translation_description="When starting a new track recording, the error message informing the
+    <string name="track_list_record_error" translation_description="When starting a new track recording, the error message informing the
       user not able to record and asking the user to try again.">
     Unable to start recording. No GPS signal. Try again.
   </string>
-  <string name="track_list_record_success"
-    translation_description="When starting a new track recording, a status message indicating
+    <string name="track_list_record_success" translation_description="When starting a new track recording, a status message indicating
       success.">
     Now recording a new track
   </string>
 
-  <!-- Track Widget -->
-  <string name="track_widget_config_title"
-   >
+    <!-- Track Widget -->
+    <string name="track_widget_config_title">
     Configure Widget Items
   </string>
 
-  <!-- Tracks -->
-  <string name="tracks_few"
-    translation_description="The phrase for 'few' tracks. This is used when the language requires
+    <!-- Tracks -->
+    <string name="tracks_few" translation_description="The phrase for 'few' tracks. This is used when the language requires
       special treatment of 'small' numbers. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number. The number is a small number.">
     %1$d tracks
   </string>
-  <string name="tracks_many"
-    translation_description="The phrase for 'many' tracks. This is used when the language requires
+    <string name="tracks_many" translation_description="The phrase for 'many' tracks. This is used when the language requires
       special treatment of 'large' numbers. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number. The number is a large number.">
     %1$d tracks
   </string>
-  <string name="tracks_one"
-    translation_description="The phrase for 1 track. This is used when the language requires special
+    <string name="tracks_one" translation_description="The phrase for 1 track. This is used when the language requires special
       treatment of numbers like one. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     1 track
   </string>
-  <string name="tracks_other"
-    translation_description="The phrase for 'other' tracks. This is used when the language does not
+    <string name="tracks_other" translation_description="The phrase for 'other' tracks. This is used when the language does not
       require special treatment of the given quantity (as with all numbers in Chinese). See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
       %1$d an integer number.">
     %1$d tracks
   </string>
-  <string name="tracks_two"
-    translation_description="The phrase for 2 tracks. This is used when the language requires
+    <string name="tracks_two" translation_description="The phrase for 2 tracks. This is used when the language requires
       special treatment of numbers like two. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     2 tracks
   </string>
-  <string name="tracks_zero"
-    translation_description="The phrase for 0 tracks. This is used when the language requires
+    <string name="tracks_zero" translation_description="The phrase for 0 tracks. This is used when the language requires
       special treatment of the number 0. See
       http://developer.android.com/guide/topics/resources/string-resource.html#Plurals">
     0 tracks
   </string>
 
-  <!-- Unit -->
-  <string name="unit_feet"
-   >
+    <!-- Unit -->
+    <string name="unit_feet">
     ft
   </string>
-  <string name="unit_kilometer"
-   >
+    <string name="unit_kilometer">
     km
   </string>
-  <string name="unit_kilometer_per_hour"
-   >
+    <string name="unit_kilometer_per_hour">
     km/h
   </string>
-  <string name="unit_meter"
-   >
+    <string name="unit_meter">
     m
   </string>
-  <string name="unit_mile"
-   >
+    <string name="unit_mile">
     mi
   </string>
-  <string name="unit_mile_per_hour"
-   >
+    <string name="unit_mile_per_hour">
     mi/h
   </string>
-  <string name="unit_minute_per_kilometer"
-   >
+    <string name="unit_minute_per_kilometer">
     min/km
   </string>
-  <string name="unit_minute_per_mile"
-   >
+    <string name="unit_minute_per_mile">
     min/mi
   </string>
 
-  <!-- Value -->
-  <string name="value_adapt_accuracy"
-   >
+    <!-- Value -->
+    <string name="value_adapt_accuracy">
     Adapt for accuracy
   </string>
-  <string name="value_adapt_battery_life"
-   >
+    <string name="value_adapt_battery_life">
     Adapt for battery life
   </string>
-  <string name="value_always"
-   >
+    <string name="value_always">
     Always
   </string>
-  <string name="value_float_feet"
-    translation_description="Display a float value in feet (ft).
+    <string name="value_float_feet" translation_description="Display a float value in feet (ft).
 
       %1$.2f a float number. E.g., '2.22'.">
     %1$.2f ft
   </string>
-  <string name="value_float_kilometer"
-    translation_description="Display a float value in kilometers (km).
+    <string name="value_float_kilometer" translation_description="Display a float value in kilometers (km).
 
       %1$.2f a float number. E.g., '2.22'.">
     %1$.2f km
   </string>
-  <string name="value_float_meter"
-    translation_description="Display a float value in meters (m).
+    <string name="value_float_meter" translation_description="Display a float value in meters (m).
 
       %1$.2f a float number. E.g., '2.22'.">
     %1$.2f m
   </string>
-  <string name="value_float_mile"
-    translation_description="Display a float value in miles (mi).
+    <string name="value_float_mile" translation_description="Display a float value in miles (mi).
 
       %1$.2f a float number. E.g., '2.22'.">
     %1$.2f mi
   </string>
-  <string name="value_float_mile_poor_gps"
-    translation_description="In a setting picker, the string format to display a float value in
+    <string name="value_float_mile_poor_gps" translation_description="In a setting picker, the string format to display a float value in
       miles (mi), recommended when having poor GPS signal.
 
       %1$.1f a float number. E.g., '2.2'.">
     %1$.1f mi (poor GPS)
   </string>
-  <string name="value_integer_feet"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_feet" translation_description="In a setting picker, the string format to display an integer value in
       feet (ft).
 
       %1$d an integer value. E.g., '2'.">
     %1$d ft
   </string>
-  <string name="value_integer_feet_excellent_gps"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_feet_excellent_gps" translation_description="In a setting picker, the string format to display an integer value in
       feet (ft), recommended when having excellent GPS signal.
 
       %1$d an integer value. E.g., '2'.">
     %1$d ft (excellent GPS)
   </string>
-  <string name="value_integer_feet_recommended"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_feet_recommended" translation_description="In a setting picker, the string format to display an integer value in
       feet (ft) and that the value is the recommended value.
 
       %1$d an integer value. E.g., '2'.">
     %1$d ft (recommended)
   </string>
-  <string name="value_integer_kilobyte"
-    translation_description="Display an integer value in kilobyte (kB).
+    <string name="value_integer_kilobyte" translation_description="Display an integer value in kilobyte (kB).
 
       %1$d an integer value. E.g., '2'.">
     %1$d kB
   </string>
-  <string name="value_integer_kilometer"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_kilometer" translation_description="In a setting picker, the string format to display an integer value in
       kilometers (km).
 
       %1$d an integer value. E.g., '2'.">
     %1$d km
   </string>
-  <string name="value_integer_kilometer_hour"
-    translation_description="Display an integer value in kilometers per hour (km/h).
+    <string name="value_integer_kilometer_hour" translation_description="Display an integer value in kilometers per hour (km/h).
 
       %1$d an integer value. E.g., '2'.">
     %1$d km/h
   </string>
-  <string name="value_integer_megabyte"
-    translation_description="Display an integer value in megabyte (MB).
+    <string name="value_integer_megabyte" translation_description="Display an integer value in megabyte (MB).
 
       %1$d an integer value. E.g., '2'.">
     %1$d MB
   </string>
-  <string name="value_integer_meter"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_meter" translation_description="In a setting picker, the string format to display an integer value in
       meters (m).
 
       %1$d an integer value. E.g., '2'.">
     %1$d m
   </string>
-  <string name="value_integer_meter_excellent_gps"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_meter_excellent_gps" translation_description="In a setting picker, the string format to display an integer value in
       meters (m), recommended when having excellent GPS signal.
 
       %1$d an integer value. E.g., '2'.">
     %1$d m (excellent GPS)
   </string>
-  <string name="value_integer_meter_poor_gps"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_meter_poor_gps" translation_description="In a setting picker, the string format to display an integer value in
       meters (m), recommended when having poor GPS signal.
 
       %1$d an integer value. E.g., '2'.">
     %1$d m (poor GPS)
   </string>
-  <string name="value_integer_meter_recommended"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_meter_recommended" translation_description="In a setting picker, the string format to display an integer value in
       meters (m) and that the value is the recommended value.
 
       %1$d an integer value. E.g., '2'.">
     %1$d m (recommended)
   </string>
-  <string name="value_integer_mile"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_mile" translation_description="In a setting picker, the string format to display an integer value in
       miles (mi).
 
       %1$d an integer value. E.g., '2'.">
     %1$d mi
   </string>
-  <string name="value_integer_mile_hour"
-    translation_description="Display an integer value in miles per hour (mi/h).
+    <string name="value_integer_mile_hour" translation_description="Display an integer value in miles per hour (mi/h).
 
       %1$d an integer value. E.g., '2'.">
     %1$d mi/h
   </string>
-  <string name="value_integer_minute"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_minute" translation_description="In a setting picker, the string format to display an integer value in
       minutes (min).
 
       %1$d an integer value. E.g., '2'.">
     %1$d min
   </string>
-  <string name="value_integer_percent"
-     translation_description="To display a value in percent like 2 %. %% is the escape sequence for
+    <string name="value_integer_percent" translation_description="To display a value in percent like 2 %. %% is the escape sequence for
       the percent symbol.
 
       %1$d an integer value. E.g., '2'.">
     %1$d %%
   </string>
-  <string name="value_integer_second"
-    translation_description="In a setting picker, the string format to display an integer value in
+    <string name="value_integer_second" translation_description="In a setting picker, the string format to display an integer value in
       seconds (s).
 
       %1$d an integer value. E.g., '2'.">
     %1$d s
   </string>
-  <string name="value_never"
-   >
+    <string name="value_never">
     Never
   </string>
-  <string name="value_none"
-   >
+    <string name="value_none">
     None
   </string>
-  <string name="value_off"
-   >
+    <string name="value_off">
     Off
   </string>
-  <string name="value_smallest"
-   >
+    <string name="value_smallest">
     Smallest
   </string>
-  <string name="value_smallest_recommended"
-    translation_description="In a setting picker, the value to use the smallest value, also the
+    <string name="value_smallest_recommended" translation_description="In a setting picker, the value to use the smallest value, also the
       recommended value.">
     Smallest (recommended)
   </string>
 
-  <!-- Voice -->
-  <string name="voice_hours_few"
-    translation_description="For voice announcement, to say 'few' hours.
+    <!-- Voice -->
+    <string name="voice_hours_few" translation_description="For voice announcement, to say 'few' hours.
 
       %1$d an integer number. The number is a small number.">
     %1$d hours
   </string>
-  <string name="voice_hours_many"
-    translation_description="For voice announcement, to say 'many' hours.
+    <string name="voice_hours_many" translation_description="For voice announcement, to say 'many' hours.
 
       %1$d an integer number. The number is a large number.">
     %1$d hours
   </string>
-  <string name="voice_hours_one"
-   >
+    <string name="voice_hours_one">
     1 hour
   </string>
-  <string name="voice_hours_other"
-    translation_description="For voice announcement, to say 'other' hours, 'other' means for cases
+    <string name="voice_hours_other" translation_description="For voice announcement, to say 'other' hours, 'other' means for cases
       that the language does not require special treatment of the given quantity.
 
       %1$d an integer number.">
     %1$d hours
   </string>
-  <string name="voice_hours_two"
-   >
+    <string name="voice_hours_two">
     2 hours
   </string>
-  <string name="voice_hours_zero"
-   >
+    <string name="voice_hours_zero">
     0 hours
   </string>
-  <string name="voice_minutes_few"
-    translation_description="For voice announcement, to say 'few' minutes.
+    <string name="voice_minutes_few" translation_description="For voice announcement, to say 'few' minutes.
 
       %1$d an integer number. The number is a small number.">
     %1$d minutes
   </string>
-  <string name="voice_minutes_many"
-    translation_description="For voice announcement, to say 'many' minutes.
+    <string name="voice_minutes_many" translation_description="For voice announcement, to say 'many' minutes.
 
       %1$d an integer number. The number is a large number.">
     %1$d minutes
   </string>
-  <string name="voice_minutes_one"
-   >
+    <string name="voice_minutes_one">
     1 minute
   </string>
-  <string name="voice_minutes_other"
-    translation_description="For voice announcement, to say 'other' minutes, 'other' means for cases
+    <string name="voice_minutes_other" translation_description="For voice announcement, to say 'other' minutes, 'other' means for cases
       that the language does not require special treatment of the given quantity.
 
       %1$d an integer number.">
     %1$d minutes
   </string>
-  <string name="voice_minutes_two"
-   >
+    <string name="voice_minutes_two">
     2 minutes
   </string>
-  <string name="voice_minutes_zero"
-   >
+    <string name="voice_minutes_zero">
     0 minutes
   </string>
-  <string name="voice_pace_per_kilometer"
-    translation_description="For voice announcement, to say 'time per kilometer' like 'two hours 2
+    <string name="voice_pace_per_kilometer" translation_description="For voice announcement, to say 'time per kilometer' like 'two hours 2
       minutes per kilometer'.
 
       %1$s time. E.g., 'two hours 2 minutes'.">
     %1$s per kilometer
   </string>
-  <string name="voice_pace_per_mile"
-    translation_description="For voice announcement, to say 'time per mile' like 'two hours 2
+    <string name="voice_pace_per_mile" translation_description="For voice announcement, to say 'time per mile' like 'two hours 2
       minutes per mile'.
 
       %1$s time. E.g., 'two hours 2 minutes'.">
     %1$s per mile
   </string>
-  <string name="voice_seconds_few"
-    translation_description="For voice announcement, to say 'few' seconds.
+    <string name="voice_seconds_few" translation_description="For voice announcement, to say 'few' seconds.
 
       %1$d an integer number. The number is a small number.">
     %1$d seconds
   </string>
-  <string name="voice_seconds_many"
-    translation_description="For voice announcement, to say 'many' seconds.
+    <string name="voice_seconds_many" translation_description="For voice announcement, to say 'many' seconds.
 
       %1$d an integer number. The number is a large number.">
     %1$d seconds
   </string>
-  <string name="voice_seconds_one"
-   >
+    <string name="voice_seconds_one">
     1 second
   </string>
-  <string name="voice_seconds_other"
-    translation_description="For voice announcement, to say 'other' seconds, 'other' means for cases
+    <string name="voice_seconds_other" translation_description="For voice announcement, to say 'other' seconds, 'other' means for cases
       that the language does not require special treatment of the given quantity.
 
       %1$d an integer number.">
     %1$d seconds
   </string>
-  <string name="voice_seconds_two"
-   >
+    <string name="voice_seconds_two">
     2 seconds
   </string>
-  <string name="voice_seconds_zero"
-   >
+    <string name="voice_seconds_zero">
     0 seconds
   </string>
-  <string name="voice_speed_kilometers_per_hour_few"
-    translation_description="For voice announcement, to say 'few' kilometers per hour.
+    <string name="voice_speed_kilometers_per_hour_few" translation_description="For voice announcement, to say 'few' kilometers per hour.
 
       %1$.1f a float number. The number is a small number.">
     %1$.1f kilometers per hour
   </string>
-  <string name="voice_speed_kilometers_per_hour_many"
-    translation_description="For voice announcement, to say 'many' kilometers per hour.
+    <string name="voice_speed_kilometers_per_hour_many" translation_description="For voice announcement, to say 'many' kilometers per hour.
 
       %1$.1f a float number. The number is a large number.">
     %1$.1f kilometers per hour
   </string>
-  <string name="voice_speed_kilometers_per_hour_one"
-   >
+    <string name="voice_speed_kilometers_per_hour_one">
     1 kilometer per hour
   </string>
-  <string name="voice_speed_kilometers_per_hour_other"
-    translation_description="For voice announcement, to say 'other' kilometers per hour, 'other'
+    <string name="voice_speed_kilometers_per_hour_other" translation_description="For voice announcement, to say 'other' kilometers per hour, 'other'
       means for cases that the language does not require special treatment of the given quantity.
 
       %1$.1f a float number.">
     %1$.1f kilometers per hour
   </string>
-  <string name="voice_speed_kilometers_per_hour_two"
-   >
+    <string name="voice_speed_kilometers_per_hour_two">
     2 kilometers per hour
   </string>
-  <string name="voice_speed_kilometers_per_hour_zero"
-   >
+    <string name="voice_speed_kilometers_per_hour_zero">
     0 kilometers per hour
   </string>
-  <string name="voice_speed_miles_per_hour_few"
-    translation_description="For voice announcement, to say 'few' miles per hour.
+    <string name="voice_speed_miles_per_hour_few" translation_description="For voice announcement, to say 'few' miles per hour.
 
       %1$.1f a float number. The number is a small number.">
     %1$.1f miles per hour
   </string>
-  <string name="voice_speed_miles_per_hour_many"
-    translation_description="For voice announcement, to say 'many' miles per hour.
+    <string name="voice_speed_miles_per_hour_many" translation_description="For voice announcement, to say 'many' miles per hour.
 
       %1$.1f a float number. The number is a large number.">
     %1$.1f miles per hour
   </string>
-  <string name="voice_speed_miles_per_hour_one"
-   >
+    <string name="voice_speed_miles_per_hour_one">
     1 mile per hour
   </string>
-  <string name="voice_speed_miles_per_hour_other"
-    translation_description="For voice announcement, to say 'other' miles per hour, 'other' means
+    <string name="voice_speed_miles_per_hour_other" translation_description="For voice announcement, to say 'other' miles per hour, 'other' means
       for cases that the language does not require special treatment of the given quantity.
 
       %1$.1f a float number.">
     %1$.1f miles per hour
   </string>
-  <string name="voice_speed_miles_per_hour_two"
-   >
+    <string name="voice_speed_miles_per_hour_two">
     2 miles per hour
   </string>
-  <string name="voice_speed_miles_per_hour_zero"
-   >
+    <string name="voice_speed_miles_per_hour_zero">
     0 miles per hour
   </string>
-  <string name="voice_template"
-    translation_description="For the voice announcement, the template to make an announcement.
+    <string name="voice_template" translation_description="For the voice announcement, the template to make an announcement.
 
       %1$s distance string. E.g., '2.2 kilometers'.
       %2$s time string. E.g., '20 minutes 1 second'.
@@ -2200,328 +1811,264 @@ limitations under the License.
       '30 minutes 1 second per kilometer' for pace.">
     My Tracks %1$s in %2$s at %3$s
   </string>
-  <string name="voice_total_distance_kilometers_few"
-    translation_description="For voice announcement, to say total distance 'few' kilometers.
+    <string name="voice_total_distance_kilometers_few" translation_description="For voice announcement, to say total distance 'few' kilometers.
 
       %1$.2f a float number. The number is a small number.">
     total distance %1$.2f kilometers
   </string>
-  <string name="voice_total_distance_kilometers_many"
-    translation_description="For voice announcement, to say total distance 'many' kilometers.
+    <string name="voice_total_distance_kilometers_many" translation_description="For voice announcement, to say total distance 'many' kilometers.
 
       %1$.2f a float number. The number is a large number.">
     total distance %1$.2f kilometers
   </string>
-  <string name="voice_total_distance_kilometers_one"
-   >
+    <string name="voice_total_distance_kilometers_one">
     total distance 1 kilometer
   </string>
-  <string name="voice_total_distance_kilometers_other"
-    translation_description="For voice announcement, to say total distance 'other' kilometers,
+    <string name="voice_total_distance_kilometers_other" translation_description="For voice announcement, to say total distance 'other' kilometers,
       'other' means for cases that the language does not require special treatment of the given
       quantity.
 
       %1$.2f a float number.">
     total distance %1$.2f kilometers
   </string>
-  <string name="voice_total_distance_kilometers_two"
-   >
+    <string name="voice_total_distance_kilometers_two">
     total distance 2 kilometers
   </string>
-  <string name="voice_total_distance_kilometers_zero"
-   >
+    <string name="voice_total_distance_kilometers_zero">
     total distance 0 kilometers
   </string>
-  <string name="voice_total_distance_miles_few"
-    translation_description="For voice announcement, to say total distance 'few' miles.
+    <string name="voice_total_distance_miles_few" translation_description="For voice announcement, to say total distance 'few' miles.
 
       %1$.2f a float number. The number is a small number.">
     total distance %1$.2f miles
   </string>
-  <string name="voice_total_distance_miles_many"
-    translation_description="For voice announcement, to say total distance 'many' miles.
+    <string name="voice_total_distance_miles_many" translation_description="For voice announcement, to say total distance 'many' miles.
 
       %1$.2f a float number. The number is a large number.">
     total distance %1$.2f miles
   </string>
-  <string name="voice_total_distance_miles_one"
-   >
+    <string name="voice_total_distance_miles_one">
     total distance 1 mile
   </string>
-  <string name="voice_total_distance_miles_other"
-    translation_description="For voice announcement, to say total distance 'other' miles, 'other'
+    <string name="voice_total_distance_miles_other" translation_description="For voice announcement, to say total distance 'other' miles, 'other'
       means for cases that the language does not require special treatment of the given quantity.
 
       %1$.2f a float number.">
     total distance %1$.2f miles
   </string>
-  <string name="voice_total_distance_miles_two"
-   >
+    <string name="voice_total_distance_miles_two">
     total distance 2 miles
   </string>
-  <string name="voice_total_distance_miles_zero"
-   >
+    <string name="voice_total_distance_miles_zero">
     total distance 0 miles
   </string>
-  <string name="voice_total_distance_zero"
-    translation_description="For the voice announcement, the announcement when the current track's
+    <string name="voice_total_distance_zero" translation_description="For the voice announcement, the announcement when the current track's
       total distance is zero.">
     My Tracks total distance zero.
   </string>
 
-  <!-- Waypoint Type -->
-  <string name="waypoint_type_atm"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <!-- Waypoint Type -->
+    <string name="waypoint_type_atm" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for an ATM.">
     ATM
   </string>
-  <string name="waypoint_type_bank"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_bank" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a bank.">
     bank
   </string>
-  <string name="waypoint_type_bar"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_bar" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a bar.">
     bar
   </string>
-  <string name="waypoint_type_barbecue"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_barbecue" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a barbecue.">
     barbecue
   </string>
-  <string name="waypoint_type_building"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_building" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a building.">
     building
   </string>
-  <string name="waypoint_type_bus_stop"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_bus_stop" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a bus stop.">
     bus stop
   </string>
-  <string name="waypoint_type_cafe"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_cafe" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a cafe.">
     cafe
   </string>
-  <string name="waypoint_type_campfire"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_campfire" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a campfire.">
     campfire
   </string>
-  <string name="waypoint_type_campground"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_campground" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a campground.">
     campground
   </string>
-  <string name="waypoint_type_church"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_church" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a church.">
     church
   </string>
-  <string name="waypoint_type_coffee_house"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_coffee_house" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a coffee house.">
     coffee house
   </string>
-  <string name="waypoint_type_convenience_store"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_convenience_store" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a convenience store.">
     convenience store
   </string>
-  <string name="waypoint_type_drinking_water"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_drinking_water" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a drinking water.">
     drinking water
   </string>
-  <string name="waypoint_type_falling_rocks"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_falling_rocks" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a falling rocks.">
     falling rocks
   </string>
-  <string name="waypoint_type_ferry"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_ferry" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a ferry.">
     ferry
   </string>
-  <string name="waypoint_type_fire_place"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_fire_place" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a fire place.">
     fire place
   </string>
-  <string name="waypoint_type_fire_station"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_fire_station" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a fire station.">
     fire station
   </string>
-  <string name="waypoint_type_fishing"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_fishing" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a fishing location.">
     fishing
   </string>
-  <string name="waypoint_type_gas_station"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_gas_station" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a gas station.">
     gas station
   </string>
-  <string name="waypoint_type_golf_course"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_golf_course" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a golf course.">
     golf course
   </string>
-  <string name="waypoint_type_grocery_store"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_grocery_store" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a grocery store.">
     grocery store
   </string>
-  <string name="waypoint_type_hair_dresser"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_hair_dresser" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a hair dresser.">
     hair dresser
   </string>
-  <string name="waypoint_type_harbor"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_harbor" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a harbor.">
     harbor
   </string>
-  <string name="waypoint_type_hiking_path"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_hiking_path" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a hiking path.">
     hiking path
   </string>
-  <string name="waypoint_type_hotel"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_hotel" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a hotel.">
     hotel
   </string>
-  <string name="waypoint_type_house"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_house" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a house.">
     house
   </string>
-  <string name="waypoint_type_information"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_information" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for an information.">
     information
   </string>
-  <string name="waypoint_type_intersection"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_intersection" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for an intersection.">
     intersection
   </string>
-  <string name="waypoint_type_mail_box"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_mail_box" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a mail box.">
     mail box
   </string>
-  <string name="waypoint_type_market"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_market" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a market.">
     market
   </string>
-  <string name="waypoint_type_meeting_point"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_meeting_point" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a meeting point.">
     meeting point
   </string>
-  <string name="waypoint_type_opera"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_opera" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for an opera.">
     opera
   </string>
-  <string name="waypoint_type_parking"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_parking" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a parking.">
     parking
   </string>
-  <string name="waypoint_type_police_station"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_police_station" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a police station.">
     police station
   </string>
-  <string name="waypoint_type_post_office"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_post_office" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a post office.">
     post office
   </string>
-  <string name="waypoint_type_pothole"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_pothole" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a pothole.">
     pothole
   </string>
-  <string name="waypoint_type_railway_crossing"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_railway_crossing" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a railway crossing.">
     railway crossing
   </string>
-  <string name="waypoint_type_restaurant"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_restaurant" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a restaurant.">
     restaurant
   </string>
-  <string name="waypoint_type_shopping"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_shopping" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a shopping.">
     shopping
   </string>
-  <string name="waypoint_type_sight"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_sight" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a sight.">
     sight
   </string>
-  <string name="waypoint_type_store"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_store" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a store.">
     store
   </string>
-  <string name="waypoint_type_swimming_pool"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_swimming_pool" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a swimming pool.">
     swimming pool
   </string>
-  <string name="waypoint_type_telephone"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_telephone" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a telephone.">
     telephone
   </string>
-  <string name="waypoint_type_theater"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_theater" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a theater.">
     theater
   </string>
-  <string name="waypoint_type_toilet"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_toilet" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a toilet.">
     toilet
   </string>
-  <string name="waypoint_type_tourist_information"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_tourist_information" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a tourist information.">
     tourist information
   </string>
-  <string name="waypoint_type_tree"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_tree" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a tree.">
     tree
   </string>
-  <string name="waypoint_type_tunnel"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_tunnel" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a tunnel.">
     tunnel
   </string>
-  <string name="waypoint_type_waterfall"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_waterfall" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a waterfall.">
     waterfall
   </string>
-  <string name="waypoint_type_water_fountain"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_water_fountain" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a water fountain.">
     water fountain
   </string>
-  <string name="waypoint_type_waypoint"
-    translation_description="When entering a 'Marker type', in the auto-complete text box, the
+    <string name="waypoint_type_waypoint" translation_description="When entering a 'Marker type', in the auto-complete text box, the
       completion suggestion for a waypoint.">
     waypoint
   </string>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index b6bca5681..f363067b0 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,440 +14,456 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ActionBarStyleCustom" parent="@android:style/Widget.Holo.ActionBar">
-    <!-- Same image as the source except using a grey line instead of a blue line -->
-    <item name="android:background">@drawable/ab_transparent_dark_holo</item>
-  </style>
-  <style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
-    <!-- Same as BottomButton in values/styles.xml except inheriting from Widget.Holo.Button.Borderles. -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:maxLines">2</item>
-  </style>
-  <style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
-    <!--
-    Same as BottomButtonBar in values/styles.xml except inheriting from Holo.ButtonBar and
-    adding measureWithLargestChild.
-    -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:measureWithLargestChild">true</item>
-  </style>
-  <style name="BottomButtonDivider">
-    <item name="android:background">?android:attr/dividerVertical</item>
-    <item name="android:layout_height">1dp</item>
-    <item name="android:layout_marginLeft">4dp</item>
-    <item name="android:layout_marginRight">4dp</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- edit category -->
-  <style name="EditCategory" parent="@style/TextMedium">
-    <item name="android:completionThreshold">1</item>
-    <item name="android:gravity">bottom</item>
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:selectAllOnFocus">true</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <!-- edit description -->
-  <style name="EditDescription" parent="@style/TextMedium">
-    <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:maxLines">50</item>
-    <item name="android:selectAllOnFocus">true</item>
-    <item name="android:singleLine">false</item>
-  </style>
-  <!-- edit label -->
-  <style name="EditLabel" parent="@style/TextMedium">
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- edit label with icon -->
-  <style name="EditLabel.WithIcon" parent="@style/TextMedium.WithIcon">
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- edit label with padding top -->
-  <style name="EditLabel.WithPaddingTop">
-    <item name="android:paddingTop">16dp</item>
-  </style>
-  <!-- edit name marker -->
-  <style name="EditNameMarker" parent="@style/TextMedium.WithIcon">
-    <item name="android:inputType">textAutoCorrect|textCapWords</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:selectAllOnFocus">true</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <!-- edit name track -->
-  <style name="EditNameTrack" parent="@style/TextMedium">
-    <item name="android:inputType">textAutoCorrect|textCapWords</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:selectAllOnFocus">true</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <!-- export radio group -->
-  <style name="ExportRadioGroup">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">8dp</item>
-    <item name="android:layout_marginLeft">20dp</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- help answer -->
-  <style name="HelpAnswer" parent="@style/TextSmall">
-    <item name="android:autoLink">web</item>
-    <item name="android:paddingBottom">8dp</item>
-  </style>
-  <!-- help question -->
-  <style name="HelpQuestion" parent="@style/TextMedium">
-    <item name="android:paddingTop">8dp</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <!-- list empty text view -->
-  <style name="ListEmptyTextView" parent="@style/TextLarge">
-    <item name="android:gravity">center</item>
-    <item name="android:layout_gravity">center</item>
-    <item name="android:padding">8dp</item>
-    <item name="android:textColor">@color/list_empty_text</item>
-  </style>
-  <style name="ListItem">
-    <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
-  </style>
-  <style name="ListItemDate" parent="@style/TextSmall">
-    <item name="android:gravity">right</item>
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:paddingLeft">8dp</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <!-- scroll view -->
-  <style name="ScrollView">
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:scrollbarStyle">outsideInset</item>
-  </style>
-  <!-- scroll view with bottom buttons -->
-  <style name="ScrollView.WithBottomButtons">
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_weight">1</item>
-  </style>
-  <!-- sensor state value -->
-  <style name="SensorStateValue" parent="@style/TextLarge">
-    <item name="android:background">@android:color/background_light</item>
-    <item name="android:gravity">right</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:paddingRight">8dp</item>
-    <item name="android:textColor">@android:color/primary_text_light</item>
-  </style>
-  <!-- stats horizontal line -->
-  <style name="StatsHorizontalLine">
-    <item name="android:background">@color/stats_separator</item>
-    <item name="android:layout_height">1dp</item>
-    <item name="android:layout_marginLeft">8dp</item>
-    <item name="android:layout_marginRight">8dp</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- stats large item container -->
-  <style name="StatsLargeItemContainer">
-    <item name="android:layout_gravity">center</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:orientation">vertical</item>
-    <item name="android:paddingBottom">6dp</item>
-    <item name="android:paddingTop">6dp</item>
-  </style>
-  <style name="StatsLargeLabel" parent="@style/TextSmall">
-    <!-- same as StatsLargeLabel in values/styles.xml except adding textAllCaps -->
-    <item name="android:gravity">center</item>
-    <item name="android:layout_gravity">center</item>
-    <item name="android:singleLine">false</item>
-    <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/stats_large_label</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <style name="StatsLargeValue">
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textColor">@android:color/white</item>
-    <item name="android:textSize">32sp</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <!-- stats large value container -->
-  <style name="StatsLargeValueContainer">
-    <item name="android:layout_gravity">center</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginTop">-4dp</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- stats scroll view -->
-  <style name="StatsScrollView" parent="@style/ScrollView">
-    <item name="android:scrollbarStyle">outsideOverlay</item>
-  </style>
-  <!-- stats small group container -->
-  <style name="StatsSmallGroupContainer" parent="@style/StatsLargeItemContainer">
-    <item name="android:layout_gravity">top|center</item>
-    <item name="android:paddingTop">12dp</item>
-  </style>
-  <!-- stats small item container, for placing inside StatsSmallGroupContainer -->
-  <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
-    <item name="android:paddingTop">12dp</item>
-  </style>
-  <style name="StatsSmallLabel" parent="@style/TextSmall">
-    <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
-    <item name="android:gravity">center</item>
-    <item name="android:layout_gravity">center</item>
-    <item name="android:singleLine">false</item>
-    <item name="android:textAllCaps">true</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <!-- stats small value -->
-  <style name="StatsSmallValue" parent="@style/TextLarge">
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textColor">@android:color/white</item>
-  </style>
-  <!-- stats small value -->
-  <style name="StatsTinyValue" parent="@style/TextSmall">
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textColor">@android:color/white</item>
-  </style>
-  <!-- stats small value container -->
-  <style name="StatsSmallValueContainer" parent="@style/StatsLargeValueContainer">
-    <item name="android:layout_marginTop">-2dp</item>
-  </style>
-  <!-- stats unit -->
-  <style name="StatsUnit" parent="@style/TextSmall">
-    <item name="android:layout_gravity">bottom</item>
-    <item name="android:paddingLeft">4dp</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <style name="Text">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">@android:color/white</item>
-  </style>
-  <style name="TextChooseActivity">
-    <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
-    <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
-  </style>
-  <style name="TextLarge" parent="@android:style/TextAppearance.Holo.Large">
-    <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <style name="TextMedium" parent="@android:style/TextAppearance.Holo.Medium">
-    <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- text medium with icon -->
-  <style name="TextMedium.WithIcon">
-    <item name="android:drawablePadding">8dp</item>
-    <item name="android:gravity">center_vertical</item>
-  </style>
-  <!-- text micro -->
-  <style name="TextMicro" parent="@style/Text">
-    <item name="android:textSize">12sp</item>
-  </style>
-  <style name="TextSmall" parent="@android:style/TextAppearance.Holo.Small">
-    <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- track widget bounding box -->
-  <style name="TrackWidgetBoundingBox">
-    <item name="android:background">@drawable/track_widget_background</item>
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:padding">@dimen/widget_margin</item>
-  </style>
-  <!-- track widget button -->
-  <style name="TrackWidgetButton">
-    <item name="android:background">@android:color/transparent</item>
-    <item name="android:layout_gravity">center_vertical</item>
-    <item name="android:layout_height">63dp</item>
-    <item name="android:layout_width">63dp</item>
-    <item name="android:scaleType">fitXY</item>
-  </style>
-  <!-- track widget button container -->
-  <style name="TrackWidgetButtonContainer">
-    <item name="android:gravity">center_vertical</item>
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:paddingBottom">4dp</item>
-    <item name="android:paddingTop">4dp</item>
-  </style>
-  <!-- track widget config spiner -->
-  <style name="TrackWidgetConfigSpinner">
-    <item name="android:layout_gravity">center_horizontal</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_margin">8dp</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- Track widget frame -->
-  <style name="TrackWidgetFrame">
-    <item name="android:layout_alignParentTop">true</item>
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">vertical</item>
-  </style>
-  <!-- track widget horizontal line -->
-  <style name="TrackWidgetHorizontalLine">
-    <item name="android:background">@color/stats_separator</item>
-    <item name="android:layout_height">1dp</item>
-    <item name="android:layout_width">0dp</item>
-  </style>
-  <!-- track widget horizontal spacer -->
-  <style name="TrackWidgetHorizontalSpacer">
-    <item name="android:layout_height">1dp</item>
-    <item name="android:layout_width">0dp</item>
-  </style>
-  <!-- track widget horizontal separator -->
-  <style name="TrackWidgetHorizontalSeparator">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- track widget item container -->
-  <style name="TrackWidgetItemContainer">
-    <item name="android:layout_gravity">center_horizontal</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:orientation">vertical</item>
-    <item name="android:paddingBottom">2dp</item>
-    <item name="android:paddingTop">2dp</item>
-  </style>
-  <!-- track widget item container 4x2 -->
-  <style name="TrackWidgetItemContainer4x2" parent="@style/TrackWidgetItemContainer">
-    <item name="android:paddingBottom">4dp</item>
-    <item name="android:paddingTop">4dp</item>
-  </style>
-  <!-- track widget item container 4x3 -->
-  <style name="TrackWidgetItemContainer4x3" parent="@style/TrackWidgetItemContainer">
-    <item name="android:paddingBottom">6dp</item>
-    <item name="android:paddingTop">12dp</item>
-  </style>
-  <!-- track widget item container 4x4 -->
-  <style name="TrackWidgetItemContainer4x4" parent="@style/TrackWidgetItemContainer">
-    <item name="android:paddingBottom">12dp</item>
-    <item name="android:paddingTop">12dp</item>
-  </style>
-  <style name="TrackWidgetLabel">
-    <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
-    <item name="android:layout_gravity">center_horizontal</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textColor">@color/stats_large_label</item>
-    <item name="android:textSize">10dp</item>
-    <item name="android:textStyle">bold</item>
-    <item name="android:textAllCaps">true</item>
-  </style>
-  <style name="TrackWidgetLabel4x4" parent="@style/TrackWidgetLabel">
-    <item name="android:textSize">14dp</item>
-  </style>
-  <!-- track widget logo -->
-  <style name="TrackWidgetLogo">
-    <item name="android:layout_alignParentRight">true</item>
-    <item name="android:layout_alignParentTop">true</item>
-    <item name="android:layout_height">24dp</item>
-    <item name="android:layout_width">24dp</item>
-    <item name="android:padding">4dp</item>
-    <item name="android:scaleType">fitXY</item>
-    <item name="android:src">@drawable/ic_logo</item>
-  </style>
-  <!-- track widget logo 4x4 -->
-  <style name="TrackWidgetLogo4x4" parent="@style/TrackWidgetLogo">
-    <item name="android:layout_height">30dp</item>
-    <item name="android:layout_width">30dp</item>
-  </style>
-  <!-- track widget record status -->
-  <style name="TrackWidgetRecordStatus" parent="@style/TextSmall">
-    <item name="android:layout_gravity">center_vertical</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginLeft">8dp</item>
-    <item name="android:layout_weight">2</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:singleLine">true</item>
-  </style>
-  <!-- track widget stats container -->
-  <style name="TrackWidgetStatsContainer">
-    <item name="android:clickable">true</item>
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">vertical</item>
-    <item name="android:padding">4dp</item>
-  </style>
-  <!-- track widget stats section -->
-  <style name="TrackWidgetStatsSection">
-    <item name="android:gravity">center_vertical</item>
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>
-  <!-- track widget unit -->
-  <style name="TrackWidgetUnit">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:paddingLeft">4dp</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textSize">10dp</item>
-  </style>
-  <!-- track widget unit 4x3 -->
-  <style name="TrackWidgetUnit4x3" parent="@style/TrackWidgetUnit">
-    <item name="android:textSize">14dp</item>
-  </style>
-  <!-- track widget unit 4x4 -->
-  <style name="TrackWidgetUnit4x4" parent="@style/TrackWidgetUnit">
-    <item name="android:textSize">18dp</item>
-  </style>
-  <!-- track widget value -->
-  <style name="TrackWidgetValue">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">2</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textColor">@android:color/white</item>
-    <item name="android:textSize">18dp</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <!-- track widget value 4x3 -->
-  <style name="TrackWidgetValue4x3" parent="@style/TrackWidgetValue">
-    <item name="android:textSize">28dp</item>
-  </style>
-  <!-- track widget value 4x4 -->
-  <style name="TrackWidgetValue4x4" parent="@style/TrackWidgetValue">
-    <item name="android:textSize">36dp</item>
-  </style>
-  <!-- track widget value container -->
-  <style name="TrackWidgetValueContainer">
-    <item name="android:layout_gravity">center_horizontal</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginTop">-4dp</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- track widget value container 4x3 -->
-  <style name="TrackWidgetValueContainer4x3" parent="@style/TrackWidgetValueContainer">
-    <item name="android:layout_marginTop">-2dp</item>
-  </style>
-  <!-- track widget vertical line -->
-  <style name="TrackWidgetVerticalLine">
-    <item name="android:background">@color/stats_separator</item>
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_width">1dp</item>
-  </style>
-  <!-- track widget vertical spacer -->
-  <style name="TrackWidgetVerticalSpacer">
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_width">1dp</item>
-  </style>
-  <!-- track widget vertical separator -->
-  <style name="TrackWidgetVerticalSeparator">
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:orientation">vertical</item>
-  </style>
+
+    <style name="ActionBarStyleCustom" parent="@android:style/Widget.Holo.ActionBar">
+        <!-- Same image as the source except using a grey line instead of a blue line -->
+        <item name="android:background">@drawable/ab_transparent_dark_holo</item>
+    </style>
+
+    <style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
+        <!-- Same as BottomButton in values/styles.xml except inheriting from Widget.Holo.Button.Borderles. -->
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:maxLines">2</item>
+    </style>
+
+    <style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
+        <!--
+        Same as BottomButtonBar in values/styles.xml except inheriting from Holo.ButtonBar and
+        adding measureWithLargestChild.
+        -->
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:measureWithLargestChild">true</item>
+    </style>
+
+    <style name="BottomButtonDivider">
+        <item name="android:background">?android:attr/dividerVertical</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_marginLeft">4dp</item>
+        <item name="android:layout_marginRight">4dp</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- edit category -->
+    <style name="EditCategory" parent="@style/TextMedium">
+        <item name="android:completionThreshold">1</item>
+        <item name="android:gravity">bottom</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:selectAllOnFocus">true</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <!-- edit description -->
+    <style name="EditDescription" parent="@style/TextMedium">
+        <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:maxLines">50</item>
+        <item name="android:selectAllOnFocus">true</item>
+        <item name="android:singleLine">false</item>
+    </style>
+    <!-- edit label -->
+    <style name="EditLabel" parent="@style/TextMedium">
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- edit label with icon -->
+    <style name="EditLabel.WithIcon" parent="@style/TextMedium.WithIcon">
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- edit label with padding top -->
+    <style name="EditLabel.WithPaddingTop">
+        <item name="android:paddingTop">16dp</item>
+    </style>
+    <!-- edit name marker -->
+    <style name="EditNameMarker" parent="@style/TextMedium.WithIcon">
+        <item name="android:inputType">textAutoCorrect|textCapWords</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:selectAllOnFocus">true</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <!-- edit name track -->
+    <style name="EditNameTrack" parent="@style/TextMedium">
+        <item name="android:inputType">textAutoCorrect|textCapWords</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:selectAllOnFocus">true</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <!-- export radio group -->
+    <style name="ExportRadioGroup">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- help answer -->
+    <style name="HelpAnswer" parent="@style/TextSmall">
+        <item name="android:autoLink">web</item>
+        <item name="android:paddingBottom">8dp</item>
+    </style>
+    <!-- help question -->
+    <style name="HelpQuestion" parent="@style/TextMedium">
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <!-- list empty text view -->
+    <style name="ListEmptyTextView" parent="@style/TextLarge">
+        <item name="android:gravity">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:textColor">@color/list_empty_text</item>
+    </style>
+
+    <style name="ListItem">
+        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
+    </style>
+
+    <style name="ListItemDate" parent="@style/TextSmall">
+        <item name="android:gravity">right</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <!-- scroll view -->
+    <style name="ScrollView">
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:scrollbarStyle">outsideInset</item>
+    </style>
+    <!-- scroll view with bottom buttons -->
+    <style name="ScrollView.WithBottomButtons">
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+    <!-- sensor state value -->
+    <style name="SensorStateValue" parent="@style/TextLarge">
+        <item name="android:background">@android:color/background_light</item>
+        <item name="android:gravity">right</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+    </style>
+    <!-- stats horizontal line -->
+    <style name="StatsHorizontalLine">
+        <item name="android:background">@color/stats_separator</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- stats large item container -->
+    <style name="StatsLargeItemContainer">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingTop">6dp</item>
+    </style>
+
+    <style name="StatsLargeLabel" parent="@style/TextSmall">
+        <!-- same as StatsLargeLabel in values/styles.xml except adding textAllCaps -->
+        <item name="android:gravity">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:singleLine">false</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/stats_large_label</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="StatsLargeValue">
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">32sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <!-- stats large value container -->
+    <style name="StatsLargeValueContainer">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">-4dp</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+    <!-- stats scroll view -->
+    <style name="StatsScrollView" parent="@style/ScrollView">
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+    <!-- stats small group container -->
+    <style name="StatsSmallGroupContainer" parent="@style/StatsLargeItemContainer">
+        <item name="android:layout_gravity">top|center</item>
+        <item name="android:paddingTop">12dp</item>
+    </style>
+    <!-- stats small item container, for placing inside StatsSmallGroupContainer -->
+    <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
+        <item name="android:paddingTop">12dp</item>
+    </style>
+
+    <style name="StatsSmallLabel" parent="@style/TextSmall">
+        <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
+        <item name="android:gravity">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:singleLine">false</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <!-- stats small value -->
+    <style name="StatsSmallValue" parent="@style/TextLarge">
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+    <!-- stats small value -->
+    <style name="StatsTinyValue" parent="@style/TextSmall">
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+    <!-- stats small value container -->
+    <style name="StatsSmallValueContainer" parent="@style/StatsLargeValueContainer">
+        <item name="android:layout_marginTop">-2dp</item>
+    </style>
+    <!-- stats unit -->
+    <style name="StatsUnit" parent="@style/TextSmall">
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:singleLine">true</item>
+    </style>
+
+    <style name="Text">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="TextChooseActivity">
+        <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
+        <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
+    </style>
+
+    <style name="TextLarge" parent="@android:style/TextAppearance.Holo.Large">
+        <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+
+    <style name="TextMedium" parent="@android:style/TextAppearance.Holo.Medium">
+        <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+    <!-- text medium with icon -->
+    <style name="TextMedium.WithIcon">
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+    <!-- text micro -->
+    <style name="TextMicro" parent="@style/Text">
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="TextSmall" parent="@android:style/TextAppearance.Holo.Small">
+        <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+    <!-- track widget bounding box -->
+    <style name="TrackWidgetBoundingBox">
+        <item name="android:background">@drawable/track_widget_background</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:padding">@dimen/widget_margin</item>
+    </style>
+    <!-- track widget button -->
+    <style name="TrackWidgetButton">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_height">63dp</item>
+        <item name="android:layout_width">63dp</item>
+        <item name="android:scaleType">fitXY</item>
+    </style>
+    <!-- track widget button container -->
+    <style name="TrackWidgetButtonContainer">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+    </style>
+    <!-- track widget config spiner -->
+    <style name="TrackWidgetConfigSpinner">
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">8dp</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- Track widget frame -->
+    <style name="TrackWidgetFrame">
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+    <!-- track widget horizontal line -->
+    <style name="TrackWidgetHorizontalLine">
+        <item name="android:background">@color/stats_separator</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_width">0dp</item>
+    </style>
+    <!-- track widget horizontal spacer -->
+    <style name="TrackWidgetHorizontalSpacer">
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_width">0dp</item>
+    </style>
+    <!-- track widget horizontal separator -->
+    <style name="TrackWidgetHorizontalSeparator">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- track widget item container -->
+    <style name="TrackWidgetItemContainer">
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:paddingBottom">2dp</item>
+        <item name="android:paddingTop">2dp</item>
+    </style>
+    <!-- track widget item container 4x2 -->
+    <style name="TrackWidgetItemContainer4x2" parent="@style/TrackWidgetItemContainer">
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+    </style>
+    <!-- track widget item container 4x3 -->
+    <style name="TrackWidgetItemContainer4x3" parent="@style/TrackWidgetItemContainer">
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingTop">12dp</item>
+    </style>
+    <!-- track widget item container 4x4 -->
+    <style name="TrackWidgetItemContainer4x4" parent="@style/TrackWidgetItemContainer">
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:paddingTop">12dp</item>
+    </style>
+
+    <style name="TrackWidgetLabel">
+        <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@color/stats_large_label</item>
+        <item name="android:textSize">10dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+
+    <style name="TrackWidgetLabel4x4" parent="@style/TrackWidgetLabel">
+        <item name="android:textSize">14dp</item>
+    </style>
+    <!-- track widget logo -->
+    <style name="TrackWidgetLogo">
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">24dp</item>
+        <item name="android:padding">4dp</item>
+        <item name="android:scaleType">fitXY</item>
+        <item name="android:src">@drawable/ic_logo</item>
+    </style>
+    <!-- track widget logo 4x4 -->
+    <style name="TrackWidgetLogo4x4" parent="@style/TrackWidgetLogo">
+        <item name="android:layout_height">30dp</item>
+        <item name="android:layout_width">30dp</item>
+    </style>
+    <!-- track widget record status -->
+    <style name="TrackWidgetRecordStatus" parent="@style/TextSmall">
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_weight">2</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <!-- track widget stats container -->
+    <style name="TrackWidgetStatsContainer">
+        <item name="android:clickable">true</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:padding">4dp</item>
+    </style>
+    <!-- track widget stats section -->
+    <style name="TrackWidgetStatsSection">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    <!-- track widget unit -->
+    <style name="TrackWidgetUnit">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textSize">10dp</item>
+    </style>
+    <!-- track widget unit 4x3 -->
+    <style name="TrackWidgetUnit4x3" parent="@style/TrackWidgetUnit">
+        <item name="android:textSize">14dp</item>
+    </style>
+    <!-- track widget unit 4x4 -->
+    <style name="TrackWidgetUnit4x4" parent="@style/TrackWidgetUnit">
+        <item name="android:textSize">18dp</item>
+    </style>
+    <!-- track widget value -->
+    <style name="TrackWidgetValue">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">2</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">18dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <!-- track widget value 4x3 -->
+    <style name="TrackWidgetValue4x3" parent="@style/TrackWidgetValue">
+        <item name="android:textSize">28dp</item>
+    </style>
+    <!-- track widget value 4x4 -->
+    <style name="TrackWidgetValue4x4" parent="@style/TrackWidgetValue">
+        <item name="android:textSize">36dp</item>
+    </style>
+    <!-- track widget value container -->
+    <style name="TrackWidgetValueContainer">
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">-4dp</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+    <!-- track widget value container 4x3 -->
+    <style name="TrackWidgetValueContainer4x3" parent="@style/TrackWidgetValueContainer">
+        <item name="android:layout_marginTop">-2dp</item>
+    </style>
+    <!-- track widget vertical line -->
+    <style name="TrackWidgetVerticalLine">
+        <item name="android:background">@color/stats_separator</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_width">1dp</item>
+    </style>
+    <!-- track widget vertical spacer -->
+    <style name="TrackWidgetVerticalSpacer">
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_width">1dp</item>
+    </style>
+    <!-- track widget vertical separator -->
+    <style name="TrackWidgetVerticalSeparator">
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/styles_custom.xml b/src/main/res/values/styles_custom.xml
index b9c07536b..f552ea4f4 100644
--- a/src/main/res/values/styles_custom.xml
+++ b/src/main/res/values/styles_custom.xml
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated with http://android-holo-colors.com -->
+<?xml version="1.0" encoding="utf-8"?><!-- Generated with http://android-holo-colors.com -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="AutoCompleteTextViewCustom" parent="android:Widget.Holo.AutoCompleteTextView">
-    <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-    <item name="android:background">@drawable/edit_text_holo_dark</item>
-  </style>
-  <style name="ProgressBarCustom" parent="android:Widget.Holo.ProgressBar.Horizontal">
-    <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
-    <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_holo_dark</item>
-  </style>
-  <style name="SpinnerCustom" parent="android:Widget.Holo.Spinner">
-    <item name="android:background">@drawable/spinner_background_holo_dark</item>
-    <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-  </style>
+
+    <style name="AutoCompleteTextViewCustom" parent="android:Widget.Holo.AutoCompleteTextView">
+        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
+        <item name="android:background">@drawable/edit_text_holo_dark</item>
+    </style>
+
+    <style name="ProgressBarCustom" parent="android:Widget.Holo.ProgressBar.Horizontal">
+        <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
+        <item name="android:indeterminateDrawable">
+            @drawable/progress_indeterminate_horizontal_holo_dark
+        </item>
+    </style>
+
+    <style name="SpinnerCustom" parent="android:Widget.Holo.Spinner">
+        <item name="android:background">@drawable/spinner_background_holo_dark</item>
+        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index 692f91a20..166d83007 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,36 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ThemeCustom" parent="android:Theme.Holo">
-    <!-- Auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
-    <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
-    <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
-    <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
-    <item name="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
-    <!-- Manually added -->
-    <item name="android:actionBarStyle">@style/ActionBarStyleCustom</item>
-    <item name="android:actionModeBackground">@drawable/custom_action_mode_background</item>
-    <item name="android:alertDialogTheme">@style/CustomAlertDialogTheme</item>
-  </style>
-  <style name="CustomAlertDialogTheme" parent="@android:style/Theme.Holo.Dialog">
-    <!-- From auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
-    <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
-    <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
-    <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
-    <item name="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
-    <!-- From Theme.Holo.Dialog.Alert -->
-    <item name="android:textColor">@color/holo_orange_dark</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-    <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-  </style>
+
+    <style name="ThemeCustom" parent="android:Theme.Holo">
+        <!-- Auto generated -->
+        <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark
+        </item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
+        <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
+        <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
+        <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
+        <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
+        <item name="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
+        <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
+        <!-- Manually added -->
+        <item name="android:actionBarStyle">@style/ActionBarStyleCustom</item>
+        <item name="android:actionModeBackground">@drawable/custom_action_mode_background</item>
+        <item name="android:alertDialogTheme">@style/CustomAlertDialogTheme</item>
+    </style>
+
+    <style name="CustomAlertDialogTheme" parent="@android:style/Theme.Holo.Dialog">
+        <!-- From auto generated -->
+        <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark
+        </item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
+        <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
+        <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
+        <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
+        <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
+        <item name="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
+        <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
+        <!-- From Theme.Holo.Dialog.Alert -->
+        <item name="android:textColor">@color/holo_orange_dark</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/third_party.xml b/src/main/res/values/third_party.xml
index b070ebcdd..3290d8358 100644
--- a/src/main/res/values/third_party.xml
+++ b/src/main/res/values/third_party.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Do not translate -->
-  <!-- Permissions, need to be in sync with the permissions in AndroidManifest.xml -->
-  <string name="broadcast_notifications_permission" translatable="false">com.google.android.apps.mytracks.TRACK_NOTIFICATIONS</string>
-  <!-- Broadcast -->
-  <string name="track_id_broadcast_extra" translatable="false">com.google.android.apps.mytracks.TRACK_ID</string>
-  <string name="track_paused_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_PAUSED</string>
-  <string name="track_resumed_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_RESUMED</string>
-  <string name="track_started_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STARTED</string>
-  <string name="track_stopped_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STOPPED</string>
-  <string name="track_update_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_UPDATE</string>
+    <!-- Do not translate -->
+    <!-- Permissions, need to be in sync with the permissions in AndroidManifest.xml -->
+    <string name="broadcast_notifications_permission" translatable="false">com.google.android.apps.mytracks.TRACK_NOTIFICATIONS</string>
+    <!-- Broadcast -->
+    <string name="track_id_broadcast_extra" translatable="false">com.google.android.apps.mytracks.TRACK_ID</string>
+    <string name="track_paused_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_PAUSED</string>
+    <string name="track_resumed_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_RESUMED</string>
+    <string name="track_started_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STARTED</string>
+    <string name="track_stopped_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STOPPED</string>
+    <string name="track_update_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_UPDATE</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/xml/search.xml b/src/main/res/xml/search.xml
index 5ebdc8c2b..6662e4fdc 100644
--- a/src/main/res/xml/search.xml
+++ b/src/main/res/xml/search.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-  android:hint="@string/menu_search"
-  android:imeOptions="actionSearch"
-  android:includeInGlobalSearch="true"
-  android:label="@string/app_name"
-  android:queryAfterZeroResults="true"
-  android:searchSettingsDescription="@string/search_global_description"
-  android:searchSuggestAuthority="com.google.android.maps.mytracks.search"
-  android:searchSuggestSelection=" ? "
-  android:searchSuggestThreshold="1"
-  android:voicePromptText="@string/search_voice_prompt"
-  android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />
+    android:hint="@string/menu_search"
+    android:imeOptions="actionSearch"
+    android:includeInGlobalSearch="true"
+    android:label="@string/app_name"
+    android:queryAfterZeroResults="true"
+    android:searchSettingsDescription="@string/search_global_description"
+    android:searchSuggestAuthority="com.google.android.maps.mytracks.search"
+    android:searchSuggestSelection=" ? "
+    android:searchSuggestThreshold="1"
+    android:voicePromptText="@string/search_voice_prompt"
+    android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 781323d18..3c7a8ac56 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,25 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/menu_settings" >
-  <Preference
-    android:key="@string/settings_chart_key"
-    android:persistent="false"
-    android:title="@string/track_detail_chart_tab" />
-  <Preference
-    android:key="@string/settings_stats_key"
-    android:persistent="false"
-    android:title="@string/track_detail_stats_tab" />
-  <Preference
-    android:key="@string/settings_recording_key"
-    android:persistent="false"
-    android:title="@string/settings_recording" />
-  <Preference
-    android:key="@string/settings_sensor_key"
-    android:persistent="false"
-    android:title="@string/settings_sensor" />
-  <Preference
-    android:key="@string/settings_advanced_key"
-    android:persistent="false"
-    android:title="@string/settings_advanced" />
+    android:title="@string/menu_settings">
+    <Preference
+        android:key="@string/settings_chart_key"
+        android:persistent="false"
+        android:title="@string/track_detail_chart_tab" />
+    <Preference
+        android:key="@string/settings_stats_key"
+        android:persistent="false"
+        android:title="@string/track_detail_stats_tab" />
+    <Preference
+        android:key="@string/settings_recording_key"
+        android:persistent="false"
+        android:title="@string/settings_recording" />
+    <Preference
+        android:key="@string/settings_sensor_key"
+        android:persistent="false"
+        android:title="@string/settings_sensor" />
+    <Preference
+        android:key="@string/settings_advanced_key"
+        android:persistent="false"
+        android:title="@string/settings_advanced" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_advanced.xml b/src/main/res/xml/settings_advanced.xml
index 49f54965e..9e11298e2 100644
--- a/src/main/res/xml/settings_advanced.xml
+++ b/src/main/res/xml/settings_advanced.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/settings_advanced" >
-  <ListPreference
-    android:defaultValue="1024"
-    android:key="@string/photo_size_key"
-    android:title="@string/settings_advanced_photo_size_title" />
-  <Preference
-    android:key="@string/settings_reset_key"
-    android:persistent="false"
-    android:title="@string/settings_reset" />
+    android:title="@string/settings_advanced">
+    <ListPreference
+        android:defaultValue="1024"
+        android:key="@string/photo_size_key"
+        android:title="@string/settings_advanced_photo_size_title" />
+    <Preference
+        android:key="@string/settings_reset_key"
+        android:persistent="false"
+        android:title="@string/settings_reset" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_chart.xml b/src/main/res/xml/settings_chart.xml
index cb75bf7ee..0a46b63f9 100644
--- a/src/main/res/xml/settings_chart.xml
+++ b/src/main/res/xml/settings_chart.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,33 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/track_detail_chart_tab" >
-  <ListPreference
-    android:defaultValue="@string/chart_x_axis_distance"
-    android:key="@string/chart_x_axis_key"
-    android:title="@string/settings_chart_x_axis" />
-  <PreferenceCategory android:title="@string/settings_show" >
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/chart_show_elevation_key"
-      android:title="@string/stats_elevation" />
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/chart_show_speed_key" />
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/chart_show_heart_rate_key"
-      android:title="@string/sensor_state_heart_rate" />
-<!--
-TODO: Sensors are not implemented.
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/chart_show_cadence_key"
-      android:title="@string/sensor_state_cadence" />
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/chart_show_power_key"
-      android:title="@string/sensor_state_power" />
--->
-  </PreferenceCategory>
+    android:title="@string/track_detail_chart_tab">
+    <ListPreference
+        android:defaultValue="@string/chart_x_axis_distance"
+        android:key="@string/chart_x_axis_key"
+        android:title="@string/settings_chart_x_axis" />
+    <PreferenceCategory android:title="@string/settings_show">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_elevation_key"
+            android:title="@string/stats_elevation" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_speed_key" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_heart_rate_key"
+            android:title="@string/sensor_state_heart_rate" />
+        <!--
+        TODO: Sensors are not implemented.
+            <CheckBoxPreference
+              android:defaultValue="true"
+              android:key="@string/chart_show_cadence_key"
+              android:title="@string/sensor_state_cadence" />
+            <CheckBoxPreference
+              android:defaultValue="true"
+              android:key="@string/chart_show_power_key"
+              android:title="@string/sensor_state_power" />
+        -->
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_recording.xml b/src/main/res/xml/settings_recording.xml
index 3a70f1eee..901c27310 100644
--- a/src/main/res/xml/settings_recording.xml
+++ b/src/main/res/xml/settings_recording.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,41 +14,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/settings_recording" >
-  <ListPreference
-    android:defaultValue="0"
-    android:key="@string/voice_frequency_key"
-    android:title="@string/menu_voice_frequency" />
-  <ListPreference
-    android:defaultValue="0"
-    android:key="@string/split_frequency_key"
-    android:title="@string/menu_split_frequency" />
-  <ListPreference
-    android:defaultValue="@string/settings_recording_track_name_date_iso_8601_location_value"
-    android:key="@string/track_name_key"
-    android:title="@string/settings_recording_track_name_title" />
-  <com.google.android.apps.mytracks.settings.ActivityTypePreference
-    android:defaultValue="@string/activity_type_running"
-    android:key="@string/default_activity_key"
-    android:title="@string/settings_recording_default_activity_title" />
-  <ListPreference
-    android:defaultValue="0"
-    android:key="@string/min_recording_interval_key"
-    android:title="@string/settings_recording_min_recording_interval_title" />
-  <ListPreference
-    android:defaultValue="10"
-    android:key="@string/recording_distance_interval_key"
-    android:title="@string/settings_recording_min_recording_distance_title" />
-  <ListPreference
-    android:defaultValue="200"
-    android:key="@string/max_recording_distance_key"
-    android:title="@string/settings_recording_max_recording_distance_title" />
-  <ListPreference
-    android:defaultValue="50"
-    android:key="@string/recording_gps_accuracy_key"
-    android:title="@string/settings_recording_min_required_accuracy_title" />
-  <ListPreference
-    android:defaultValue="10"
-    android:key="@string/auto_resume_track_timeout_key"
-    android:title="@string/settings_recording_auto_resume_track_timeout_title" />
+    android:title="@string/settings_recording">
+    <ListPreference
+        android:defaultValue="0"
+        android:key="@string/voice_frequency_key"
+        android:title="@string/menu_voice_frequency" />
+    <ListPreference
+        android:defaultValue="0"
+        android:key="@string/split_frequency_key"
+        android:title="@string/menu_split_frequency" />
+    <ListPreference
+        android:defaultValue="@string/settings_recording_track_name_date_iso_8601_location_value"
+        android:key="@string/track_name_key"
+        android:title="@string/settings_recording_track_name_title" />
+    <com.google.android.apps.mytracks.settings.ActivityTypePreference
+        android:defaultValue="@string/activity_type_running"
+        android:key="@string/default_activity_key"
+        android:title="@string/settings_recording_default_activity_title" />
+    <ListPreference
+        android:defaultValue="0"
+        android:key="@string/min_recording_interval_key"
+        android:title="@string/settings_recording_min_recording_interval_title" />
+    <ListPreference
+        android:defaultValue="10"
+        android:key="@string/recording_distance_interval_key"
+        android:title="@string/settings_recording_min_recording_distance_title" />
+    <ListPreference
+        android:defaultValue="200"
+        android:key="@string/max_recording_distance_key"
+        android:title="@string/settings_recording_max_recording_distance_title" />
+    <ListPreference
+        android:defaultValue="50"
+        android:key="@string/recording_gps_accuracy_key"
+        android:title="@string/settings_recording_min_required_accuracy_title" />
+    <ListPreference
+        android:defaultValue="10"
+        android:key="@string/auto_resume_track_timeout_key"
+        android:title="@string/settings_recording_auto_resume_track_timeout_title" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_sensors.xml b/src/main/res/xml/settings_sensors.xml
index 6ad37dd89..cb47dc8ba 100644
--- a/src/main/res/xml/settings_sensors.xml
+++ b/src/main/res/xml/settings_sensors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,19 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:key="@string/settings_sensor_root_key"
-  android:title="@string/settings_sensor" >
-  <PreferenceCategory
-    android:key="@string/settings_sensor_bluetooth_key"
-    android:title="@string/settings_sensor_bluetooth" >
-    <Preference
-      android:key="@string/settings_sensor_bluetooth_pairing_key"
-      android:persistent="false"
-      android:summary="@string/settings_sensor_bluetooth_pairing_summary"
-      android:title="@string/settings_sensor_bluetooth_pairing" />
-    <ListPreference
-      android:defaultValue="@string/sensor_type_value_none"
-      android:key="@string/bluetooth_sensor_key"
-      android:title="@string/settings_sensor_bluetooth_sensor" />
-  </PreferenceCategory>
+    android:key="@string/settings_sensor_root_key"
+    android:title="@string/settings_sensor">
+    <PreferenceCategory
+        android:key="@string/settings_sensor_bluetooth_key"
+        android:title="@string/settings_sensor_bluetooth">
+        <Preference
+            android:key="@string/settings_sensor_bluetooth_pairing_key"
+            android:persistent="false"
+            android:summary="@string/settings_sensor_bluetooth_pairing_summary"
+            android:title="@string/settings_sensor_bluetooth_pairing" />
+        <ListPreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/bluetooth_sensor_key"
+            android:title="@string/settings_sensor_bluetooth_sensor" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_statistics.xml b/src/main/res/xml/settings_statistics.xml
index 6288de43d..4ed76df45 100644
--- a/src/main/res/xml/settings_statistics.xml
+++ b/src/main/res/xml/settings_statistics.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,23 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/track_detail_stats_tab" >
-  <ListPreference
-    android:defaultValue="@string/stats_units_metric"
-    android:key="@string/stats_units_key"
-    android:title="@string/settings_stats_units_title" />
-  <ListPreference
-    android:defaultValue="@string/stats_rate_speed"
-    android:key="@string/stats_rate_key"
-    android:title="@string/settings_stats_rate_title" />
-  <PreferenceCategory android:title="@string/settings_show" >
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/stats_show_grade_elevation_key"
-      android:title="@string/settings_stats_grade_elevation" />
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/stats_show_coordinate_key"
-      android:title="@string/settings_stats_coordinate" />
-  </PreferenceCategory>
+    android:title="@string/track_detail_stats_tab">
+    <ListPreference
+        android:defaultValue="@string/stats_units_metric"
+        android:key="@string/stats_units_key"
+        android:title="@string/settings_stats_units_title" />
+    <ListPreference
+        android:defaultValue="@string/stats_rate_speed"
+        android:key="@string/stats_rate_key"
+        android:title="@string/settings_stats_rate_title" />
+    <PreferenceCategory android:title="@string/settings_show">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/stats_show_grade_elevation_key"
+            android:title="@string/settings_stats_grade_elevation" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/stats_show_coordinate_key"
+            android:title="@string/settings_stats_coordinate" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/track_widget_info.xml b/src/main/res/xml/track_widget_info.xml
index f6ede7b21..d958206ae 100644
--- a/src/main/res/xml/track_widget_info.xml
+++ b/src/main/res/xml/track_widget_info.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2011 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-  android:configure="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
-  android:initialKeyguardLayout="@layout/track_widget_4x1"
-  android:initialLayout="@layout/track_widget_4x2"
-  android:minHeight="110dp"
-  android:minResizeHeight="40dp"
-  android:minResizeWidth="250dp"
-  android:minWidth="250dp"
-  android:resizeMode="vertical"
-  android:updatePeriodMillis="0"
-  android:widgetCategory="keyguard|home_screen" />
+    android:configure="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
+    android:initialKeyguardLayout="@layout/track_widget_4x1"
+    android:initialLayout="@layout/track_widget_4x2"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="250dp"
+    android:minResizeHeight="40dp"
+    android:resizeMode="vertical"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="keyguard|home_screen" />