diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java b/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java
index e6d3f3e..e3e70ad 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java
@@ -43,12 +43,10 @@ public abstract class BackgroundedGui extends Panel implements Gui {
 
     private void addBackground(String texture) {
         Picture bgImage = new Picture("Background");
+        bgImage.setPosition(0f, 0f);
+        bgImage.setImage(assetManager, texture, false);
         bgImage.setWidth(screen.getWidth());
         bgImage.setHeight(screen.getHeight());
-        bgImage.setImage(assetManager, texture, false);
-        Panel bg = new Panel(screen, new Vector2f(0f, 0f));
-        bg.centerToParent();
-        bg.attachChild(bgImage);
 
         this.attachChild(bgImage);
     }
diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java b/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
index a85b271..f75563e 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
@@ -87,11 +87,22 @@ public class SelectTrackState extends AbstractAppState implements SelectFileList
                 selectState++;
                 break;
             case 1:
-                JFileChooser jFileChooser = new JFileChooser();
-                int returnVal = jFileChooser.showOpenDialog(null);
+                JFileChooser jFileChooser = null;
+                String fileSelectFolder = optionSettings.getFileSelectFolder();
+                if (fileSelectFolder != null && !fileSelectFolder.isEmpty()) {
+                    jFileChooser = new JFileChooser(optionSettings.getFileSelectFolder());
+                } else {
+                    jFileChooser = new JFileChooser();
+                }
 
+                int returnVal = jFileChooser.showOpenDialog(null);
                 settings.setAudioFile(null);
                 if (returnVal == JFileChooser.APPROVE_OPTION) {
+                    String parentDictionary = jFileChooser.getSelectedFile().getParent();
+                    if (parentDictionary != null && !parentDictionary.isEmpty()) {
+                        optionSettings.setFileSelectFolder(parentDictionary);
+                        optionSettings.save();
+                    }
                     File file = jFileChooser.getSelectedFile();
                     settings.setVideoFile(file.getPath());
                     readMetadata(settings.getVideoFile());
diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java b/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java
index 073da41..db2af14 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java
@@ -136,6 +136,22 @@ public class OptionSettings {
         settings.putInteger("ParticleDensity", particleDensity);
     }
 
+    public void setFileSelectFolder(String fileSelectFolder) {
+        settings.putString("FileSelectFolder", fileSelectFolder);
+    }
+
+    public void setFirstLastPlayedTrack(String firstLastPlayedTrack) {
+        settings.putString("FirstLastPlayedTrack", firstLastPlayedTrack);
+    }
+
+    public void setSecondLastPlayedTrack(String secondLastPlayedTrack) {
+        settings.putString("SecondLastPlayedTrack", secondLastPlayedTrack);
+    }
+
+    public void setThirdLastPlayedTrack(String thirdLastPlayedTrack) {
+        settings.putString("ThirdLastPlayedTrack", thirdLastPlayedTrack);
+    }
+
     public String getUsername() {
         return settings.getString("Username");
     }
@@ -188,6 +204,22 @@ public class OptionSettings {
         return settings.getInteger("ParticleDensity");
     }
 
+    public String getFileSelectFolder() {
+        return settings.getString("FileSelectFolder");
+    }
+
+    public String getFirstLastPlayedTrack() {
+        return settings.getString("FirstLastPlayedTrack");
+    }
+
+    public String getSecondLastPlayedTrack() {
+        return settings.getString("SecondLastPlayedTrack");
+    }
+
+    public String getThirdLastPlayedTrack() {
+        return settings.getString("ThirdLastPlayedTrack");
+    }
+
     public void save() {
         try {
             OutputStream os = new FileOutputStream(PathHelper.CONFIG);