diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 5d80679..6fbfaac 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -565,6 +565,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                 roomPosY = roomAmount / 2;
 
                 d.initVisited(roomAmount);
+                d.updateVisited(roomPosX, roomPosY);
             }
             else{ // Dungeon Exit
                 end = true;
@@ -1234,11 +1235,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         if(gs != null){
             if(!d.getPlayer().isToDelete()) {
 
-                if(!gs.click(screenX,screenY).contains(0) &&  !gs.click(screenX,screenY).contains(2)){
+                if(!gs.click(screenX,screenY).contains(0) || !gs.click(screenX,screenY).contains(2)){
                     d.getPlayer().setMovementX(0);
                 }
 
-                if(!gs.click(screenX,screenY).contains(1) &&!gs.click(screenX,screenY).contains(3)){
+                if(!gs.click(screenX,screenY).contains(1) || !gs.click(screenX,screenY).contains(3)){
                     d.getPlayer().setMovementY(0);
                 }
                 ArrayList<Integer> clicked = gs.click(screenX,screenY);
diff --git a/core/src/com/dungeoncrawler/model/Dungeon.java b/core/src/com/dungeoncrawler/model/Dungeon.java
index 55ae580..ee798e8 100644
--- a/core/src/com/dungeoncrawler/model/Dungeon.java
+++ b/core/src/com/dungeoncrawler/model/Dungeon.java
@@ -132,22 +132,30 @@ public class Dungeon {
 
         // left
         if(roomX > 0 && currentLevel.getRooms()[roomX - 1][roomY] != null){
-            isVisited[roomX - 1][roomY] = 1;
+            if(isVisited[roomX - 1][roomY] != 2) {
+                isVisited[roomX - 1][roomY] = 1;
+            }
         }
 
         // right
         if(roomX < currentLevel.getRooms().length - 1 && currentLevel.getRooms()[roomX + 1][roomY] != null){
-            isVisited[roomX + 1][roomY] = 1;
+            if(isVisited[roomX + 1][roomY] != 2) {
+                isVisited[roomX + 1][roomY] = 1;
+            }
         }
 
         // top
         if(roomY > 0 && currentLevel.getRooms()[roomX][roomY - 1] != null){
-            isVisited[roomX][roomY - 1] = 1;
+            if(isVisited[roomX][roomY - 1] != 2) {
+                isVisited[roomX][roomY - 1] = 1;
+            }
         }
 
         // bottom
         if(roomY < currentLevel.getRooms().length - 1 && currentLevel.getRooms()[roomX][roomY + 1] != null){
-            isVisited[roomX][roomY + 1] = 1;
+            if(isVisited[roomX][roomY + 1] != 2) {
+                isVisited[roomX][roomY + 1] = 1;
+            }
         }
     }
     
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index f244727..b985389 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -51,6 +51,14 @@ public class GameScreen {
 
         // MiniMap
         ShapeRenderer shapeRenderer;
+        Sprite miniMapContainer;
+
+        int mapX = 10;
+        int mapY = 310;
+        int gap = 2;
+        int rectWidth = 15;
+        int rectHeight = 10;
+        float alpha = 0.5f;
         
         Timer animations;
         Timer animatePlayer;
@@ -128,6 +136,8 @@ public class GameScreen {
                 mg.ichWillSpielen(m.getMaps());
 
                 shapeRenderer = new ShapeRenderer();
+                miniMapContainer = new Sprite(new Texture(Gdx.files.internal("sprites/miniMapContainer.png")));
+                miniMapContainer.setPosition(mapX - 10, mapY - 20);
                 
                 tm = new TiledMap();
                 tmr = new OrthogonalTiledMapRenderer(tm);
@@ -225,6 +235,7 @@ public class GameScreen {
             entities = e;
             
             this.p = p;
+
             
             //playerMoving = (p.getMovementX() != 0 || p.getMovementY() != 0);
 
@@ -308,17 +319,14 @@ public class GameScreen {
             for(Button button : controls){
                 button.getSprite().draw(batch);
             }
+
+            miniMapContainer.draw(batch);
             
             batch.end();
 
-            int mapX = 10;
-            int mapY = 320;
-            int gap = 2;
-            int rectWidth = 15;
-            int rectHeight = 10;
-
             Gdx.gl.glEnable(GL20.GL_BLEND);
             Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
+
             shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
 
             for(int i = 0; i < miniMap.length; i++){
@@ -326,23 +334,24 @@ public class GameScreen {
 
                     // current Room
                     if(i == roomPosX && j == roomPosY){
-                        shapeRenderer.setColor(Color.GREEN);
+                        shapeRenderer.setColor(0, 0.75f, 0, alpha);
                     }
                     // not found
                     else if(miniMap[i][j] == 0){
-                        shapeRenderer.setColor(Color.WHITE);
+                        shapeRenderer.setColor(0, 0, 0, alpha);
                     }
                     // found
                     else if(miniMap[i][j] == 1){
-                        shapeRenderer.setColor(Color.DARK_GRAY);
+                        shapeRenderer.setColor(0.2f, 0.2f, 0.2f, alpha);
                     }
                     // visited
                     else if(miniMap[i][j] == 2){
-                        shapeRenderer.setColor(Color.LIGHT_GRAY);
+                        shapeRenderer.setColor(0.5f, 0.5f, 0.5f, alpha);
                     }
 
-                    if(miniMap[i][j] != 0 || true) {
+                    if(miniMap[i][j] != 0) {
                         shapeRenderer.rect(i * gap + i * rectWidth + mapX, j * gap + j * rectHeight + mapY, rectWidth, rectHeight);
+                        shapeRenderer.setColor(Color.RED);
                     }
                 }
             }