Worked on code architecture, edited music selection ui, worked on clipping text

core/src/zero1hd/polyjet/screens/MainMenu.java

@@ -67,7 +67,6 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter {
 						targetPosition.y = 0.5f*Gdx.graphics.getHeight();
 					}
 					moreOptionsPage.controlUnselect();
-					optionsPage.saveOptions(core.prefs);
 				}
 				return super.keyUp(event, keycode);
 			}
@@ -93,6 +92,14 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter {
 		super.show();
 	}
 	
+	@Override
+	public void hide() {
+		if (optionsPage != null) {
+			optionsPage.saveOptions(core.prefs);
+		}
+		super.hide();
+	}
+	
 	@Override
 	public void render(float delta) {
 		Gdx.gl.glClearColor(1f, 1f, 1f, 1f);

core/src/zero1hd/polyjet/screens/PreGameScreen.java

@@ -32,12 +32,12 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
 	
 	private MainMenu mainMenu;
 	
-	public PreGameScreen(final Polyjet core) {
+	public PreGameScreen(final Polyjet core, MainMenu mainMenu) {
 		this.core = core;
 		analyzer = new AudioAnalyzer();
 		rhythmMap = new RhythmMap(analyzer);
 		
-		mainMenu = (MainMenu) core.getScreen();
+		this.mainMenu = mainMenu;
 		
 		stage = new Stage();