diff --git a/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java b/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
index 64a321e4..51b20079 100644
--- a/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
+++ b/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
@@ -151,10 +151,11 @@ public void setAvailableLayouts(List<String> options) {
             Button layoutButton = new Button(this);
             layoutButton.setHeight(150);
             layoutButton.setText(CustomLayoutsUtils.convertFileName(option));
-            layoutButton.setTextSize((float)22 );
+            layoutButton.setTextSize(16f);
             layoutButton.setTextColor(Color.WHITE);
+            layoutButton.setSingleLine(false);
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-            layoutParams.setMargins(110, 0, 110, 0);
+            layoutParams.setMargins(50, 10, 50, 10);
             layoutButton.setLayoutParams(layoutParams);
             layoutButton.setPadding(10,20,10,20);
             layoutButton.setOnClickListener(listener);
diff --git a/app/src/main/res/layout-iw/waypointlist_item.xml b/app/src/main/res/layout-iw/waypointlist_item.xml
index 953fc665..692226d2 100644
--- a/app/src/main/res/layout-iw/waypointlist_item.xml
+++ b/app/src/main/res/layout-iw/waypointlist_item.xml
@@ -5,6 +5,4 @@
 	<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_timestamp" android:layout_height="wrap_content" android:text="{timestamp}" android:layout_below="@+id/wplist_item_location" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>
 	<TextView style="@android:style/TextAppearance.Large" android:layout_width="wrap_content" android:id="@+id/wplist_item_name" android:layout_height="wrap_content" android:text="{name}" android:layout_alignParentTop="true" android:layout_alignParentRight="true"></TextView>
 	<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_location" android:layout_height="wrap_content" android:text="{location}" android:layout_below="@+id/wplist_item_name" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>
-
-	
 </RelativeLayout>
diff --git a/app/src/main/res/layout/available_layouts.xml b/app/src/main/res/layout/available_layouts.xml
index 564b8598..540744ee 100644
--- a/app/src/main/res/layout/available_layouts.xml
+++ b/app/src/main/res/layout/available_layouts.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:contentDescription="@string/prefs_ui_available_layout"
-    android:paddingTop="4dp">
+    android:fillViewport="true">
 
     <LinearLayout
         android:id="@+id/root_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" />
-</ScrollView>
\ No newline at end of file
+        android:orientation="vertical"
+        android:paddingTop="5dp" />
+</ScrollView>
diff --git a/app/src/main/res/layout/tracklist_item.xml b/app/src/main/res/layout/tracklist_item.xml
index 4308c5ae..c173862d 100644
--- a/app/src/main/res/layout/tracklist_item.xml
+++ b/app/src/main/res/layout/tracklist_item.xml
@@ -41,53 +41,73 @@
 			style="@android:style/TextAppearance.Large"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:autoSizeTextType="uniform"   
+			android:maxLines="1"       
 			android:text="{start_date}" />
 
-		<TextView
-			android:id="@+id/trackmgr_item_waypoints"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@+id/trackmgr_item_nameordate"
-			android:layout_marginEnd="3dp"
-			android:layout_marginRight="3dp"
-			android:text="@string/trackmgr_waypoints_count"
-			android:textStyle="bold" />
+		<LinearLayout
+        android:id="@+id/waypoints_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/trackmgr_item_nameordate"
+        android:orientation="horizontal">
 
-		<TextView
-			android:id="@+id/trackmgr_item_wps"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toEndOf="@id/trackmgr_item_waypoints"
-			android:layout_toRightOf="@id/trackmgr_item_waypoints"
-			android:text="{x}" />
+			<TextView
+				android:id="@+id/trackmgr_item_waypoints"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@+id/trackmgr_item_nameordate"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginEnd="3dp"
+				android:layout_marginRight="3dp"
+				android:text="@string/trackmgr_waypoints_count"
+				android:textStyle="bold" />
 
-		<TextView
-			android:id="@+id/trackmgr_item_trackpoints"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginEnd="3dp"
-			android:layout_marginRight="3dp"
-			android:layout_toEndOf="@id/trackmgr_item_wps"
-			android:layout_toRightOf="@id/trackmgr_item_wps"
-			android:text="@string/trackmgr_trackpoints_count"
-			android:textStyle="bold" />
+			<TextView
+				android:id="@+id/trackmgr_item_wps"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_toEndOf="@id/trackmgr_item_waypoints"
+				android:layout_toRightOf="@id/trackmgr_item_waypoints"
+				android:text="{x}" />
+		</LinearLayout>
 
-		<TextView
-			android:id="@+id/trackmgr_item_tps"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toEndOf="@id/trackmgr_item_trackpoints"
-			android:layout_toRightOf="@id/trackmgr_item_trackpoints"
-			android:text="{y}" />
+		<LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/waypoints_container"
+        android:orientation="horizontal">
+
+			<TextView
+				android:id="@+id/trackmgr_item_trackpoints"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginEnd="3dp"
+				android:layout_marginRight="3dp"
+				android:layout_toEndOf="@id/trackmgr_item_wps"
+				android:layout_toRightOf="@id/trackmgr_item_wps"
+				android:text="@string/trackmgr_trackpoints_count"
+				android:textStyle="bold" />
+
+			<TextView
+				android:id="@+id/trackmgr_item_tps"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_toEndOf="@id/trackmgr_item_trackpoints"
+				android:layout_toRightOf="@id/trackmgr_item_trackpoints"
+				android:text="{y}" />
+
+		</LinearLayout>
 
 	</RelativeLayout>