diff --git a/src/de/bricked/main/Main.java b/src/de/bricked/main/Main.java
index 078a9554f45bab043d91620e5ae67b04e05c954f..cfee3935036318576980122f57f7677de8de4f0f 100644
--- a/src/de/bricked/main/Main.java
+++ b/src/de/bricked/main/Main.java
@@ -1,6 +1,6 @@
 package de.bricked.main;
 
-import java.util.Arrays;
+import java.io.File;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
@@ -13,8 +13,9 @@ import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import logger.LogLevel;
+import logger.FileOutputMode;
 import logger.Logger;
+import tools.PathUtils;
 import tools.Worker;
 
 public class Main extends Application
@@ -54,20 +55,23 @@ public class Main extends Application
 			Logger.error(e);
 		}
 	}
+	
+	@Override
+	public void init() throws Exception
+	{	
+		Parameters params = getParameters();
+		String logLevelParam = params.getNamed().get("loglevel");		
+		Logger.setLevel(logLevelParam);	
+		
+		File logFolder = new File(PathUtils.getOSindependentPath() + "deadspaghetti/" + bundle.getString("app.name"));			
+		PathUtils.checkFolder(logFolder);
+		Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
+		
+		Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
+	}
 
 	public static void main(String[] args)
 	{
-		if(Arrays.asList(args).contains("debug"))
-		{
-			Logger.setLevel(LogLevel.ALL);
-			Logger.info("Running in Debug Mode");
-			Logger.info(bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
-		}
-		else
-		{
-			Logger.setLevel(LogLevel.ERROR);
-		}
-		
 		launch(args);
 	}
 }
\ No newline at end of file
diff --git a/src/de/bricked/ui/Controller.java b/src/de/bricked/ui/Controller.java
index e8e37bea4792a927c920ee7ed919cde7bb872b91..3726c298a3e5b290bbd9a6be11d237bba572a56e 100644
--- a/src/de/bricked/ui/Controller.java
+++ b/src/de/bricked/ui/Controller.java
@@ -76,6 +76,9 @@ public class Controller
 		buttonAchievements.setStyle("-fx-base: " + bundle.getString("color.button"));
 		buttonAbout.setStyle("-fx-base: " + bundle.getString("color.button"));
 		
+		//TODO
+		buttonAchievements.setDisable(true);
+		
 		Logger.info("successfully started");
 	}	
 	
@@ -136,7 +139,7 @@ public class Controller
 	
 	public void showAchievements()
 	{
-
+		
 	}	
 	
 	public void showCommandLine()