diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.java b/src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.java
index 143a4aa..775475b 100644
--- a/src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.java
+++ b/src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.java
@@ -1,5 +1,6 @@
 package de.oszimt.ls.aliendefence.view.menue;
 
+import de.oszimt.ls.aliendefence.controller.AlienDefenceController;
 import de.oszimt.ls.aliendefence.controller.LevelController;
 import de.oszimt.ls.aliendefence.model.Level;
 
@@ -23,11 +24,11 @@ public class LevelChoice {
 
     /**
      * Create the panel
-     * @param lvlControl
+     * @param controller
      * @param leveldesignWindow
      */
-    public LevelChoice(LevelController lvlControl, LeveldesignWindow leveldesignWindow) {
-        this.lvlControl = lvlControl;
+    public LevelChoice(AlienDefenceController controller, LeveldesignWindow leveldesignWindow) {
+        this.lvlControl = controller.getLevelController();
         this.leveldesignWindow = leveldesignWindow;
 
         btnNewLevel.addActionListener(new ActionListener() {
diff --git a/src/de/oszimt/ls/aliendefence/view/menue/LevelEditor.java b/src/de/oszimt/ls/aliendefence/view/menue/LevelEditor.java
index 1a76b41..7024e5e 100644
--- a/src/de/oszimt/ls/aliendefence/view/menue/LevelEditor.java
+++ b/src/de/oszimt/ls/aliendefence/view/menue/LevelEditor.java
@@ -20,6 +20,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 
+import de.oszimt.ls.aliendefence.controller.AlienDefenceController;
 import de.oszimt.ls.aliendefence.controller.LevelController;
 import de.oszimt.ls.aliendefence.controller.TargetController;
 import de.oszimt.ls.aliendefence.model.Level;
@@ -50,11 +51,11 @@ public class LevelEditor extends JPanel {
 	/**
 	 * Create the frame.
 	 */
-	public LevelEditor(LeveldesignWindow leveldesignWindow, LevelController lvlControl, TargetController targetControl,
+	public LevelEditor(LeveldesignWindow leveldesignWindow, AlienDefenceController controller,
 			Level lvl) {
 		this.leveldesignWindow = leveldesignWindow;
-		this.lvlControl = lvlControl;
-		this.targetControl = targetControl;
+		this.lvlControl = controller.getLevelController();
+		this.targetControl = controller.getTargetController();
 		this.lvl = lvl;
 
 		setBorder(new EmptyBorder(5, 5, 5, 5));
diff --git a/src/de/oszimt/ls/aliendefence/view/menue/LeveldesignWindow.java b/src/de/oszimt/ls/aliendefence/view/menue/LeveldesignWindow.java
index 1eff0f1..4112547 100644
--- a/src/de/oszimt/ls/aliendefence/view/menue/LeveldesignWindow.java
+++ b/src/de/oszimt/ls/aliendefence/view/menue/LeveldesignWindow.java
@@ -6,8 +6,8 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 
+import de.oszimt.ls.aliendefence.controller.AlienDefenceController;
 import de.oszimt.ls.aliendefence.controller.LevelController;
-import de.oszimt.ls.aliendefence.controller.TargetController;
 import de.oszimt.ls.aliendefence.model.Level;
 
 @SuppressWarnings("serial")
@@ -15,7 +15,7 @@ public class LeveldesignWindow extends JFrame {
 
 	private LevelController lvlControl;
 	private JPanel contentPane;
-	private LevelChoice cardChooseLevel;
+	public LevelChoice levelChoice;
 	private LevelEditor cardLevelEditor;
 
 	private CardLayout cards;
@@ -23,8 +23,8 @@ public class LeveldesignWindow extends JFrame {
 	/**
 	 * Create the frame.
 	 */
-	public LeveldesignWindow(LevelController lvlControl, TargetController targetControl) {
-		this.lvlControl = lvlControl;
+	public LeveldesignWindow(AlienDefenceController controller) {
+		this.lvlControl = controller.getLevelController();
 
 		setTitle("Leveldesigner");
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
@@ -35,10 +35,10 @@ public class LeveldesignWindow extends JFrame {
 		this.cards = new CardLayout();
 		contentPane.setLayout(cards);
 
-		this.cardChooseLevel = new LevelChoice(lvlControl, this);
-		contentPane.add(cardChooseLevel.getPanel(), "levelChooser");
+		levelChoice = new LevelChoice(controller, this);
+		contentPane.add(levelChoice.getPanel(), "levelChooser");
 
-		this.cardLevelEditor = new LevelEditor(this, lvlControl, targetControl, Level.getDefaultLevel());
+		this.cardLevelEditor = new LevelEditor(this, controller, Level.getDefaultLevel());
 		contentPane.add(cardLevelEditor, "levelEditor");
 
 		this.showLevelChooser();
@@ -69,7 +69,7 @@ public class LeveldesignWindow extends JFrame {
 	 */
 	public void showLevelChooser() {
 		this.cards.show(contentPane, "levelChooser");
-		this.cardChooseLevel.updateTableData();
+		levelChoice.updateTableData();
 	}
 
 }
diff --git a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java
index 2c264d0..5f1c306 100644
--- a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java
+++ b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java
@@ -89,7 +89,7 @@ public class MainMenu {
         levelEditorButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                new LeveldesignWindow(alienDefenceController.getLevelController(), alienDefenceController.getTargetController());
+                new LeveldesignWindow(alienDefenceController);
             }
         });