diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
index 524a36df..d3bcbd7b 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
@@ -68,7 +68,6 @@ public void init() {
     public void shutdown(){
         clearSelectable();
         isInitialised = false;
-        initMap();
         rootNode.detachChild(rootNodeBoard);
     }
 
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java
index 95e0e4eb..4d417717 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java
@@ -54,7 +54,7 @@ public void select(Spatial model, ColorRGBA color, int width) {
     }
 
     private void hideOutlineFilterEffect(Spatial model) {
-        app.enqueue(() -> {
+//        app.enqueue(() -> {
             outlineFilter.setEnabled(false);
             outlineFilter.getOutlinePreFilter().setEnabled(false);
             fpp.removeFilter(outlineFilter);
@@ -62,12 +62,12 @@ private void hideOutlineFilterEffect(Spatial model) {
             outlineViewport.clearProcessors();
             renderManager.removePreView(outlineViewport);
             outlineViewport = null;
-            return null;
-        });
+//            return null;
+//        });
     }
 
     private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) {
-        app.enqueue(() -> {
+//        app.enqueue(() -> {
             outlineViewport = renderManager.createPreView("outlineViewport", cam);
             FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
 
@@ -82,7 +82,7 @@ private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color)
             outlineFilter.setOutlineWidth(width);
 
             fpp.addFilter(outlineFilter);
-            return null;
-        });
+//            return null;
+//        });
     }
 }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
index edd74e52..3d908271 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
@@ -90,11 +90,11 @@ public void onEnter() {
         app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test"));
         app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true));
         app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
-        app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
+//        app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
         app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD));
         app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
-        app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
-        app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
+//        app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
+//        app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
 
 //        app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification());
 //        app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2));
@@ -107,9 +107,10 @@ public void onEnter() {
 
     @Override
     public void onLeave() {
-        camera.shutdown();
         boardHandler.shutdown();
         guiHandler.shutdown();
+        camera.shutdown();
+
 
         confirmButton.hide();
 
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java
index bea0cbff..7b45665f 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java
@@ -51,8 +51,8 @@ public void enter() {
     }
 
     public void leave() {
-        app.getRootNode().detachChild(rootNode);
-        app.getGuiNode().detachChild(guiNode);
+        onLeave();
+
 
         settingsButton.hide();
 
@@ -60,7 +60,8 @@ public void leave() {
             pressEscape();
         }
 
-        onLeave();
+        app.getRootNode().detachChild(rootNode);
+        app.getGuiNode().detachChild(guiNode);
     }
 
     public void enterOverlay(Overlay overlay) {