diff --git a/.classpath b/.classpath
index 4df10c0..ce20997 100644
--- a/.classpath
+++ b/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MAndEngine"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MAndEncryptor"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/Item.java b/src/Item.java
index edf34d5..1902ec5 100644
--- a/src/Item.java
+++ b/src/Item.java
@@ -198,7 +198,7 @@ public class Item {
 		int currentFileCount = 0; //TODO do dat later
 		
 		final int ROWS = 2;
-		final int COLUMNS = 3;
+		final int COLUMNS = 2;
 		
 		
 		for(int i = 0; i < ROWS; i ++) {
diff --git a/src/Viewer.java b/src/Viewer.java
index 0605a97..c0b7985 100644
--- a/src/Viewer.java
+++ b/src/Viewer.java
@@ -204,11 +204,20 @@ public class Viewer implements BasicApp {
 			g.setColor(new Color(35, 35, 35));
 			// g.setFont(Main.largerFont);
 
-			g.drawString(currentDirectoryVariable.getValue(), LEFT_BAR_WIDTH + THUMB_MARGIN, TOP_BAR_HEIGHT / 2 + 5);
+			g.drawString(currentDirectoryVariable.getValue(), LEFT_BAR_WIDTH + THUMB_MARGIN, TOP_BAR_HEIGHT / 2 - 3);
+			g.drawString(items.get(selection).getName(), LEFT_BAR_WIDTH + THUMB_MARGIN, TOP_BAR_HEIGHT / 2 + 9);
 
-			for (int i = 0; i < items.size(); i++)
+			final int SIZE = Viewer.THUMBNAIL_SIZE + THUMB_MARGIN;
+			int derp = 0;
+			
+			for (int i = ((int)(scroll - 1)); i < items.size(); i++) {
+				if(i >= 0)
 				g.drawImage(items.get(i).getThumbnail(), THUMB_MARGIN, -1 + (int) (THUMB_MARGIN + (i * FULL_WIDTH) - (scroll * FULL_WIDTH)), null);
-
+				derp ++;
+			}
+			
+			//g.drawString("" + derp, LEFT_BAR_WIDTH + THUMB_MARGIN, TOP_BAR_HEIGHT / 2 - 12);
+			
 			/*
 			 * g.setColor(Color.WHITE); g.drawRect(THUMB_MARGIN - 2, Y_OFFSET -
 			 * 2, THUMB_WIDTH + 3, THUMB_WIDTH + 3);