diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainScreen.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainScreen.java
index 72a4aa8..c7ffbf8 100755
--- a/desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainScreen.java
+++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainScreen.java
@@ -80,9 +80,6 @@ public class MainScreen extends ScreenAdapter implements ResizeReadyScreen {
 			draw();
 		}
 
-		draw();
-
-		
 		if (stage.getCamera().position.x != cameraPosition.x || stage.getCamera().position.y != cameraPosition.y) {
 			stage.getCamera().position.lerp(cameraPosition, delta*lerpAlpha);
 			stage.getViewport().apply();
@@ -129,10 +126,10 @@ public class MainScreen extends ScreenAdapter implements ResizeReadyScreen {
 		optionsPage = new OptionsPage(musicController, rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.returnToMainPageListener, listeners.graphicsPageButtonListener, listeners.keybindPageButtonListener);
 		stage.addActor(optionsPage);
 
-		keybindPage = new KeybindPage(rhythmBullet.getAssetManager(), rhythmBullet.getSkin(), listeners.returnToMainPageListener);
+		keybindPage = new KeybindPage(rhythmBullet.getAssetManager(), rhythmBullet.getSkin(), listeners.optionsPageButtonListener);
 		stage.addActor(keybindPage);
 
-		graphicsPage = new GraphicsPage(rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.returnToMainPageListener, listeners.bloomLevelShaderListener);
+		graphicsPage = new GraphicsPage(rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.optionsPageButtonListener, listeners.bloomLevelShaderListener);
 		stage.addActor(graphicsPage);
 		
 		creditsPage = new CreditsPage(rhythmBullet.getSkin());