diff --git a/audio/AudioPlayer.java b/audio/AudioPlayer.java
index c05b05f..f369516 100644
--- a/audio/AudioPlayer.java
+++ b/audio/AudioPlayer.java
@@ -15,6 +15,8 @@ public class AudioPlayer {
 
 	public void setClip(Song s) {
 		try {
+			if(clip!=null)
+				clip.close();
 			clip = null;
 			AudioInputStream ais = s.getAudioStream();
 			AudioFormat baseFormat = ais.getFormat();
diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java
index fb4b8d4..ef96c51 100644
--- a/model/gameState/MenuState.java
+++ b/model/gameState/MenuState.java
@@ -7,6 +7,7 @@ import java.awt.Polygon;
 import java.util.ArrayList;
 import java.util.List;
 
+import model.GameModel;
 import model.SongHandler;
 import model.objects.DifficultyButton;
 import model.objects.MenuButton;
@@ -74,12 +75,12 @@ public class MenuState extends GameState {
 	    	 }
 	    	 oldselected = selected;
 	    	 
-	    	 buttons2.clear();
+	    	buttons2.clear();
 	 		int instanceNr = 0;
-	 		for(SongInstance si : sh.getCurrentSong().getSongs()){
-	 			buttons2.add(new DifficultyButton(yPosDiffButton-instanceNr,si.getDifficulty(), Color.BLUE));
+	 		for(int i = sh.getCurrentSong().getSongs().size()-1; i>0; i--){
+	 			SongInstance si = sh.getCurrentSong().getSongs().get(i-1);
+	 			buttons2.add(new DifficultyButton(yPosDiffButton-instanceNr,si.getDifficulty(), GameModel.colors[i-1]));
 	 			instanceNr += 100;
-	 			System.out.println(sh.getCurrentSong().getSongs().size());
 	 		}
 	     }
 	}
@@ -153,6 +154,7 @@ public class MenuState extends GameState {
 	}
 	@Override
 	public void onJoystickMoved(JoystickEvent e) {
+		
 		if(subscreen){								//Screen for Song details
 				
 		}else{										//Screen for selecting song
@@ -162,7 +164,7 @@ public class MenuState extends GameState {
 				selected--;
 			}
 			sh.set(songs.indexOf(selectedToSong(selected)));
-			sh.play();	
+			sh.play(true);	
 		}
 	}