diff --git a/src/control/button/Button.java b/src/control/button/Button.java
index bac6b79..765dd44 100644
--- a/src/control/button/Button.java
+++ b/src/control/button/Button.java
@@ -43,6 +43,4 @@ public class Button {
 	{
 		return buttonID;
 	}
-	
-	
 }
diff --git a/src/control/button/ButtonHandler.java b/src/control/button/ButtonHandler.java
index 5049b12..dde3294 100644
--- a/src/control/button/ButtonHandler.java
+++ b/src/control/button/ButtonHandler.java
@@ -23,12 +23,12 @@ public class ButtonHandler implements KeyListener{
 		buttons = new ArrayList<Button>();
 		
 		buttons.add(new Button(0, -1, led));
-		buttons.add(new Button(1, 5, led));
-		buttons.add(new Button(2, 4, led));
-		buttons.add(new Button(3, 3, led));
-		buttons.add(new Button(4, 2, led));
-		buttons.add(new Button(5, 1, led));
-		buttons.add(new Button(6, 0, led));
+		buttons.add(new Button(1, 2, led));
+		buttons.add(new Button(2, 1, led));
+		buttons.add(new Button(3, 0, led));
+		buttons.add(new Button(4, 3, led));
+		buttons.add(new Button(5, 4, led));
+		buttons.add(new Button(6, 5, led));
 		
 		for(Button b : buttons)
 		{
diff --git a/src/control/joystick/JoystickHandler.java b/src/control/joystick/JoystickHandler.java
index 9cb677f..5f25db8 100644
--- a/src/control/joystick/JoystickHandler.java
+++ b/src/control/joystick/JoystickHandler.java
@@ -76,10 +76,11 @@ public class JoystickHandler implements KeyListener{
 
 	@Override
 	public void keyPressed(KeyEvent e) {
+		System.out.println("Test " + e.getKeyCode());
 		if(e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN || e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_RIGHT)
 		{
 			Set<Integer> keysCopy = new HashSet<Integer>(keys);
-			
+			System.out.println("YES!");
 			keys.add(e.getKeyCode());
 			updateJoystickPosition();
 			
diff --git a/src/main/Main.java b/src/main/Main.java
index 1d7d5c5..6c45714 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -9,7 +9,7 @@ public class Main {
 		}
 		else
 		{
-			new Window(Boolean.getBoolean(args[0].toLowerCase()));
+			new Window(true);
 		}
 	}
 
diff --git a/src/main/Window.java b/src/main/Window.java
index a8b9d08..b9d315b 100644
--- a/src/main/Window.java
+++ b/src/main/Window.java
@@ -23,6 +23,7 @@ public class Window extends JFrame {
 		setSize(1280, 1024);
 		
 		this.ON_RASP = ON_RASP;
+		System.out.println(ON_RASP);
 		
 		//Set window close listener
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -39,7 +40,7 @@ public class Window extends JFrame {
 		//Create Events
 		LedHandler led = null;
 		
-		if(Window.ON_RASP) //TODO REMOVE
+		if(ON_RASP) //TODO REMOVE
 		{
 			led = new LedHandler();
 		}