diff --git a/MyTracks/proguard.cfg b/MyTracks/proguard.cfg
index e35432511..0be4447b2 100644
--- a/MyTracks/proguard.cfg
+++ b/MyTracks/proguard.cfg
@@ -35,7 +35,7 @@
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
--keepclasseswithmembes class * {
+-keepclasseswithmembers class * {
     native <methods>;
 }
 
diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index e5e44464a..a22eab0d6 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -41,7 +41,7 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:orientation="vertical"
       android:padding="10dp">
-      <!--  X axis -->
+      <!-- X axis -->
       <TextView
         android:drawableLeft="@drawable/x_axis"
         android:drawablePadding="10dp"
diff --git a/MyTracks/res/layout/mytracks_marker_item.xml b/MyTracks/res/layout/mytracks_marker_item.xml
index 94684f91c..178a58ea5 100644
--- a/MyTracks/res/layout/mytracks_marker_item.xml
+++ b/MyTracks/res/layout/mytracks_marker_item.xml
@@ -15,48 +15,47 @@ 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:paddingTop="2dp"
-  android:paddingBottom="2dp"
-  android:layout_width="fill_parent"
   android:layout_height="wrap_content"
+  android:layout_width="fill_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="horizontal">
-
-  <ImageView android:id="@+id/waypointslist_item_icon"
-    android:layout_width="wrap_content"
+  android:orientation="horizontal"
+  android:paddingBottom="2dp"
+  android:paddingTop="2dp" >
+  <ImageView
+    android:contentDescription="@string/marker_icon_description"
+    android:id="@+id/waypointslist_item_icon"
     android:layout_height="wrap_content"
     android:layout_marginLeft="6dp"
     android:layout_marginTop="6dp"
-    android:src="@drawable/ylw_pushpin"
-    android:contentDescription="@string/marker_icon_description"/>
-
+    android:layout_width="wrap_content"
+    android:src="@drawable/ylw_pushpin" />
   <LinearLayout
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/waypointslist_item_name"
-      android:layout_width="fill_parent"
+    android:orientation="vertical" >
+    <TextView
+      android:id="@+id/waypointslist_item_name"
       android:layout_height="wrap_content"
       android:layout_marginLeft="6dp"
       android:layout_marginTop="6dp"
-      android:singleLine = "true"
-      android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <TextView android:id="@+id/waypointslist_item_time"
       android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceLarge" />
+    <TextView
+      android:id="@+id/waypointslist_item_time"
       android:layout_height="wrap_content"
-      android:layout_marginLeft = "6dp"
-      android:singleLine = "true"
-      android:textColor = "#fff"
-      android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-    <TextView android:id="@+id/waypointslist_item_category"
+      android:layout_marginLeft="6dp"
       android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:textColor="#fff" />
+    <TextView
+      android:id="@+id/waypointslist_item_category"
       android:layout_height="wrap_content"
-      android:layout_marginLeft = "6dp"
-      android:singleLine = "true"
-      android:textColor="#0f0"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:layout_marginLeft="6dp"
+      android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:textColor="#0f0" />
   </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file