diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 9fa6f42..ca312ed 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -8,7 +8,7 @@
         android:id="@+id/image"
         android:layout_width="?android:attr/listPreferredItemHeight"
         android:layout_height="?android:attr/listPreferredItemHeight"
-	    android:layout_margin="4dip"
+	    android:padding="4dip"
         android:contentDescription="@string/album_art" />
         
     
diff --git a/src/com/github/nutomic/controldlna/MainActivity.java b/src/com/github/nutomic/controldlna/MainActivity.java
index 15e2d83..73d9d03 100644
--- a/src/com/github/nutomic/controldlna/MainActivity.java
+++ b/src/com/github/nutomic/controldlna/MainActivity.java
@@ -169,7 +169,7 @@ public class MainActivity extends SherlockFragmentActivity implements
 	 * Utility function to call RendererFragment.play from ServerFragment.
 	 */
 	public void play(List<Item> playlist, int start) {
-		getSupportActionBar().selectTab(getSupportActionBar().getTabAt(0));
+		getSupportActionBar().selectTab(getSupportActionBar().getTabAt(1));
 		mRendererFragment.setPlaylist(playlist, start);
 	}