diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 69005bad..560dd9f2 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -498,12 +498,6 @@ export class GameScene extends DirtyScene {
 
         this.openChatIcon = new OpenChatIcon(this, 2, this.game.renderer.height - 2)
 
-        // FIXME: change this to use the UserInputManager class for input
-        // FIXME: Comment this feature because when user write M key in report input, the layout change.
-        /*this.input.keyboard.on('keyup-M', () => {
-            this.switchLayoutMode();
-        });*/
-
         this.reposition();
 
         // From now, this game scene will be notified of reposition events
@@ -1189,21 +1183,19 @@ ${escapedMessage}
     createCollisionWithPlayer() {
         //add collision layer
         for (const phaserLayer of this.gameMap.phaserLayers) {
-            if (phaserLayer.type == "tilelayer") {
-                this.physics.add.collider(this.CurrentPlayer, phaserLayer, (object1: GameObject, object2: GameObject) => {
-                    //this.CurrentPlayer.say("Collision with layer : "+ (object2 as Tile).layer.name)
+            this.physics.add.collider(this.CurrentPlayer, phaserLayer, (object1: GameObject, object2: GameObject) => {
+                //this.CurrentPlayer.say("Collision with layer : "+ (object2 as Tile).layer.name)
+            });
+            phaserLayer.setCollisionByProperty({collides: true});
+            if (DEBUG_MODE) {
+                //debug code to see the collision hitbox of the object in the top layer
+                phaserLayer.renderDebug(this.add.graphics(), {
+                    tileColor: null, //non-colliding tiles
+                    collidingTileColor: new Phaser.Display.Color(243, 134, 48, 200), // Colliding tiles,
+                    faceColor: new Phaser.Display.Color(40, 39, 37, 255) // Colliding face edges
                 });
-                phaserLayer.setCollisionByProperty({collides: true});
-                if (DEBUG_MODE) {
-                    //debug code to see the collision hitbox of the object in the top layer
-                    phaserLayer.renderDebug(this.add.graphics(), {
-                        tileColor: null, //non-colliding tiles
-                        collidingTileColor: new Phaser.Display.Color(243, 134, 48, 200), // Colliding tiles,
-                        faceColor: new Phaser.Display.Color(40, 39, 37, 255) // Colliding face edges
-                    });
-                }
-            //});
             }
+            //});
         }
     }
 
diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts
index 4fc58f5d..e5ca5023 100644
--- a/front/src/Phaser/Menu/MenuScene.ts
+++ b/front/src/Phaser/Menu/MenuScene.ts
@@ -112,8 +112,8 @@ export class MenuScene extends Phaser.Scene {
 
         this.gameReportElement = new ReportMenu(this, connectionManager.getConnexionType === GameConnexionTypes.anonymous);
         showReportScreenStore.subscribe((user) => {
-            this.closeAll();
             if (user !== null) {
+                this.closeAll();
                 this.gameReportElement.open(user.userId, user.userName);
             }
         });