diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java
index 395fa58b..07ac69a7 100644
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -109,11 +109,7 @@ public class PcView extends Activity {
 			public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
 					long id) {
 				ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
-				if (computer.details == null) {
-					// Placeholder item; no context menu for it
-					return;
-				}
-				else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+				if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
 					// Open the context menu if a PC is offline
 					openContextMenu(arg1);
 				}
@@ -141,13 +137,8 @@ public class PcView extends Activity {
 			}
 		});
 
-		if (pcGridAdapter.isEmpty()) {
-			addListPlaceholder();
-		}
-		else {
-            pcGridAdapter.notifyDataSetChanged();
-		}
-	}
+        pcGridAdapter.notifyDataSetChanged();
+    }
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -176,7 +167,7 @@ public class PcView extends Activity {
 						PcView.this.runOnUiThread(new Runnable() {
 							@Override
 							public void run() {
-								updateListView(details);
+								updateComputer(details);
 							}
 						});
 					}
@@ -505,7 +496,7 @@ public class PcView extends Activity {
     			return true;
     		}
         	managerBinder.removeComputer(computer.details.name);
-        	removeListView(computer.details);
+        	removeComputer(computer.details);
         	return true;
         	
         case APP_LIST_ID:
@@ -517,11 +508,7 @@ public class PcView extends Activity {
         }
     }
     
-    private void addListPlaceholder() {
-
-    }
-    
-    private void removeListView(ComputerDetails details) {
+    private void removeComputer(ComputerDetails details) {
 		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
 			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 			
@@ -530,26 +517,14 @@ public class PcView extends Activity {
 				break;
 			}
 		}
-		
-		if (pcGridAdapter.getCount() == 0) {
-			// Add the placeholder if we're down to 0 computers
-			addListPlaceholder();
-		}
     }
     
-	private void updateListView(ComputerDetails details) {
+	private void updateComputer(ComputerDetails details) {
 		ComputerObject existingEntry = null;
-		boolean placeholderPresent = false;
 		
 		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
 			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 			
-			// If there's a placeholder, there's nothing else
-			if (computer.details == null) {
-				placeholderPresent = true;
-				break;
-			}
-			
 			// Check if this is the same computer
 			if (details.equals(computer.details)) {
 				existingEntry = computer;
@@ -562,17 +537,12 @@ public class PcView extends Activity {
 			existingEntry.details = details;
 		}
 		else {
-			// If the placeholder is the only object, remove it
-			if (placeholderPresent) {
-                pcGridAdapter.removeComputer((ComputerObject) pcGridAdapter.getItem(0));
-			}
-			
 			// Add a new entry
             pcGridAdapter.addComputer(new ComputerObject(details));
+
+            // Notify the view that the data has changed
+            pcGridAdapter.notifyDataSetChanged();
 		}
-		
-		// Notify the view that the data has changed
-        pcGridAdapter.notifyDataSetChanged();
 	}
 	
 	public class ComputerObject {
diff --git a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java
index c8d2a219..145f4c2b 100644
--- a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java
@@ -49,7 +49,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
     @Override
     public View getView(int i, View convertView, ViewGroup viewGroup) {
         if (convertView == null) {
-            convertView = inflater.inflate(layoutId, null);
+            convertView = inflater.inflate(layoutId, viewGroup, false);
         }
 
         ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
diff --git a/app/src/main/res/drawable/computer.png b/app/src/main/res/drawable/computer.png
index c92475da..1b6abe7c 100644
Binary files a/app/src/main/res/drawable/computer.png and b/app/src/main/res/drawable/computer.png differ
diff --git a/app/src/main/res/layout/generic_grid_item.xml b/app/src/main/res/layout/generic_grid_item.xml
index 984651e9..3ee5a917 100644
--- a/app/src/main/res/layout/generic_grid_item.xml
+++ b/app/src/main/res/layout/generic_grid_item.xml
@@ -2,11 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="10dp">
+    android:padding="20dp">
     <ImageView
         android:id="@+id/grid_image"
         android:layout_centerHorizontal="true"
-        android:layout_width="100dp"
+        android:layout_width="150dp"
         android:layout_height="100dp">
     </ImageView>
     <TextView
@@ -14,6 +14,7 @@
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/grid_image"
+        android:layout_marginTop="10dp"
         android:layout_centerHorizontal="true"
         android:gravity="center"
         android:textSize="20sp" >