diff --git a/src/main/res/layout/node_list_item.xml b/src/main/res/layout/node_list_item.xml
index d897ff1a..b1ea566b 100644
--- a/src/main/res/layout/node_list_item.xml
+++ b/src/main/res/layout/node_list_item.xml
@@ -7,9 +7,11 @@
 
 	<TextView
 			android:id="@+id/name"
-			android:layout_width="fill_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_alignParentLeft="true"
+			android:layout_toLeftOf="@+id/status"
 			android:lines="1"
 			android:ellipsize="end" />
 
@@ -19,7 +21,8 @@
 		android:layout_alignBottom="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceMedium" />
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:ellipsize="end" />
 
 	<TextView
 		android:id="@+id/download_title"
diff --git a/src/main/res/layout/repo_list_item.xml b/src/main/res/layout/repo_list_item.xml
index 1b1a3c2b..069e6e0e 100644
--- a/src/main/res/layout/repo_list_item.xml
+++ b/src/main/res/layout/repo_list_item.xml
@@ -7,17 +7,19 @@
 
 	<TextView
 			android:id="@+id/id"
-			android:layout_width="fill_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_alignParentLeft="true"
+			android:layout_toLeftOf="@+id/state"
 			android:lines="1"
 			android:ellipsize="end" />
 
 	<TextView
 		android:id="@+id/state"
-		android:textColor="#00ff00"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:layout_alignParentRight="true"
+		android:layout_alignBottom="@+id/id"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />
 
@@ -26,7 +28,8 @@
 		android:layout_below="@id/state"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
+		android:layout_height="wrap_content"
+		android:ellipsize="end" />
 
 	<TextView
 		android:id="@+id/items"