diff --git a/gen/com/limelight/R.java b/gen/com/limelight/R.java
index 38e1884a..1baa8d20 100644
--- a/gen/com/limelight/R.java
+++ b/gen/com/limelight/R.java
@@ -34,7 +34,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
     public static final class drawable {
         public static final int app_icon=0x7f020000;
         public static final int ic_launcher=0x7f020001;
-        public static final int list_view_border=0x7f020002;
+        public static final int list_view_unselected=0x7f020002;
         public static final int ouya_icon=0x7f020003;
     }
     public static final class id {
diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
index 405a6b9f..255fc1d3 100644
Binary files a/libs/limelight-common.jar and b/libs/limelight-common.jar differ
diff --git a/res/drawable/list_view_border.xml b/res/drawable/list_view_unselected.xml
similarity index 98%
rename from res/drawable/list_view_border.xml
rename to res/drawable/list_view_unselected.xml
index 50d484b8..5150c083 100644
--- a/res/drawable/list_view_border.xml
+++ b/res/drawable/list_view_unselected.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle" >
 
    <stroke android:width="1dip" android:color="#ffffff"/>
-
+   
 </shape>
diff --git a/res/layout/activity_app_view.xml b/res/layout/activity_app_view.xml
index 301e7bad..7345bbe9 100644
--- a/res/layout/activity_app_view.xml
+++ b/res/layout/activity_app_view.xml
@@ -9,18 +9,17 @@
     tools:context=".AppView" >
 
     <ListView
-        android:paddingTop="5dp"
         android:id="@+id/pcListView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:layout_below="@+id/appListText"
         android:fastScrollEnabled="true"
         android:longClickable="false"
-        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:background="@drawable/list_view_unselected"
         android:stackFromBottom="false">
-
     </ListView>
     
     <TextView
@@ -31,6 +30,7 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_alignParentTop="true"
         android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:text="Applications" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_pc_view.xml b/res/layout/activity_pc_view.xml
index 9ec5f82a..b7e68289 100644
--- a/res/layout/activity_pc_view.xml
+++ b/res/layout/activity_pc_view.xml
@@ -9,17 +9,17 @@
     tools:context=".PcView" >
 
     <ListView
-        android:paddingTop="5dp"
         android:id="@+id/pcListView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/discoveryText"
+        android:background="@drawable/list_view_unselected"
         android:fastScrollEnabled="true"
         android:longClickable="false"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:stackFromBottom="false">
+        android:stackFromBottom="false" >
 
     </ListView>
     
@@ -31,6 +31,7 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_below="@+id/settingsButton"
         android:paddingTop="20dp"
+        android:paddingBottom="10dp"
         android:text="Discovered PC List" />
 
     <Button
diff --git a/res/layout/simplerow.xml b/res/layout/simplerow.xml
index c053584a..102d6549 100644
--- a/res/layout/simplerow.xml
+++ b/res/layout/simplerow.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rowTextView"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
     android:padding="10dp"
-    android:textSize="16sp"
-    android:background="@drawable/list_view_border"
-    android:textIsSelectable="false" >
+    android:layout_height="wrap_content">
+    
+    <TextView
+        android:id="@+id/rowTextView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="false"
+        android:textSize="16sp" >
+    </TextView>
 
-</TextView>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/com/limelight/AppView.java b/src/com/limelight/AppView.java
index ef2787f8..622b2cbe 100644
--- a/src/com/limelight/AppView.java
+++ b/src/com/limelight/AppView.java
@@ -67,9 +67,10 @@ public class AppView extends Activity {
 		
 		// Setup the list view
 		appList = (ListView)findViewById(R.id.pcListView);
-		appListAdapter = new ArrayAdapter<AppObject>(this, R.layout.simplerow);
+		appListAdapter = new ArrayAdapter<AppObject>(this, R.layout.simplerow, R.id.rowTextView);
 		appListAdapter.setNotifyOnChange(false);
 		appList.setAdapter(appListAdapter);
+		appList.setItemsCanFocus(true);
 		appList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
diff --git a/src/com/limelight/PcView.java b/src/com/limelight/PcView.java
index 8cdd304c..fdd2b085 100644
--- a/src/com/limelight/PcView.java
+++ b/src/com/limelight/PcView.java
@@ -86,9 +86,10 @@ public class PcView extends Activity {
 		// Setup the list view
 		settingsButton = (Button)findViewById(R.id.settingsButton);
 		pcList = (ListView)findViewById(R.id.pcListView);
-		pcListAdapter = new ArrayAdapter<ComputerObject>(this, R.layout.simplerow);
+		pcListAdapter = new ArrayAdapter<ComputerObject>(this, R.layout.simplerow, R.id.rowTextView);
 		pcListAdapter.setNotifyOnChange(false);
         pcList.setAdapter(pcListAdapter);
+        pcList.setItemsCanFocus(true);
         pcList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,