diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3806c6a8f5..85a2414c01 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -89,7 +89,6 @@ services:
             ADMIN_API_TOKEN: "$ADMIN_API_TOKEN"
             API_URL: back:50051
             DISABLE_ANONYMOUS: $DISABLE_ANONYMOUS
-            #Map editor
             PUBLIC_MAP_STORAGE_URL: "http://map-storage.workadventure.localhost"
             INTERNAL_MAP_STORAGE_URL: "http://map-storage:3000"
             ENABLE_OPENAPI_ENDPOINT: "true"
diff --git a/docs/schema/1.0/wam.json b/docs/schema/1.0/wam.json
index 5360ea8fec..3c6d142a39 100644
--- a/docs/schema/1.0/wam.json
+++ b/docs/schema/1.0/wam.json
@@ -207,36 +207,6 @@
                         "type"
                       ],
                       "additionalProperties": false
-                    },
-                    {
-                      "type": "object",
-                      "properties": {
-                        "id": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/id"
-                        },
-                        "buttonLabel": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/buttonLabel"
-                        },
-                        "hideButtonLabel": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/hideButtonLabel"
-                        },
-                        "type": {
-                          "type": "string",
-                          "const": "entityDescriptionProperties"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "searchable": {
-                          "type": "boolean",
-                          "default": false
-                        }
-                      },
-                      "required": [
-                        "id",
-                        "type"
-                      ],
-                      "additionalProperties": false
                     }
                   ]
                 }
@@ -472,36 +442,6 @@
                         "speakerZoneName"
                       ],
                       "additionalProperties": false
-                    },
-                    {
-                      "type": "object",
-                      "properties": {
-                        "id": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/id"
-                        },
-                        "buttonLabel": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/buttonLabel"
-                        },
-                        "hideButtonLabel": {
-                          "$ref": "#/definitions/WAMFileFormat/properties/entities/additionalProperties/properties/properties/items/anyOf/0/properties/hideButtonLabel"
-                        },
-                        "type": {
-                          "type": "string",
-                          "const": "areaDescriptionProperties"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "searchable": {
-                          "type": "boolean",
-                          "default": false
-                        }
-                      },
-                      "required": [
-                        "id",
-                        "type"
-                      ],
-                      "additionalProperties": false
                     }
                   ]
                 }
@@ -580,112 +520,20 @@
           "type": "object",
           "properties": {
             "name": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "type": "string",
               "description": "The name of the map."
             },
             "description": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "type": "string",
               "description": "A description of the map. Can be used in social networks when sharing a link to the map."
             },
             "copyright": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "type": "string",
               "description": "Copyright notice for this map. Can be a link to a license. Parts of this map like tilesets or images can have their own copyright."
             },
             "thumbnail": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "type": "string",
               "description": "URL to a thumbnail image. This image will be used in social networks when sharing a link to the map."
-            },
-            "areasSearchable": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Number of areas define as searchable by the map editor for the exploration mode."
-            },
-            "entitiesSearchable": {
-              "anyOf": [
-                {
-                  "anyOf": [
-                    {
-                      "not": {}
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Number of entities define as searchable by the map editor for the exploration mode."
             }
           },
           "additionalProperties": false,
diff --git a/libs/map-editor/src/Commands/Command.ts b/libs/map-editor/src/Commands/Command.ts
index 2a580b16dc..1d04154c87 100644
--- a/libs/map-editor/src/Commands/Command.ts
+++ b/libs/map-editor/src/Commands/Command.ts
@@ -1,5 +1,4 @@
 import { v4 as uuidv4 } from "uuid";
-import { WAMFileFormat } from "../types";
 
 export abstract class Command {
     public readonly commandId: string;
@@ -8,6 +7,6 @@ export abstract class Command {
         this.commandId = commandId ?? uuidv4();
     }
 
-    public abstract execute(): Promise<void | undefined | WAMFileFormat>;
+    public abstract execute(): Promise<void>;
     //public abstract undo(): Promise<void>;
 }
diff --git a/libs/map-editor/src/Commands/Entity/UpdateEntityCommand.ts b/libs/map-editor/src/Commands/Entity/UpdateEntityCommand.ts
index 0e0adb2cbd..8718458b71 100644
--- a/libs/map-editor/src/Commands/Entity/UpdateEntityCommand.ts
+++ b/libs/map-editor/src/Commands/Entity/UpdateEntityCommand.ts
@@ -1,4 +1,4 @@
-import type { WAMEntityData, WAMFileFormat } from "../../types";
+import type { WAMEntityData } from "../../types";
 import type { GameMap } from "../../GameMap/GameMap";
 import { Command } from "../Command";
 
@@ -29,10 +29,10 @@ export class UpdateEntityCommand extends Command {
         this.newConfig = structuredClone(dataToModify);
     }
 
-    public execute(): Promise<undefined | WAMFileFormat> {
+    public execute(): Promise<void> {
         if (!this.gameMap.getGameMapEntities()?.updateEntity(this.entityId, this.newConfig)) {
             throw new Error(`MapEditorError: Could not execute UpdateEntity Command. Entity ID: ${this.entityId}`);
         }
-        return Promise.resolve(this.gameMap.getGameMapEntities()?.wamFile);
+        return Promise.resolve();
     }
 }
diff --git a/libs/map-editor/src/Commands/WAM/UpdateWAMMetadataCommand.ts b/libs/map-editor/src/Commands/WAM/UpdateWAMMetadataCommand.ts
deleted file mode 100644
index 12c2c215f9..0000000000
--- a/libs/map-editor/src/Commands/WAM/UpdateWAMMetadataCommand.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { ModifiyWAMMetadataMessage } from "@workadventure/messages";
-import { WAMFileFormat } from "../../types";
-import { Command } from "../Command";
-
-export class UpdateWAMMetadataCommand extends Command {
-    constructor(
-        protected wam: WAMFileFormat,
-        protected modifiyWAMMetadataMessage: ModifiyWAMMetadataMessage,
-        id?: string
-    ) {
-        super(id);
-    }
-
-    execute(): Promise<WAMFileFormat> {
-        if (!this.wam.metadata) {
-            this.wam.metadata = {};
-        }
-        this.wam.metadata.name = this.modifiyWAMMetadataMessage.name;
-        this.wam.metadata.description = this.modifiyWAMMetadataMessage.description;
-        this.wam.metadata.thumbnail = this.modifiyWAMMetadataMessage.thumbnail;
-        this.wam.metadata.copyright = this.modifiyWAMMetadataMessage.copyright;
-
-        if (!this.wam.vendor) {
-            this.wam.vendor = {
-                tags: Array<string>(),
-            };
-        }
-        (this.wam.vendor as { tags: Array<string> }).tags =
-            this.modifiyWAMMetadataMessage.tags && this.modifiyWAMMetadataMessage.tags.length > 0
-                ? this.modifiyWAMMetadataMessage.tags.split(",")
-                : [];
-        return Promise.resolve(this.wam);
-    }
-}
diff --git a/libs/map-editor/src/GameMap/GameMapEntities.ts b/libs/map-editor/src/GameMap/GameMapEntities.ts
index 06bfb312ff..d3b8a9e265 100644
--- a/libs/map-editor/src/GameMap/GameMapEntities.ts
+++ b/libs/map-editor/src/GameMap/GameMapEntities.ts
@@ -45,8 +45,4 @@ export class GameMapEntities {
     public getEntities(): Record<string, WAMEntityData> {
         return this.wam.entities;
     }
-
-    get wamFile(): WAMFileFormat {
-        return this.wam;
-    }
 }
diff --git a/libs/map-editor/src/index.ts b/libs/map-editor/src/index.ts
index d4e81ccd9f..c897001022 100644
--- a/libs/map-editor/src/index.ts
+++ b/libs/map-editor/src/index.ts
@@ -9,7 +9,6 @@ export * from "./Commands/Entity/UpdateEntityCommand";
 export * from "./Commands/Entity/CreateEntityCommand";
 export * from "./Commands/Entity/DeleteEntityCommand";
 export * from "./Commands/WAM/UpdateWAMSettingCommand";
-export * from "./Commands/WAM/UpdateWAMMetadataCommand";
 export * from "./Commands/Command";
 // MapFetcher is not exported because it is using Node imports that are not available in the browser
 //export * from "./MapFetcher";
diff --git a/libs/map-editor/src/types.ts b/libs/map-editor/src/types.ts
index b451f832aa..847160fd55 100644
--- a/libs/map-editor/src/types.ts
+++ b/libs/map-editor/src/types.ts
@@ -106,18 +106,6 @@ export const ListenerMegaphonePropertyData = PropertyBase.extend({
     chatEnabled: z.boolean().default(false),
 });
 
-export const EntityDescriptionPropertyData = PropertyBase.extend({
-    type: z.literal("entityDescriptionProperties"),
-    description: z.string().optional(),
-    searchable: z.boolean().default(false),
-});
-
-export const AreaDescriptionPropertyData = PropertyBase.extend({
-    type: z.literal("areaDescriptionProperties"),
-    description: z.string().optional(),
-    searchable: z.boolean().default(false),
-});
-
 export const AreaDataProperty = z.discriminatedUnion("type", [
     StartPropertyData,
     ExitPropertyData,
@@ -128,7 +116,6 @@ export const AreaDataProperty = z.discriminatedUnion("type", [
     OpenWebsitePropertyData,
     SpeakerMegaphonePropertyData,
     ListenerMegaphonePropertyData,
-    AreaDescriptionPropertyData,
 ]);
 
 export const AreaDataProperties = z.array(AreaDataProperty);
@@ -155,7 +142,6 @@ export const EntityDataProperty = z.discriminatedUnion("type", [
     JitsiRoomPropertyData,
     PlayAudioPropertyData,
     OpenWebsitePropertyData,
-    EntityDescriptionPropertyData,
 ]);
 
 export const EntityDataProperties = z.array(EntityDataProperty);
@@ -201,38 +187,24 @@ export const WAMEntityData = EntityData.omit({ prefab: true, id: true });
 export type WAMEntityData = z.infer<typeof WAMEntityData>;
 
 export const WAMMetadata = z.object({
-    name: z.string().optional().nullable().describe("The name of the map."),
+    name: z.string().optional().describe("The name of the map."),
     description: z
         .string()
         .optional()
-        .nullable()
         .describe("A description of the map. Can be used in social networks when sharing a link to the map."),
     copyright: z
         .string()
         .optional()
-        .nullable()
         .describe(
             "Copyright notice for this map. Can be a link to a license. Parts of this map like tilesets or images can have their own copyright."
         ),
     thumbnail: z
         .string()
         .optional()
-        .nullable()
         .describe(
             "URL to a thumbnail image. This image will be used in social networks when sharing a link to the map."
         ),
-    areasSearchable: z
-        .number()
-        .optional()
-        .nullable()
-        .describe("Number of areas define as searchable by the map editor for the exploration mode."),
-    entitiesSearchable: z
-        .number()
-        .optional()
-        .nullable()
-        .describe("Number of entities define as searchable by the map editor for the exploration mode."),
 });
-export type WAMMetadata = z.infer<typeof WAMMetadata>;
 
 export const WAMVendor = z
     .unknown()
@@ -316,8 +288,6 @@ export type MapsCacheSingleMapFormat = z.infer<typeof MapsCacheSingleMapFormat>;
 export type MapsCacheFileFormat = z.infer<typeof MapsCacheFileFormat>;
 export type SpeakerMegaphonePropertyData = z.infer<typeof SpeakerMegaphonePropertyData>;
 export type ListenerMegaphonePropertyData = z.infer<typeof ListenerMegaphonePropertyData>;
-export type EntityDescriptionPropertyData = z.infer<typeof EntityDescriptionPropertyData>;
-export type AreaDescriptionPropertyData = z.infer<typeof AreaDescriptionPropertyData>;
 
 export enum GameMapProperties {
     ALLOW_API = "allowApi",
diff --git a/libs/map-editor/tests/WAMMetadata.test.ts b/libs/map-editor/tests/WAMMetadata.test.ts
deleted file mode 100644
index dac4568ecc..0000000000
--- a/libs/map-editor/tests/WAMMetadata.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { describe, expect, it, assert } from "vitest";
-import { UpdateWAMMetadataCommand, WAMFileFormat } from "../src";
-
-describe("WAM Metadata", () => {
-    const defaultWamFile: WAMFileFormat = {
-        version: "1.0.0",
-        mapUrl: "testMapUrl",
-        entities: {},
-        areas: [],
-        entityCollections: [],
-    };
-    const dataToModify = {
-        name: "Test of room",
-        thumbnail: "Test of room thumbnail",
-        description: "Test of room description",
-        copyright: "Test of copyright",
-        tags: "admin,member",
-    };
-    it("should change WAM file loaded when WAMMetadata receive", async () => {
-        const wamFile: WAMFileFormat = { ...defaultWamFile };
-        const command = new UpdateWAMMetadataCommand(wamFile, dataToModify, "test-uuid");
-        await command.execute();
-        expect(wamFile.metadata).toBeDefined();
-        if (wamFile.metadata) {
-            expect(wamFile.metadata.name).toEqual(dataToModify.name);
-            expect(wamFile.metadata.description).toEqual(dataToModify.description);
-            expect(wamFile.metadata.copyright).toEqual(dataToModify.copyright);
-            expect(wamFile.metadata.thumbnail).toEqual(dataToModify.thumbnail);
-        } else {
-            assert.fail("wamFile.metadata is not defined");
-        }
-
-        if (wamFile.vendor) {
-            expect((wamFile.vendor as { tags: string[] }).tags).toBeDefined();
-            if ((wamFile.vendor as { tags: string[] }).tags) {
-                expect((wamFile.vendor as { tags: string[] }).tags).toEqual(dataToModify.tags.split(","));
-            } else {
-                assert.fail("wamFile.vendor.tags error");
-            }
-        } else {
-            assert.fail("wamFile.vendor is not defined");
-        }
-    });
-});
diff --git a/map-storage/src/MapStorageServer.ts b/map-storage/src/MapStorageServer.ts
index d90612af2c..c556d9435a 100644
--- a/map-storage/src/MapStorageServer.ts
+++ b/map-storage/src/MapStorageServer.ts
@@ -6,12 +6,12 @@ import {
     CreateEntityCommand,
     DeleteAreaCommand,
     DeleteEntityCommand,
+    EntityData,
     EntityDataProperties,
     UpdateAreaCommand,
     UpdateEntityCommand,
     UpdateWAMSettingCommand,
     WAMEntityData,
-    UpdateWAMMetadataCommand,
 } from "@workadventure/map-editor";
 import {
     EditMapCommandMessage,
@@ -118,7 +118,7 @@ const mapStorageServer: MapStorageServer = {
                     // NOTE: protobuf does not distinguish between null and empty array, we cannot create optional repeated value.
                     //       Because of that, we send additional "modifyProperties" flag set properties value as "undefined" so they won't get erased
                     //       by [] value which was supposed to be null.
-                    const dataToModify: AtLeast<AreaData, "id"> = structuredClone(message);
+                    const dataToModify: AtLeast<EntityData, "id"> = structuredClone(message);
                     if (!message.modifyProperties) {
                         dataToModify.properties = undefined;
                     }
@@ -126,7 +126,6 @@ const mapStorageServer: MapStorageServer = {
                     if (area) {
                         await mapsManager.executeCommand(
                             mapKey,
-                            mapUrl.host,
                             new UpdateAreaCommand(gameMap, dataToModify, commandId)
                         );
                     } else {
@@ -142,18 +141,13 @@ const mapStorageServer: MapStorageServer = {
                     };
                     await mapsManager.executeCommand(
                         mapKey,
-                        mapUrl.host,
                         new CreateAreaCommand(gameMap, areaObjectConfig, commandId)
                     );
                     break;
                 }
                 case "deleteAreaMessage": {
                     const message = editMapMessage.deleteAreaMessage;
-                    await mapsManager.executeCommand(
-                        mapKey,
-                        mapUrl.host,
-                        new DeleteAreaCommand(gameMap, message.id, commandId)
-                    );
+                    await mapsManager.executeCommand(mapKey, new DeleteAreaCommand(gameMap, message.id, commandId));
                     break;
                 }
                 case "modifyEntityMessage": {
@@ -170,7 +164,6 @@ const mapStorageServer: MapStorageServer = {
                     if (entity) {
                         await mapsManager.executeCommand(
                             mapKey,
-                            mapUrl.host,
                             new UpdateEntityCommand(gameMap, message.id, dataToModify, commandId)
                         );
                     } else {
@@ -182,7 +175,6 @@ const mapStorageServer: MapStorageServer = {
                     const message = editMapMessage.createEntityMessage;
                     await mapsManager.executeCommand(
                         mapKey,
-                        mapUrl.host,
                         new CreateEntityCommand(
                             gameMap,
                             message.id,
@@ -202,11 +194,7 @@ const mapStorageServer: MapStorageServer = {
                 }
                 case "deleteEntityMessage": {
                     const message = editMapMessage.deleteEntityMessage;
-                    await mapsManager.executeCommand(
-                        mapKey,
-                        mapUrl.host,
-                        new DeleteEntityCommand(gameMap, message.id, commandId)
-                    );
+                    await mapsManager.executeCommand(mapKey, new DeleteEntityCommand(gameMap, message.id, commandId));
                     break;
                 }
                 case "updateWAMSettingsMessage": {
@@ -217,30 +205,13 @@ const mapStorageServer: MapStorageServer = {
                         throw new Error("WAM is not defined");
                     }
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                    await mapsManager.executeCommand(
-                        mapKey,
-                        mapUrl.host,
-                        new UpdateWAMSettingCommand(wam, message, commandId)
-                    );
+                    await mapsManager.executeCommand(mapKey, new UpdateWAMSettingCommand(wam, message, commandId));
                     break;
                 }
                 case "errorCommandMessage": {
                     // Nothing to do, this message will never come from client
                     break;
                 }
-                case "modifiyWAMMetadataMessage": {
-                    const message = editMapMessage.modifiyWAMMetadataMessage;
-                    const wam = gameMap.getWam();
-                    if (!wam) {
-                        throw new Error("WAM is not defined");
-                    }
-                    await mapsManager.executeCommand(
-                        mapKey,
-                        mapUrl.host,
-                        new UpdateWAMMetadataCommand(wam, message, commandId)
-                    );
-                    break;
-                }
                 default: {
                     const _exhaustiveCheck: never = editMapMessage;
                 }
diff --git a/map-storage/src/MapsManager.ts b/map-storage/src/MapsManager.ts
index 2e87fe6bae..fb5df0d6b8 100644
--- a/map-storage/src/MapsManager.ts
+++ b/map-storage/src/MapsManager.ts
@@ -3,9 +3,6 @@ import { EditMapCommandMessage } from "@workadventure/messages";
 import { ITiledMap } from "@workadventure/tiled-map-type-guard";
 import * as Sentry from "@sentry/node";
 import { fileSystem } from "./fileSystem";
-import { MapListService } from "./Services/MapListService";
-import { WebHookService } from "./Services/WebHookService";
-import { WEB_HOOK_URL } from "./Enum/EnvironmentVariable";
 
 class MapsManager {
     private loadedMaps: Map<string, GameMap>;
@@ -14,8 +11,6 @@ class MapsManager {
     private saveMapIntervals: Map<string, NodeJS.Timer>;
     private mapLastChangeTimestamp: Map<string, number>;
 
-    private mapListService: MapListService;
-
     /**
      * Attempt to save the map from memory to file every time interval
      */
@@ -34,10 +29,9 @@ class MapsManager {
         this.loadedMapsCommandsQueue = new Map<string, EditMapCommandMessage[]>();
         this.saveMapIntervals = new Map<string, NodeJS.Timer>();
         this.mapLastChangeTimestamp = new Map<string, number>();
-        this.mapListService = new MapListService(fileSystem, new WebHookService(WEB_HOOK_URL));
     }
 
-    public async executeCommand(mapKey: string, domain: string, command: Command): Promise<void> {
+    public async executeCommand(mapKey: string, command: Command): Promise<void> {
         const gameMap = this.getGameMap(mapKey);
         if (!gameMap) {
             throw new Error('Could not find GameMap with key "' + mapKey + '"');
@@ -46,11 +40,7 @@ class MapsManager {
         if (!this.saveMapIntervals.has(mapKey)) {
             this.startSavingMapInterval(mapKey, this.AUTO_SAVE_INTERVAL_MS);
         }
-        const wamFile = await command.execute();
-        if (wamFile != undefined)
-            this.mapListService
-                .updateWAMFileInCache(domain, mapKey.replace(domain, ""), wamFile)
-                .catch((e) => console.error(e));
+        await command.execute();
     }
 
     public getCommandsNewerThan(mapKey: string, commandId: string | undefined): EditMapCommandMessage[] {
diff --git a/map-storage/src/Services/MapListService.ts b/map-storage/src/Services/MapListService.ts
index ecfea5984a..65157f19b0 100644
--- a/map-storage/src/Services/MapListService.ts
+++ b/map-storage/src/Services/MapListService.ts
@@ -1,9 +1,4 @@
-import {
-    AreaDescriptionPropertyData,
-    EntityDescriptionPropertyData,
-    MapsCacheFileFormat,
-    WAMFileFormat,
-} from "@workadventure/map-editor";
+import { MapsCacheFileFormat, WAMFileFormat } from "@workadventure/map-editor";
 import { WAMVersionHash } from "@workadventure/map-editor/src/WAMVersionHash";
 import pLimit from "p-limit";
 import * as Sentry from "@sentry/node";
@@ -116,30 +111,9 @@ export class MapListService {
             if (wamFilePath.startsWith("/")) {
                 wamFilePath = wamFilePath.substring(1);
             }
-
             cacheFile.maps[wamFilePath] = {
                 mapUrl: wamFile.mapUrl,
-                metadata: {
-                    ...wamFile.metadata,
-                    areasSearchable: wamFile.areas.reduce((nb, area) => {
-                        if (
-                            area.properties &&
-                            area.properties.find((property) => (property as AreaDescriptionPropertyData).searchable)
-                        ) {
-                            return nb + 1;
-                        }
-                        return nb;
-                    }, 0),
-                    entitiesSearchable: Object.values(wamFile.entities).reduce((nb, entity) => {
-                        if (
-                            entity.properties &&
-                            entity.properties.find((property) => (property as EntityDescriptionPropertyData).searchable)
-                        ) {
-                            return nb + 1;
-                        }
-                        return nb;
-                    }, 0),
-                },
+                metadata: wamFile.metadata,
                 vendor: wamFile.vendor,
             };
             await this.writeCacheFileNoLimit(domain, cacheFile);
diff --git a/messages/protos/messages.proto b/messages/protos/messages.proto
index 609cdf8fe3..eae7524a34 100644
--- a/messages/protos/messages.proto
+++ b/messages/protos/messages.proto
@@ -144,7 +144,6 @@ message EditMapMessage {
     DeleteEntityMessage deleteEntityMessage = 6;
     UpdateWAMSettingsMessage updateWAMSettingsMessage = 7;
     ErrorCommandMessage errorCommandMessage = 8;
-    ModifiyWAMMetadataMessage modifiyWAMMetadataMessage = 9;
   }
 }
 
@@ -274,14 +273,6 @@ message ReceivedEventMessage {
   optional int32 senderId = 3;
 }
 
-message ModifiyWAMMetadataMessage{
-  string name = 1;
-  optional string description = 2;
-  optional string copyright = 3;
-  optional string thumbnail = 4;
-  optional string tags = 5;
-}
-
 /************ BI-DIRECTIONAL MESSAGES **************/
 
 message ItemEventMessage {
@@ -412,11 +403,6 @@ message RoomShortDescription {
   string name = 1;
   string roomUrl = 2;
   optional string wamUrl = 3;
-  optional string description = 4;
-  optional string copyright = 5;
-  optional string thumbnail = 6;
-  optional int32 areasSearchable = 7;
-  optional int32 entitiesSearchable = 8;
 }
 
 message RoomsFromSameWorldAnswer {
diff --git a/play/public/resources/objects/cloud.mp3 b/play/public/resources/objects/cloud.mp3
deleted file mode 100644
index 1990a49017..0000000000
Binary files a/play/public/resources/objects/cloud.mp3 and /dev/null differ
diff --git a/play/src/front/Administration/AnalyticsClient.ts b/play/src/front/Administration/AnalyticsClient.ts
index 389f0dfb97..bc9fd6a1e6 100644
--- a/play/src/front/Administration/AnalyticsClient.ts
+++ b/play/src/front/Administration/AnalyticsClient.ts
@@ -673,29 +673,5 @@ class AnalyticsClient {
             })
             .catch((e) => console.error(e));
     }
-
-    openExplorationMode(): void {
-        this.posthogPromise
-            ?.then((posthog) => {
-                posthog.capture(`wa_map-exploration-open`);
-            })
-            .catch((e) => console.error(e));
-    }
-
-    closeExplorationMode(): void {
-        this.posthogPromise
-            ?.then((posthog) => {
-                posthog.capture(`wa_map-exploration-close`);
-            })
-            .catch((e) => console.error(e));
-    }
-
-    openedRoomList(): void {
-        this.posthogPromise
-            ?.then((posthog) => {
-                posthog.capture("wa-opened-room-list");
-            })
-            .catch((e) => console.error(e));
-    }
 }
 export const analyticsClient = new AnalyticsClient();
diff --git a/play/src/front/Components/ActionBar/ActionBar.svelte b/play/src/front/Components/ActionBar/ActionBar.svelte
index 153231eb57..7f4424689c 100644
--- a/play/src/front/Components/ActionBar/ActionBar.svelte
+++ b/play/src/front/Components/ActionBar/ActionBar.svelte
@@ -31,7 +31,7 @@
     import followImg from "../images/follow.png";
     import lockOpenImg from "../images/lock-opened.png";
     import lockCloseImg from "../images/lock-closed.png";
-    import mapBuilder from "../images/maps-builder.svg";
+    import mapBuilder from "../images/maps-builder.png";
     import screenshareOn from "../images/screenshare-on.png";
     import screenshareOff from "../images/screenshare-off.png";
     import emojiPickOn from "../images/emoji-on.png";
@@ -40,7 +40,6 @@
     import hammerImg from "../images/hammer.png";
     import megaphoneImg from "../images/megaphone.svg";
     import WorkAdventureImg from "../images/icon-workadventure-white.png";
-    import worldImg from "../images/world.svg";
     import { LayoutMode } from "../../WebRtc/LayoutManager";
     import { embedScreenLayoutStore } from "../../Stores/EmbedScreensStore";
     import { followRoleStore, followStateStore, followUsersStore } from "../../Stores/FollowStore";
@@ -63,6 +62,7 @@
         additionnalButtonsMenu,
         addClassicButtonActionBarEvent,
         addActionButtonActionBarEvent,
+        mapEditorActivated,
     } from "../../Stores/MenuStore";
     import {
         emoteDataStore,
@@ -80,7 +80,7 @@
     import { peerStore } from "../../Stores/PeerStore";
     import { StringUtils } from "../../Utils/StringUtils";
     import Tooltip from "../Util/Tooltip.svelte";
-    import { modalIframeStore, modalVisibilityStore, roomListVisibilityStore } from "../../Stores/ModalStore";
+    import { modalIframeStore, modalVisibilityStore } from "../../Stores/ModalStore";
     import { userHasAccessToBackOfficeStore } from "../../Stores/GameStore";
     import { AddButtonActionBarEvent } from "../../Api/Events/Ui/ButtonActionBarEvent";
     import { Emoji } from "../../Stores/Utils/emojiSchema";
@@ -189,7 +189,6 @@
 
     function toggleMapEditorMode() {
         if (isMobile) return;
-        if ($mapEditorModeStore) gameManager.getCurrentGameScene().getMapEditorModeManager().equipTool(undefined);
         analyticsClient.toggleMapEditor(!$mapEditorModeStore);
         mapEditorModeStore.switchMode(!$mapEditorModeStore);
     }
@@ -386,13 +385,6 @@
             mapEditorModeStore.set(false);
         }
     });
-
-    function showRoomList() {
-        resetChatVisibility();
-        resetModalVisibility();
-
-        roomListVisibilityStore.set(true);
-    }
 </script>
 
 <svelte:window on:keydown={onKeyDown} />
@@ -819,28 +811,34 @@
                         <img draggable="false" src={menuImg} style="padding: 2px" alt={$LL.menu.icon.open.menu()} />
                     </button>
                 </div>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <div on:dragstart|preventDefault={noDrag} on:click={toggleMapEditorMode} class="bottom-action-button">
-                    {#if isMobile}
-                        <Tooltip text={$LL.actionbar.mapEditorMobileLocked()} />
-                    {:else}
-                        <Tooltip text={$LL.actionbar.mapEditor()} />
-                    {/if}
-                    <button
-                        id="mapEditorIcon"
-                        class:border-top-light={$mapEditorModeStore && !isMobile}
-                        name="toggle-map-editor"
-                        disabled={isMobile}
+                {#if $mapEditorActivated}
+                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                    <div
+                        on:dragstart|preventDefault={noDrag}
+                        on:click={toggleMapEditorMode}
+                        class="bottom-action-button"
                     >
-                        <img
-                            draggable="false"
-                            src={mapBuilder}
-                            class:disable-opacity={isMobile}
-                            style="padding: 2px"
-                            alt="toggle-map-editor"
-                        />
-                    </button>
-                </div>
+                        {#if isMobile}
+                            <Tooltip text={$LL.actionbar.mapEditorMobileLocked()} />
+                        {:else}
+                            <Tooltip text={$LL.actionbar.mapEditor()} />
+                        {/if}
+                        <button
+                            id="mapEditorIcon"
+                            class:border-top-light={$mapEditorModeStore && !isMobile}
+                            name="toggle-map-editor"
+                            disabled={isMobile}
+                        >
+                            <img
+                                draggable="false"
+                                src={mapBuilder}
+                                class:disable-opacity={isMobile}
+                                style="padding: 2px"
+                                alt="toggle-map-editor"
+                            />
+                        </button>
+                    </div>
+                {/if}
                 {#if $userHasAccessToBackOfficeStore}
                     <!-- svelte-ignore a11y-click-events-have-key-events -->
                     <div
@@ -858,25 +856,6 @@
                 {/if}
             </div>
 
-            <div class="bottom-action-section tw-flex tw-flex-initial">
-                <!-- TODO button hep -->
-                <!-- Room list button -->
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <div
-                    on:dragstart|preventDefault={noDrag}
-                    on:click={() => analyticsClient.openedRoomList()}
-                    on:click={showRoomList}
-                    class="bottom-action-button"
-                >
-                    <Tooltip text="Open the room list" />
-
-                    <button id="roomListIcon" class:border-top-light={$roomListVisibilityStore}>
-                        <!-- svelte-ignore a11y-img-redundant-alt -->
-                        <img draggable="false" src={worldImg} style="padding: 2px" alt="Image for room list modal" />
-                    </button>
-                </div>
-            </div>
-
             {#if $addActionButtonActionBarEvent.length > 0}
                 <div class="bottom-action-section tw-flex tw-flex-initial">
                     {#each $addActionButtonActionBarEvent as button (button.id)}
diff --git a/play/src/front/Components/EmbedScreens/Layouts/MozaicLayout.svelte b/play/src/front/Components/EmbedScreens/Layouts/MozaicLayout.svelte
index 5acadee96d..b029d58fc6 100644
--- a/play/src/front/Components/EmbedScreens/Layouts/MozaicLayout.svelte
+++ b/play/src/front/Components/EmbedScreens/Layouts/MozaicLayout.svelte
@@ -41,7 +41,7 @@
             <MediaBox streamable={$myJitsiCameraStore} isClickable={false} />
         {/if}
     </div>
-    <div class="tw-absolute tw-self-end tw-z-[300] tw-bottom-6 md:tw-bottom-4 tw-right-5">
+    <div class="tw-absolute tw-self-end tw-z-[300] tw-bottom-6 md:tw-bottom-4 tw-right-5 ">
         {#if $myCameraStore && !displayFullMedias}
             <MyCamera />
         {/if}
diff --git a/play/src/front/Components/Exploration/Explorer.svelte b/play/src/front/Components/Exploration/Explorer.svelte
deleted file mode 100644
index 91eafa835b..0000000000
--- a/play/src/front/Components/Exploration/Explorer.svelte
+++ /dev/null
@@ -1,397 +0,0 @@
-<script lang="ts">
-    import { writable } from "svelte/store";
-    import { ChevronDownIcon } from "svelte-feather-icons";
-    import { onMount } from "svelte";
-    import { fly } from "svelte/transition";
-    import { LL } from "../../../i18n/i18n-svelte";
-    import visioSvg from "../images/loupe.svg";
-    import ExplorerImg from "../images/explorer.svg";
-    import AreaToolImg from "../images/icon-tool-area.png";
-    import EntityToolImg from "../images/icon-tool-entity.svg";
-    import {
-        mapExplorationEntitiesStore,
-        mapEditorVisibilityStore,
-        mapExplorationObjectSelectedStore,
-        mapExplorationAreasStore,
-    } from "../../Stores/MapEditorStore";
-    import { gameManager } from "../../Phaser/Game/GameManager";
-    import { Entity } from "../../Phaser/ECS/Entity";
-    import { AreaPreview } from "../../Phaser/Components/MapEditor/AreaPreview";
-    import { ExplorerTool } from "../../Phaser/Game/MapEditor/Tools/ExplorerTool";
-    import ListAddPropertyButton from "../MapEditor/PropertyEditor/ListAddPropertyButton.svelte";
-
-    let filter = "";
-    let selectFilters = writable<Array<string>>(new Array<string>());
-    let entitessListFiltered = writable<Map<string, Entity>>(new Map());
-    let areasListFiltered = writable<Map<string, AreaPreview>>(new Map());
-    let showSearchMode = false;
-
-    onMount(() => {
-        init();
-    });
-
-    function init() {
-        entitessListFiltered.set($mapExplorationEntitiesStore);
-        if ($mapExplorationAreasStore) areasListFiltered.set($mapExplorationAreasStore);
-    }
-
-    function onChangeFilterHandle() {
-        entitessListFiltered.set(new Map());
-        for (let [key, entity] of $mapExplorationEntitiesStore) {
-            // Check filter by name
-            if (filter && filter != "" && entity.getPrefab().name.toLowerCase().indexOf(filter.toLowerCase()) == -1)
-                continue;
-
-            // Check filter by properties
-            if ($selectFilters.length == 0) {
-                $entitessListFiltered.set(key, entity);
-                continue;
-            } else {
-                // Check if the entity has the selected properties
-                for (let filter of $selectFilters) {
-                    if (entity.getProperties().find((p) => p.type === filter)) $entitessListFiltered.set(key, entity);
-                }
-            }
-        }
-
-        areasListFiltered.set(new Map());
-        if ($mapExplorationAreasStore) {
-            for (let [key, area] of $mapExplorationAreasStore) {
-                // Set area if the name match the filter and if the area has the selected properties
-                if (filter && filter != "" && area.getAreaData().name.toLowerCase().indexOf(filter.toLowerCase()) == -1)
-                    continue;
-
-                // Check filter by properties
-                if ($selectFilters.length == 0) {
-                    $areasListFiltered.set(key, area);
-                    continue;
-                } else {
-                    // Check if the area has the selected properties
-                    for (let filter of $selectFilters) {
-                        if (area.getProperties().find((p) => p.type === filter)) $areasListFiltered.set(key, area);
-                    }
-                }
-            }
-        }
-    }
-
-    function explorationMode() {
-        mapEditorVisibilityStore.set(false);
-    }
-    function toggleSearchMode() {
-        showSearchMode = !showSearchMode;
-    }
-    function addFilter(filterName: string) {
-        selectFilters.update((filters) => {
-            if (filters.includes(filterName)) {
-                return filters.filter((f) => f !== filterName);
-            }
-            return [...filters, filterName];
-        });
-        onChangeFilterHandle();
-    }
-    let entityListActive = false;
-    let areaListActive = false;
-    function toggleEntityList() {
-        entityListActive = !entityListActive;
-    }
-    function toggleAreaList() {
-        areaListActive = !areaListActive;
-    }
-
-    function highlightEntity(entity: Entity) {
-        entity.setPointedToEditColor(0xf9e82d);
-        gameManager.getCurrentGameScene().getCameraManager().goToEntity(entity);
-        // Use explorer tool to define the zoom to center camera position
-        (
-            gameManager.getCurrentGameScene().getMapEditorModeManager().currentlyActiveTool as ExplorerTool
-        ).defineZoomToCenterCameraPosition();
-    }
-    function unhighlightEntity(entity: Entity) {
-        // Don't unhighlight if the entity is selected
-        if ($mapExplorationObjectSelectedStore == entity) return;
-
-        entity.setPointedToEditColor(0x000000);
-        gameManager.getCurrentGameScene().markDirty();
-    }
-    function highlightArea(area: AreaPreview) {
-        area.setStrokeStyle(2, 0xf9e82d);
-        gameManager.getCurrentGameScene().getCameraManager().goToAreaPreviex(area);
-        // Use explorer tool to define the zoom to center camera position
-        (
-            gameManager.getCurrentGameScene().getMapEditorModeManager().currentlyActiveTool as ExplorerTool
-        ).defineZoomToCenterCameraPosition();
-    }
-    function unhighlightArea(area: AreaPreview) {
-        // Don't unhighlight if the area is selected
-        if ($mapExplorationObjectSelectedStore == area) return;
-
-        area.setStrokeStyle(2, 0x000000);
-        gameManager.getCurrentGameScene().markDirty();
-    }
-</script>
-
-<div class="tw-flex tw-flex-col">
-    <div class="header-container">
-        <h3 class="tw-text-l tw-text-left">{$LL.mapEditor.explorer.title()}</h3>
-        {#if !showSearchMode}
-            <p in:fly={{ x: 100, duration: 250, delay: 200 }} out:fly={{ x: 100, duration: 200 }}>
-                {$LL.mapEditor.explorer.description()}
-            </p>
-        {/if}
-    </div>
-    <div class="tw-flex tw-flex-col tw-justify-center">
-        <div class="tw-flex tw-flex-wrap tw-justify-center tw-items-center">
-            {#if !showSearchMode}
-                <div
-                    class="properties-buttons tw-flex tw-flex-row tw-z-10"
-                    in:fly={{ x: 100, duration: 250, delay: 200 }}
-                    out:fly={{ x: 100, duration: 200 }}
-                >
-                    <button
-                        class="add-property-button tooltip tw-p-4 tw-flex tw-justify-center tw-items-center"
-                        on:click={explorationMode}
-                    >
-                        <div class="tw-w-10 tw-h-10 tw-flex tw-flex-wrap tw-items-center tw-justify-center">
-                            <img
-                                draggable="false"
-                                class="tw-max-w-[75%] tw-max-h-[75%]"
-                                src={ExplorerImg}
-                                alt="info icon"
-                            />
-                        </div>
-                        <span class="tooltiptext tw-text-xs">
-                            <p class="tw-text-sm tw-mb-2">{$LL.mapEditor.explorer.explorationModeTitle()}</p>
-                            {$LL.mapEditor.explorer.explorationModeDescription()}
-                        </span>
-                    </button>
-                </div>
-            {/if}
-            <div
-                class="properties-buttons tw-flex tw-flex-row tw-z-10"
-                in:fly={{ x: 100, duration: 250, delay: 200 }}
-                out:fly={{ x: 100, duration: 200 }}
-            >
-                <button
-                    class="add-property-button tooltip tw-p-4 tw-flex tw-justify-center tw-items-center"
-                    on:click={toggleSearchMode}
-                >
-                    <div class="tw-w-10 tw-h-10 tw-flex tw-flex-wrap tw-items-center tw-justify-center">
-                        <img draggable="false" class="tw-max-w-[75%] tw-max-h-[75%]" src={visioSvg} alt="info icon" />
-                    </div>
-                    <span class="tooltiptext tw-text-xs">
-                        <p class="tw-text-sm tw-mb-2">{$LL.mapEditor.explorer.searchModeTitle()}</p>
-                        {$LL.mapEditor.explorer.searchModeDescription()}
-                    </span>
-                </button>
-            </div>
-        </div>
-
-        {#if showSearchMode}
-            <div class="tw-flex tw-flex-col tw-justify-center tw-items-center">
-                <input
-                    class="filter-input tw-h-8 tw-m-5"
-                    type="search"
-                    bind:value={filter}
-                    on:input={onChangeFilterHandle}
-                    placeholder={$LL.mapEditor.entityEditor.itemPicker.searchPlaceholder()}
-                />
-            </div>
-
-            <div class="tw-flex tw-flex-row tw-overflow-y-hidden tw-overflow-x-scroll">
-                <ListAddPropertyButton
-                    property="jitsiRoomProperty"
-                    on:click={() => {
-                        addFilter("jitsiRoomProperty");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="playAudio"
-                    on:click={() => {
-                        addFilter("playAudio");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="openWebsite"
-                    on:click={() => {
-                        addFilter("openWebsite");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="speakerMegaphone"
-                    on:click={() => {
-                        addFilter("speakerMegaphone");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="listenerMegaphone"
-                    on:click={() => {
-                        addFilter("listenerMegaphone");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="exit"
-                    on:click={() => {
-                        addFilter("exit");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="start"
-                    on:click={() => {
-                        addFilter("silent");
-                    }}
-                />
-                <ListAddPropertyButton
-                    property="focusable"
-                    on:click={() => {
-                        addFilter("focusable");
-                    }}
-                />
-            </div>
-
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
-            <div
-                class="entities tw-p-4 tw-rounded-2xl tw-flex tw-flex-row tw-justify-around tw-items-center tw-cursor-pointer"
-                on:click={toggleEntityList}
-            >
-                <img class="tw-w-10 tw-h-auto tw-mr-2 tw-pointer-events-none" src={EntityToolImg} alt="link icon" />
-                {#if $entitessListFiltered.size > 0}
-                    <span class="tw-pointer-events-none"
-                        >{$entitessListFiltered.size}
-                        {$LL.mapEditor.explorer.entitiesFound($entitessListFiltered.size > 1)}</span
-                    >
-                {:else}
-                    <p>{$LL.mapEditor.explorer.noEntitiesFound()}</p>
-                {/if}
-                <ChevronDownIcon class="tw-pointer-events-none" size="32" />
-            </div>
-
-            {#if entityListActive && $entitessListFiltered.size > 0}
-                <div class="entity-items tw-p-4 tw-flex tw-flex-col">
-                    {#each [...$entitessListFiltered] as [key, entity] (key)}
-                        <!-- svelte-ignore a11y-click-events-have-key-events -->
-                        <div
-                            id={entity.entityId}
-                            on:mouseenter={() => highlightEntity(entity)}
-                            on:mouseleave={() => unhighlightEntity(entity)}
-                            on:click={() => mapExplorationObjectSelectedStore.set(entity)}
-                            class="item tw-p-4 tw-rounded-2xl tw-flex tw-flex-row tw-justify-around tw-items-center tw-cursor-pointer"
-                        >
-                            <img
-                                class="tw-w-10 tw-h-auto tw-mr-2 tw-pointer-events-none"
-                                src={entity.getPrefab().imagePath}
-                                alt="link icon"
-                            />
-                            <span class="tw-pointer-events-none tw-font-bold"
-                                >{entity.getEntityData().name ?? entity.getPrefab().name}</span
-                            >
-                        </div>
-                    {/each}
-                </div>
-            {/if}
-
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
-            <div
-                class="areas tw-p-4 tw-rounded-2xl tw-flex tw-flex-row tw-justify-around tw-items-center tw-cursor-pointer"
-                on:click={toggleAreaList}
-            >
-                <img class="tw-w-10 tw-h-auto tw-mr-2 tw-pointer-events-none" src={AreaToolImg} alt="link icon" />
-                {#if $areasListFiltered.size > 0}
-                    <span class="tw-pointer-events-none"
-                        >{$areasListFiltered.size}
-                        {$LL.mapEditor.explorer.areasFound($areasListFiltered.size > 1)}</span
-                    >
-                {:else}
-                    <p>{$LL.mapEditor.explorer.noAreasFound()}</p>
-                {/if}
-                <ChevronDownIcon class="tw-pointer-events-none" size="32" />
-            </div>
-            {#if areaListActive && $areasListFiltered.size > 0}
-                <div class="area-items tw-p-4 tw-flex tw-flex-col">
-                    {#if $areasListFiltered.size > 0}
-                        {#each [...$areasListFiltered] as [key, area] (key)}
-                            <!-- svelte-ignore a11y-click-events-have-key-events -->
-                            <div
-                                id={key}
-                                on:mouseenter={() => highlightArea(area)}
-                                on:mouseleave={() => unhighlightArea(area)}
-                                on:click={() => mapExplorationObjectSelectedStore.set(area)}
-                                class="item tw-p-4 tw-rounded-2xl tw-flex tw-flex-row tw-justify-around tw-items-center tw-cursor-pointer"
-                            >
-                                <img
-                                    class="tw-w-10 tw-h-auto tw-mr-2 tw-pointer-events-none"
-                                    src={AreaToolImg}
-                                    alt="link icon"
-                                />
-                                <span
-                                    class="tw-pointer-events-none tw-w-32"
-                                    class:tw-italic={!area.getAreaData().name || area.getAreaData().name == ""}
-                                    class:tw-font-bold={area.getAreaData().name && area.getAreaData().name != ""}
-                                >
-                                    {area.getAreaData().name || "No name"}
-                                </span>
-                            </div>
-                        {/each}
-                    {/if}
-                </div>
-            {/if}
-        {/if}
-    </div>
-</div>
-
-<style lang="scss">
-    .add-property-button {
-        --tw-border-opacity: 1;
-        border-color: rgb(77 75 103 / var(--tw-border-opacity));
-        --tw-bg-opacity: 1;
-        background-color: rgb(27 27 41 / var(--tw-bg-opacity));
-        --tw-text-opacity: 1;
-        color: gray;
-        border-radius: 10px;
-        position: relative;
-        display: flex;
-        flex-direction: column;
-
-        .tooltiptext {
-            top: 100%;
-            bottom: 0;
-            padding: 0.5rem 0.25rem;
-            height: fit-content;
-            &::after {
-                bottom: 100%;
-                top: auto;
-                transform: rotate(180deg);
-            }
-        }
-    }
-
-    button:disabled {
-        pointer-events: all;
-        cursor: default;
-
-        div {
-            cursor: default;
-        }
-
-        img {
-            opacity: 0.5;
-            cursor: default;
-        }
-        .tooltiptext {
-            cursor: default;
-        }
-    }
-
-    .entities,
-    .areas {
-        &:hover {
-            background-color: #4156f6;
-        }
-    }
-    .entity-items,
-    .area-items {
-        div:hover {
-            background-color: #4156f6;
-        }
-    }
-</style>
diff --git a/play/src/front/Components/Exploration/MapList.svelte b/play/src/front/Components/Exploration/MapList.svelte
deleted file mode 100644
index 11d973df30..0000000000
--- a/play/src/front/Components/Exploration/MapList.svelte
+++ /dev/null
@@ -1,135 +0,0 @@
-<script lang="ts">
-    import { fly } from "svelte/transition";
-    import { writable } from "svelte/store";
-    import { onMount } from "svelte";
-    import defaultMapImg from "../images/default-map.png";
-    import { roomListVisibilityStore } from "../../Stores/ModalStore";
-    import { gameManager } from "../../Phaser/Game/GameManager";
-    import { scriptUtils } from "../../Api/ScriptUtils";
-
-    interface RoomData {
-        name: string;
-        description?: string;
-        thumbnail?: string;
-        wamUrl: string | undefined;
-        roomUrl: string;
-        areasSearchable?: boolean;
-        entitiesSearchable?: boolean;
-    }
-
-    let search = "";
-    const currentRoomUrl = gameManager.getCurrentGameScene().room.href;
-    const roomList = new Map<string, RoomData>();
-    const roomListFiltered = writable<Map<string, RoomData>>(new Map<string, RoomData>());
-    const isFetching = writable<boolean>(false);
-    const isMoving = writable<boolean>(false);
-    const roomNameSelected = writable<string | undefined>(undefined);
-
-    async function fetchMaps(): Promise<void> {
-        try {
-            isFetching.set(true);
-            const response = await gameManager.getCurrentGameScene().connection?.queryRoomsFromSameWorld();
-            if (response) {
-                for (const room of response) {
-                    //const url = new URL(room.url);
-                    const map: RoomData = { ...room } as RoomData;
-                    roomList.set(room.roomUrl, map);
-                }
-            }
-        } catch (e) {
-            console.error(e);
-        } finally {
-            isFetching.set(false);
-            roomListFiltered.set(roomList);
-        }
-    }
-
-    onMount(async () => {
-        // Get the room list from the server
-        await fetchMaps();
-    });
-
-    function onUpdateSearch() {
-        // Filter the room list based on the search value and update the roomListFiltered
-        roomListFiltered.set(new Map<string, RoomData>());
-        for (const [roomUrl, roomData] of roomList) {
-            if (roomData.name.toLowerCase().indexOf(search.toLowerCase()) != -1) {
-                $roomListFiltered.set(roomUrl, roomData);
-            } else if (roomData.description?.toLowerCase().indexOf(search.toLowerCase()) != -1) {
-                $roomListFiltered.set(roomUrl, roomData);
-            }
-        }
-    }
-
-    function close() {
-        // Close the room list
-        roomListVisibilityStore.set(false);
-    }
-
-    function clickRoom(roomUrl: string, roomName: string) {
-        isMoving.set(true);
-        roomNameSelected.set(roomName);
-        // Use the room url to join the room
-        scriptUtils.goToPage(roomUrl);
-    }
-</script>
-
-<div
-    class="menu-container tw-bg-dark-purple/80 tw-backdrop-blur-sm tw-flex tw-flex-col tw-items-center tw-absolute tw-left-0 tw-top-0 tw-h-screen tw-w-screen tw-p-3"
-    transition:fly={{ x: 1000, duration: 500 }}
->
-    {#if $isMoving}
-        <h1>Moving to the room: {$roomNameSelected}... See you soon... 🫡</h1>
-    {:else}
-        <label for="search">Search a room</label>
-        <input id="search" type="text" placeholder="Value" bind:value={search} on:input={onUpdateSearch} />
-        <!-- room card -->
-        <div class="tw-flex tw-flex-wrap tw-justify-center tw-overflow-auto">
-            {#if $isFetching}
-                <h3>Room list is fetching... ⤵️</h3>
-            {/if}
-            {#if !$isFetching && $roomListFiltered.size == 0}
-                <h3>No Room found 🙅‍♂️</h3>
-            {/if}
-            {#each Array.from($roomListFiltered) as [roomUrl, roomData] (roomUrl)}
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <div
-                    id={roomUrl}
-                    class:active={currentRoomUrl == roomData.roomUrl}
-                    class="room-card tw-flex tw-flex-col tw-items-center tw-justify-center tw-cursor-pointer tw-rounded-xl tw-m-12 tw-p-12"
-                    on:click={() => clickRoom(roomData.roomUrl, roomData.name)}
-                >
-                    <img
-                        class="tw-pointer-events-none tw-rounded-full tw-h-56 tw-w-56 tw-mb-3"
-                        src={roomData.thumbnail ?? defaultMapImg}
-                        alt={roomData.description}
-                    />
-                    <span class="tw-pointer-events-none tw-text-2xl tw-font-bold tw-m-0">{roomData.name}</span>
-                    {#if roomData.areasSearchable || roomData.entitiesSearchable}
-                        <span class="tw-pointer-events-none tw-m-0"
-                            >{roomData.entitiesSearchable ?? 0} objets / {roomData.areasSearchable ?? 0}
-                            zones</span
-                        >
-                    {/if}
-                </div>
-            {/each}
-        </div>
-        <div
-            class="tw-bg-dark-purple/90 tw-backdrop-blur-sm tw-absolute tw-bottom-0 tw-left-0 tw-h-16 tw-w-screen tw-flex tw-justify-center tw-content-center tw-items-center"
-        >
-            <button class="light" on:click={close}>Close</button>
-        </div>
-    {/if}
-</div>
-
-<style lang="scss">
-    .room-card {
-        &.active {
-            background-color: rgb(86 234 255 / 0.3);
-        }
-        &:hover:not(.active) {
-            background-color: rgb(27 27 41 / 0.6);
-            transform: scale(1.1);
-        }
-    }
-</style>
diff --git a/play/src/front/Components/Input/InputTags.svelte b/play/src/front/Components/Input/InputTags.svelte
index e5514b21f8..03d23ee2e4 100644
--- a/play/src/front/Components/Input/InputTags.svelte
+++ b/play/src/front/Components/Input/InputTags.svelte
@@ -25,13 +25,13 @@
     function handleChange() {
         options = options.map((i) => {
             delete i.created;
-            return { ...i, label: i.label.toLowerCase() };
+            return { ...i, label: i.label.toLocaleUpperCase() };
         });
     }
 </script>
 
-<div class="input-tags tw-flex tw-flex-col tw-pb-5 tw-text-dark-purple">
-    <label for="selector" class="tw-text-white">
+<div class="input-tags">
+    <label for="selector">
         {label}
     </label>
     <Select
@@ -47,7 +47,6 @@
         on:blur={onBlur}
         showChevron={true}
         --icons-color="var(--brand-blue)"
-        --text-color="var(--brand-blue)"
     >
         <div slot="item" let:item>
             {item.created ? "Add new : " : ""}
diff --git a/play/src/front/Components/Input/InputText.svelte b/play/src/front/Components/Input/InputText.svelte
index 85ad463b2a..69c1c27787 100644
--- a/play/src/front/Components/Input/InputText.svelte
+++ b/play/src/front/Components/Input/InputText.svelte
@@ -6,10 +6,9 @@
     export let onBlur = () => {};
     export let onKeyPress: () => void;
     export let errorHelperText: string | undefined = undefined;
-    export let error = false;
 </script>
 
-<div class="tw-flex tw-flex-col">
+<div class="input-text">
     <label for="input">
         {label}
     </label>
@@ -21,8 +20,7 @@
         on:focus={onFocus}
         on:blur={onBlur}
         on:keypress={onKeyPress}
-        class:error={errorHelperText || error}
-        class:!tw-border-red-500={errorHelperText || error}
+        class:error={errorHelperText}
     />
     {#if errorHelperText}
         <span class="error">
diff --git a/play/src/front/Components/Input/InputTextArea.svelte b/play/src/front/Components/Input/InputTextArea.svelte
deleted file mode 100644
index 51af1a88c0..0000000000
--- a/play/src/front/Components/Input/InputTextArea.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-<script lang="ts">
-    export let label: string;
-    export let placeHolder = "";
-    export let value: string;
-    export let onFocus = () => {};
-    export let onBlur = () => {};
-    export let onKeyPress: () => void;
-    export let errorHelperText: string | undefined = undefined;
-</script>
-
-<div class="tw-flex tw-flex-col">
-    <label for="input">
-        {label}
-    </label>
-    <textarea
-        id="input"
-        placeholder={placeHolder}
-        bind:value
-        on:focus={onFocus}
-        on:blur={onBlur}
-        on:keypress={onKeyPress}
-        class:error={errorHelperText}
-    />
-    {#if errorHelperText}
-        <span class="error">
-            {errorHelperText}
-        </span>
-    {/if}
-</div>
diff --git a/play/src/front/Components/MainLayout.svelte b/play/src/front/Components/MainLayout.svelte
index fe782e867c..9a6af726ea 100644
--- a/play/src/front/Components/MainLayout.svelte
+++ b/play/src/front/Components/MainLayout.svelte
@@ -14,12 +14,7 @@
     import { banMessageStore } from "../Stores/TypeMessageStore/BanMessageStore";
     import { textMessageStore } from "../Stores/TypeMessageStore/TextMessageStore";
     import { soundPlayingStore } from "../Stores/SoundPlayingStore";
-    import {
-        showLimitRoomModalStore,
-        modalVisibilityStore,
-        modalPopupVisibilityStore,
-        roomListVisibilityStore,
-    } from "../Stores/ModalStore";
+    import { showLimitRoomModalStore, modalVisibilityStore } from "../Stores/ModalStore";
     import { actionsMenuStore } from "../Stores/ActionsMenuStore";
     import { showDesktopCapturerSourcePicker } from "../Stores/ScreenSharingStore";
     import { uiWebsitesStore } from "../Stores/UIWebsiteStore";
@@ -28,7 +23,6 @@
     import { proximityMeetingStore } from "../Stores/MyMediaStore";
     import { notificationPlayingStore } from "../Stores/NotificationStore";
     import { askDialogStore } from "../Stores/MeetingStore";
-    import { mapExplorationObjectSelectedStore } from "../Stores/MapEditorStore";
     import AudioManager from "./AudioManager/AudioManager.svelte";
     import ActionBar from "./ActionBar/ActionBar.svelte";
     import EmbedScreensContainer from "./EmbedScreens/EmbedScreensContainer.svelte";
@@ -52,9 +46,6 @@
     import HelpPopUpBlocked from "./HelpSettings/HelpPopUpBlocked.svelte";
     import Notification from "./UI/Notification.svelte";
     import MuteDialogBox from "./Video/AskedAction/MuteDialogBox.svelte";
-    import ObjectDetails from "./Modal/ObjectDetails.svelte";
-    import Popup from "./Modal/Popup.svelte";
-    import MapList from "./Exploration/MapList.svelte";
 
     let mainLayout: HTMLDivElement;
 
@@ -70,7 +61,7 @@
 
 <!-- Components ordered by z-index -->
 <div id="main-layout" class={[...$coWebsites.values()].length === 0 ? "not-cowebsite" : ""} bind:this={mainLayout}>
-    {#if $modalVisibilityStore || $modalPopupVisibilityStore}
+    {#if $modalVisibilityStore}
         <div class="tw-bg-black/60 tw-w-full tw-h-full tw-fixed tw-left-0 tw-right-0" />
     {/if}
 
@@ -157,17 +148,6 @@
         {#if $askDialogStore}
             <MuteDialogBox />
         {/if}
-
-        {#if $mapExplorationObjectSelectedStore}
-            <ObjectDetails />
-        {/if}
-
-        {#if $modalPopupVisibilityStore}
-            <Popup />
-        {/if}
-        {#if $roomListVisibilityStore}
-            <MapList />
-        {/if}
     </section>
 
     {#if $layoutManagerActionVisibilityStore}
diff --git a/play/src/front/Components/MapEditor/AreaPropertiesEditor.svelte b/play/src/front/Components/MapEditor/AreaPropertiesEditor.svelte
index 8812efb307..e963eb66e7 100644
--- a/play/src/front/Components/MapEditor/AreaPropertiesEditor.svelte
+++ b/play/src/front/Components/MapEditor/AreaPropertiesEditor.svelte
@@ -10,6 +10,14 @@
     import { KlaxoonEvent, KlaxoonService } from "@workadventure/shared-utils";
     import { LL } from "../../../i18n/i18n-svelte";
     import { mapEditorSelectedAreaPreviewStore } from "../../Stores/MapEditorStore";
+    import audioSvg from "../images/audio-white.svg";
+    import youtubeSvg from "../images/applications/icon_youtube.svg";
+    import klaxoonSvg from "../images/applications/icon_klaxoon.svg";
+    import googleDriveSvg from "../images/applications/icon_google_drive.svg";
+    import googleDocsSvg from "../images/applications/icon_google_docs.svg";
+    import googleSheetsSvg from "../images/applications/icon_google_sheets.svg";
+    import googleSlidesSvg from "../images/applications/icon_google_slides.svg";
+    import eraserSvg from "../images/applications/icon_eraser.svg";
     import { FEATURE_FLAG_BROADCAST_AREAS } from "../../Enum/EnvironmentVariable";
     import { analyticsClient } from "../../Administration/AnalyticsClient";
     import { connectionManager } from "../../Connection/ConnectionManager";
@@ -18,16 +26,14 @@
     import OpenWebsitePropertyEditor from "./PropertyEditor/OpenWebsitePropertyEditor.svelte";
     import FocusablePropertyEditor from "./PropertyEditor/FocusablePropertyEditor.svelte";
     import SilentPropertyEditor from "./PropertyEditor/SilentPropertyEditor.svelte";
+    import AddPropertyButton from "./PropertyEditor/AddPropertyButton.svelte";
     import SpeakerMegaphonePropertyEditor from "./PropertyEditor/SpeakerMegaphonePropertyEditor.svelte";
     import ListenerMegaphonePropertyEditor from "./PropertyEditor/ListenerMegaphonePropertyEditor.svelte";
     import StartPropertyEditor from "./PropertyEditor/StartPropertyEditor.svelte";
     import ExitPropertyEditor from "./PropertyEditor/ExitPropertyEditor.svelte";
-    import ListAddPropertyButton from "./PropertyEditor/ListAddPropertyButton.svelte";
 
     let properties: AreaDataProperties = [];
     let areaName = "";
-    let areaDescription = "";
-    let areaSearchable = false;
     let hasJitsiRoomProperty: boolean;
     let hasFocusableProperty: boolean;
     let hasSilentProperty: boolean;
@@ -36,26 +42,11 @@
     let hasStartProperty: boolean;
     let hasExitProperty: boolean;
     let hasplayAudioProperty: boolean;
-    let showDescriptionField = false;
 
     let selectedAreaPreviewUnsubscriber = mapEditorSelectedAreaPreviewStore.subscribe((currentAreaPreview) => {
         if (currentAreaPreview) {
             properties = structuredClone(currentAreaPreview.getProperties());
             areaName = currentAreaPreview.getAreaData().name;
-            const property = $mapEditorSelectedAreaPreviewStore
-                ?.getProperties()
-                .find((property) => property.type === "areaDescriptionProperties");
-            if (property == undefined) {
-                $mapEditorSelectedAreaPreviewStore?.addProperty({
-                    id: crypto.randomUUID(),
-                    type: "areaDescriptionProperties",
-                    description: areaDescription,
-                    searchable: areaSearchable,
-                });
-            } else if (property.type === "areaDescriptionProperties") {
-                areaDescription = property.description ?? "";
-                areaSearchable = property.searchable ?? false;
-            }
             refreshFlags();
         }
     });
@@ -214,32 +205,6 @@
         }
     }
 
-    function onUpdateAreaDescription() {
-        let properties = $mapEditorSelectedAreaPreviewStore
-            ?.getProperties()
-            .find((p) => p.type === "areaDescriptionProperties");
-        if (!properties || (properties && properties.type !== "areaDescriptionProperties"))
-            throw new Error("Wrong property type");
-
-        properties.description = areaDescription;
-        if ($mapEditorSelectedAreaPreviewStore) {
-            $mapEditorSelectedAreaPreviewStore.updateProperty(properties);
-        }
-    }
-
-    function onUpdateAreaSearchable() {
-        let properties = $mapEditorSelectedAreaPreviewStore
-            ?.getProperties()
-            .find((p) => p.type === "areaDescriptionProperties");
-        if (!properties || (properties && properties.type !== "areaDescriptionProperties"))
-            throw new Error("Wrong property type");
-
-        properties.searchable = areaSearchable;
-        if ($mapEditorSelectedAreaPreviewStore) {
-            $mapEditorSelectedAreaPreviewStore.updateProperty(properties);
-        }
-    }
-
     function onUpdateProperty(property: AreaDataProperty) {
         if ($mapEditorSelectedAreaPreviewStore) {
             $mapEditorSelectedAreaPreviewStore.updateProperty(property);
@@ -288,10 +253,6 @@
     function onUpdateAudioProperty(data: CustomEvent<PlayAudioPropertyData>) {
         onUpdateProperty(data.detail);
     }
-
-    function toggleDescriptionField() {
-        showDescriptionField = !showDescriptionField;
-    }
 </script>
 
 {#if $mapEditorSelectedAreaPreviewStore === undefined}
@@ -299,24 +260,33 @@
 {:else}
     <div class="properties-buttons tw-flex tw-flex-row tw-flex-wrap">
         {#if !hasFocusableProperty}
-            <ListAddPropertyButton
-                property="focusable"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.focusableProperties.label()}
+                descriptionText={$LL.mapEditor.properties.focusableProperties.description()}
+                img={"resources/icons/icon_focus.png"}
+                style="z-index: 14;"
                 on:click={() => {
                     onAddProperty("focusable");
                 }}
             />
         {/if}
         {#if !hasSilentProperty}
-            <ListAddPropertyButton
-                property="silent"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.silentProperty.label()}
+                descriptionText={$LL.mapEditor.properties.silentProperty.description()}
+                img={"resources/icons/icon_silent.png"}
+                style="z-index: 13;"
                 on:click={() => {
                     onAddProperty("silent");
                 }}
             />
         {/if}
         {#if !hasJitsiRoomProperty}
-            <ListAddPropertyButton
-                property="jitsiRoomProperty"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.jitsiProperties.label()}
+                descriptionText={$LL.mapEditor.properties.jitsiProperties.description()}
+                img={"resources/icons/icon_meeting.png"}
+                style="z-index: 12;"
                 on:click={() => {
                     onAddProperty("jitsiRoomProperty");
                 }}
@@ -324,16 +294,22 @@
         {/if}
         {#if FEATURE_FLAG_BROADCAST_AREAS}
             {#if !hasSpeakerMegaphoneProperty}
-                <ListAddPropertyButton
-                    property="speakerMegaphone"
+                <AddPropertyButton
+                    headerText={$LL.mapEditor.properties.speakerMegaphoneProperties.label()}
+                    descriptionText={$LL.mapEditor.properties.speakerMegaphoneProperties.description()}
+                    img={"resources/icons/icon_speaker.png"}
+                    style="z-index: 11;"
                     on:click={() => {
                         onAddProperty("speakerMegaphone");
                     }}
                 />
             {/if}
             {#if !hasListenerMegaphoneProperty}
-                <ListAddPropertyButton
-                    property="listenerMegaphone"
+                <AddPropertyButton
+                    headerText={$LL.mapEditor.properties.listenerMegaphoneProperties.label()}
+                    descriptionText={$LL.mapEditor.properties.listenerMegaphoneProperties.description()}
+                    img={"resources/icons/icon_listener.png"}
+                    style="z-index: 10;"
                     on:click={() => {
                         onAddProperty("listenerMegaphone");
                     }}
@@ -341,121 +317,137 @@
             {/if}
         {/if}
         {#if !hasStartProperty}
-            <ListAddPropertyButton
-                property="start"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.startProperties.label()}
+                descriptionText={$LL.mapEditor.properties.startProperties.description()}
+                img={"resources/icons/icon_start.png"}
+                style="z-index: 9;"
                 on:click={() => {
                     onAddProperty("start");
                 }}
             />
         {/if}
         {#if !hasExitProperty}
-            <ListAddPropertyButton
-                property="exit"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.exitProperties.label()}
+                descriptionText={$LL.mapEditor.properties.exitProperties.description()}
+                img={"resources/icons/icon_exit.png"}
+                style="z-index: 8;"
                 on:click={() => {
                     onAddProperty("exit");
                 }}
             />
         {/if}
         {#if !hasplayAudioProperty}
-            <ListAddPropertyButton
-                property="playAudio"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.audioProperties.label()}
+                descriptionText={$LL.mapEditor.properties.audioProperties.description()}
+                img={audioSvg}
+                style="z-index: 7;"
                 on:click={() => {
                     onAddProperty("playAudio");
                 }}
             />
         {/if}
-        <ListAddPropertyButton
-            property="openWebsite"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.linkProperties.label()}
+            descriptionText={$LL.mapEditor.properties.linkProperties.description()}
+            img={"resources/icons/icon_link.png"}
+            style="z-index: 6;"
             on:click={() => {
                 onAddProperty("openWebsite");
             }}
         />
     </div>
     <div class="properties-buttons tw-flex tw-flex-row tw-flex-wrap">
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="klaxoon"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.klaxoonProperties.label()}
+            descriptionText={connectionManager.currentRoom?.klaxoonToolActivated
+                ? $LL.mapEditor.properties.klaxoonProperties.description()
+                : $LL.mapEditor.properties.klaxoonProperties.disabled()}
+            img={klaxoonSvg}
+            style="z-index: 4;"
+            disabled={!connectionManager.currentRoom?.klaxoonToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "klaxoon");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="youtube"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.youtubeProperties.label()}
+            descriptionText={connectionManager.currentRoom?.youtubeToolActivated
+                ? $LL.mapEditor.properties.youtubeProperties.description()
+                : $LL.mapEditor.properties.youtubeProperties.disabled()}
+            img={youtubeSvg}
+            style="z-index: 5;"
+            disabled={!connectionManager.currentRoom?.youtubeToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "youtube");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleDrive"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleDriveProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleDocsToolActivated
+                ? $LL.mapEditor.properties.googleDriveProperties.description()
+                : $LL.mapEditor.properties.googleDriveProperties.disabled()}
+            img={googleDriveSvg}
+            style="z-index: 3;"
+            disabled={!connectionManager.currentRoom?.googleDocsToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleDrive");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleDocs"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleDocsProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleDocsToolActivated
+                ? $LL.mapEditor.properties.googleDocsProperties.description()
+                : $LL.mapEditor.properties.googleDocsProperties.disabled()}
+            img={googleDocsSvg}
+            style="z-index: 3;"
+            disabled={!connectionManager.currentRoom?.googleDocsToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleDocs");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleSheets"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleSheetsProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleSheetsToolActivated
+                ? $LL.mapEditor.properties.googleSheetsProperties.description()
+                : $LL.mapEditor.properties.googleSheetsProperties.disabled()}
+            img={googleSheetsSvg}
+            style="z-index: 2;"
+            disabled={!connectionManager.currentRoom?.googleSheetsToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleSheets");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleSlides"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleSlidesProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleSlidesToolActivated
+                ? $LL.mapEditor.properties.googleSlidesProperties.description()
+                : $LL.mapEditor.properties.googleSlidesProperties.disabled()}
+            img={googleSlidesSvg}
+            style="z-index: 1;"
+            disabled={!connectionManager.currentRoom?.googleSlidesToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleSlides");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="eraser"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.eraserProperties.label()}
+            descriptionText={connectionManager.currentRoom?.eraserToolActivated
+                ? $LL.mapEditor.properties.eraserProperties.description()
+                : $LL.mapEditor.properties.eraserProperties.disabled()}
+            img={eraserSvg}
+            style="z-index: 1;"
+            disabled={!connectionManager.currentRoom?.eraserToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "eraser");
             }}
         />
     </div>
     <div class="area-name-container">
-        <label for="objectName">{$LL.mapEditor.areaEditor.nameLabel()}</label>
-        <input
-            id="objectName"
-            type="text"
-            placeholder={$LL.mapEditor.areaEditor.nameLabelPlaceholder()}
-            bind:value={areaName}
-            on:change={onUpdateName}
-        />
-    </div>
-    <div class="area-name-container">
-        {#if !showDescriptionField}
-            <a href="#addDescriptionField" on:click|preventDefault|stopPropagation={toggleDescriptionField}
-                >+ {$LL.mapEditor.areaEditor.addDescriptionField()}</a
-            >
-        {:else}
-            <label for="objectDescription">{$LL.mapEditor.areaEditor.areaDescription()}</label>
-            <textarea
-                id="objectDescription"
-                placeholder={$LL.mapEditor.areaEditor.areaDescriptionPlaceholder()}
-                bind:value={areaDescription}
-                on:change={onUpdateAreaDescription}
-            />
-        {/if}
-    </div>
-    <div class="value-switch">
-        <label for="searchable">{$LL.mapEditor.areaEditor.areaSerchable()}</label>
-        <input
-            id="searchable"
-            type="checkbox"
-            class="input-switch"
-            bind:checked={areaSearchable}
-            on:change={onUpdateAreaSearchable}
-        />
+        <label for="objectName">Area name</label>
+        <input id="objectName" type="text" placeholder="Value" bind:value={areaName} on:change={onUpdateName} />
     </div>
     <div class="properties-container">
         {#each properties as property (property.id)}
@@ -570,69 +562,4 @@
             margin-bottom: 0;
         }
     }
-
-    .input-switch {
-        position: relative;
-        top: 0px;
-        right: 0px;
-        bottom: 0px;
-        left: 0px;
-        display: inline-block;
-        height: 1rem;
-        width: 2rem;
-        -webkit-appearance: none;
-        -moz-appearance: none;
-        appearance: none;
-        border-radius: 9999px;
-        border-width: 1px;
-        border-style: solid;
-        --tw-border-opacity: 1;
-        border-color: rgb(77 75 103 / var(--tw-border-opacity));
-        --tw-bg-opacity: 1;
-        background-color: rgb(15 31 45 / var(--tw-bg-opacity));
-        background-image: none;
-        padding: 0px;
-        --tw-text-opacity: 1;
-        color: rgb(242 253 255 / var(--tw-text-opacity));
-        outline: 2px solid transparent;
-        outline-offset: 2px;
-        cursor: url(/src/front/style/images/cursor_pointer.png), pointer;
-    }
-
-    .input-switch::before {
-        position: absolute;
-        left: -3px;
-        top: -3px;
-        height: 1.25rem;
-        width: 1.25rem;
-        border-radius: 9999px;
-        --tw-bg-opacity: 1;
-        background-color: rgb(146 142 187 / var(--tw-bg-opacity));
-        transition-property: all;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        --tw-content: "";
-        content: var(--tw-content);
-    }
-
-    .input-switch:checked {
-        --tw-border-opacity: 1;
-        border-color: rgb(146 142 187 / var(--tw-border-opacity));
-    }
-
-    .input-switch:checked::before {
-        left: 13px;
-        top: -3px;
-        --tw-bg-opacity: 1;
-        background-color: rgb(65 86 246 / var(--tw-bg-opacity));
-        content: var(--tw-content);
-        /*--tw-shadow: 0 0 7px 0 rgba(4, 255, 210, 1);
-        --tw-shadow-colored: 0 0 7px 0 var(--tw-shadow-color);
-        box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);*/
-    }
-
-    .input-switch:disabled {
-        cursor: not-allowed;
-        opacity: 0.4;
-    }
 </style>
diff --git a/play/src/front/Components/MapEditor/ConfigureMyRoom/RoomSettings.svelte b/play/src/front/Components/MapEditor/ConfigureMyRoom/RoomSettings.svelte
deleted file mode 100644
index f6ea7d8bab..0000000000
--- a/play/src/front/Components/MapEditor/ConfigureMyRoom/RoomSettings.svelte
+++ /dev/null
@@ -1,127 +0,0 @@
-<script lang="ts">
-    import { InfoIcon } from "svelte-feather-icons";
-    import { onMount } from "svelte";
-    import { writable } from "svelte/store";
-    import { LL } from "../../../../i18n/i18n-svelte";
-    import InputText from "../../Input/InputText.svelte";
-    import { gameManager } from "../../../Phaser/Game/GameManager";
-    import InputTextArea from "../../Input/InputTextArea.svelte";
-    import InputTags from "../../Input/InputTags.svelte";
-    import { UpdateWAMMetadataFrontCommand } from "../../../Phaser/Game/MapEditor/Commands/WAM/UpdateWAMMetadataFrontCommand";
-    import ButtonState from "../../Input/ButtonState.svelte";
-
-    type Option = {
-        value: string;
-        label: string;
-        created: undefined | boolean;
-    };
-
-    let dynamicStrings = {
-        error: {
-            name: false,
-            confirmSave: false,
-        },
-    };
-    let name = "";
-    let description = "";
-    let thumbnail = "";
-    let copyright = "";
-    let tags: Option[] = [];
-    let _tag: Option[] = [
-        {
-            value: "member",
-            label: "member",
-            created: false,
-        },
-        {
-            value: "admin",
-            label: "admin",
-            created: false,
-        },
-    ];
-
-    let confirmSaving = writable<boolean>(false);
-
-    onMount(() => {
-        name = gameManager.getCurrentGameScene()?.wamFile?.metadata?.name ?? "";
-        description = gameManager.getCurrentGameScene()?.wamFile?.metadata?.description ?? "";
-        thumbnail = gameManager.getCurrentGameScene()?.wamFile?.metadata?.thumbnail ?? "";
-        copyright = gameManager.getCurrentGameScene()?.wamFile?.metadata?.copyright ?? "";
-        (gameManager.getCurrentGameScene()?.wamFile?.vendor as { tags: string[] })?.tags?.forEach((tag) => {
-            tags.push({ value: tag, label: tag, created: false });
-            _tag.push({ value: tag, label: tag, created: false });
-        });
-    });
-
-    async function save(): Promise<string> {
-        if (!name) {
-            dynamicStrings.error.name = true;
-            return Promise.reject(new Error("You must enter a name"));
-        }
-        if (!$confirmSaving) {
-            dynamicStrings.error.confirmSave = true;
-            return Promise.reject(new Error("You must confirm saving"));
-        }
-        try {
-            dynamicStrings.error.confirmSave = false;
-            dynamicStrings.error.name = false;
-
-            const roomConnection = gameManager.getCurrentGameScene()?.connection;
-            if (roomConnection == undefined) throw new Error("No connection");
-            new UpdateWAMMetadataFrontCommand({
-                name,
-                description,
-                thumbnail,
-                copyright,
-                tags: tags != undefined && tags.length > 1 ? tags.map((tag) => tag.value).join(",") : undefined,
-            }).emitEvent(roomConnection);
-            return Promise.resolve($LL.mapEditor.settings.room.actions.success());
-        } catch (e) {
-            console.error(e);
-            return Promise.reject($LL.mapEditor.settings.room.actions.error());
-        }
-    }
-</script>
-
-<div class="tw-flex tw-flex-col">
-    <h3>{$LL.mapEditor.settings.room.title()}</h3>
-    <InputText
-        label={$LL.mapEditor.settings.room.inputs.name()}
-        placeHolder="MySpace"
-        bind:value={name}
-        onKeyPress={() => (dynamicStrings.error.name = false)}
-        error={dynamicStrings.error.name}
-    />
-    <p class="help-text"><InfoIcon size="18" /> {$LL.mapEditor.settings.room.helps.description()}</p>
-    <InputTextArea
-        label={$LL.mapEditor.settings.room.inputs.description()}
-        placeHolder="MySpace"
-        bind:value={description}
-        onKeyPress={() => {}}
-    />
-    <p class="help-text"><InfoIcon size="18" /> {$LL.mapEditor.settings.room.helps.tags()}</p>
-    <InputTags label={$LL.mapEditor.settings.room.inputs.tags()} options={_tag} bind:value={tags} />
-    <p class="help-text"><InfoIcon size="18" /> {$LL.mapEditor.settings.room.helps.copyright()}</p>
-    <InputTextArea
-        label={$LL.mapEditor.settings.room.inputs.copyright()}
-        placeHolder="MySpace"
-        bind:value={copyright}
-        onKeyPress={() => {}}
-    />
-
-    <div class="tw-flex tw-flex-row tw-justify-center">
-        <input
-            id="confirm-save"
-            type="checkbox"
-            class:tw-border-danger-1000={dynamicStrings.error.confirmSave}
-            bind:checked={$confirmSaving}
-        />
-        <label for="confirm-save" class="tw-ml-2" class:tw-text-danger-1000={dynamicStrings.error.confirmSave}>
-            {$LL.mapEditor.settings.room.confirmSave()}
-        </label>
-    </div>
-
-    <div class="tw-flex tw-flex-row tw-justify-center">
-        <ButtonState promise={save} initialText={$LL.menu.settings.save()} loadingText="Saving" />
-    </div>
-</div>
diff --git a/play/src/front/Components/MapEditor/EntityPropertiesEditor.svelte b/play/src/front/Components/MapEditor/EntityPropertiesEditor.svelte
index 403af82b9e..ffbcc4509e 100644
--- a/play/src/front/Components/MapEditor/EntityPropertiesEditor.svelte
+++ b/play/src/front/Components/MapEditor/EntityPropertiesEditor.svelte
@@ -4,7 +4,6 @@
         EntityDataProperties,
         EntityDataPropertiesKeys,
         EntityDataProperty,
-        EntityDescriptionPropertyData,
         OpenWebsiteTypePropertiesKeys,
     } from "@workadventure/map-editor";
     import { ArrowLeftIcon } from "svelte-feather-icons";
@@ -15,36 +14,32 @@
         mapEditorSelectedEntityPrefabStore,
         mapEditorSelectedEntityStore,
     } from "../../Stores/MapEditorStore";
+    import visioSvg from "../images/visio-white.svg";
+    import audioSvg from "../images/audio-white.svg";
+    import webSvg from "../images/web-white.svg";
+    import youtubeSvg from "../images/applications/icon_youtube.svg";
+    import klaxoonSvg from "../images/applications/icon_klaxoon.svg";
+    import googleDriveSvg from "../images/applications/icon_google_drive.svg";
+    import googleDocsSvg from "../images/applications/icon_google_docs.svg";
+    import googleSheetsSvg from "../images/applications/icon_google_sheets.svg";
+    import googleSlidesSvg from "../images/applications/icon_google_slides.svg";
+    import eraserSvg from "../images/applications/icon_eraser.svg";
     import { analyticsClient } from "../../Administration/AnalyticsClient";
+    import { connectionManager } from "../../Connection/ConnectionManager";
     import JitsiRoomPropertyEditor from "./PropertyEditor/JitsiRoomPropertyEditor.svelte";
     import PlayAudioPropertyEditor from "./PropertyEditor/PlayAudioPropertyEditor.svelte";
     import OpenWebsitePropertyEditor from "./PropertyEditor/OpenWebsitePropertyEditor.svelte";
-    import ListAddPropertyButton from "./PropertyEditor/ListAddPropertyButton.svelte";
+    import AddPropertyButton from "./PropertyEditor/AddPropertyButton.svelte";
 
     let properties: EntityDataProperties = [];
     let entityName = "";
-    let entityDescription = "";
-    let entitySearchable = false;
     let hasJitsiRoomProperty: boolean;
-    let showDescriptionField = false;
 
     let selectedEntityUnsubscriber = mapEditorSelectedEntityStore.subscribe((currentEntity) => {
         if (currentEntity) {
             currentEntity.setEditColor(0x00ffff);
             properties = currentEntity.getProperties() ?? [];
             entityName = currentEntity.getEntityData().name ?? "";
-            const descriptionProperty = properties.find((p) => p.type === "entityDescriptionProperties");
-            if (!descriptionProperty) {
-                $mapEditorSelectedEntityStore?.addProperty({
-                    id: crypto.randomUUID(),
-                    type: "entityDescriptionProperties",
-                    description: "",
-                    searchable: false,
-                });
-            } else {
-                entityDescription = (descriptionProperty as EntityDescriptionPropertyData).description ?? "";
-                entitySearchable = (descriptionProperty as EntityDescriptionPropertyData).searchable ?? false;
-            }
         }
     });
 
@@ -66,32 +61,6 @@
         }
     }
 
-    function onUpdateDescription() {
-        let properties = $mapEditorSelectedEntityStore
-            ?.getProperties()
-            .find((p) => p.type === "entityDescriptionProperties");
-        if (!properties || (properties && properties.type !== "entityDescriptionProperties"))
-            throw new Error("Wrong property type");
-
-        properties.description = entityDescription;
-        if ($mapEditorSelectedEntityStore) {
-            $mapEditorSelectedEntityStore.updateProperty(properties);
-        }
-    }
-
-    function onUpdateSearchable() {
-        let properties = $mapEditorSelectedEntityStore
-            ?.getProperties()
-            .find((p) => p.type === "entityDescriptionProperties");
-        if (!properties || (properties && properties.type !== "entityDescriptionProperties"))
-            throw new Error("Wrong property type");
-
-        properties.searchable = entitySearchable;
-        if ($mapEditorSelectedEntityStore) {
-            $mapEditorSelectedEntityStore.updateProperty(properties);
-        }
-    }
-
     function onUpdateProperty(property: EntityDataProperty) {
         if ($mapEditorSelectedEntityStore) {
             $mapEditorSelectedEntityStore.updateProperty(property);
@@ -209,17 +178,13 @@
     onDestroy(() => {
         selectedEntityUnsubscriber();
     });
-
-    function toggleDescriptionField() {
-        showDescriptionField = !showDescriptionField;
-    }
 </script>
 
 {#if $mapEditorSelectedEntityStore === undefined}
     {$LL.mapEditor.entityEditor.editInstructions()}
 {:else}
     <div class="header-container">
-        <h3>{$LL.mapEditor.entityEditor.editing({ name: $mapEditorSelectedEntityStore.getPrefab().name })}</h3>
+        <h2>Editing: {$mapEditorSelectedEntityStore.getPrefab().name}</h2>
     </div>
     <!-- svelte-ignore a11y-click-events-have-key-events -->
     <p on:click|preventDefault={backToSelectObject} class="tw-flex tw-flex-row tw-items-center tw-text-xs tw-m-0">
@@ -228,111 +193,124 @@
     </p>
     <div class="properties-buttons tw-flex tw-flex-row">
         {#if !hasJitsiRoomProperty}
-            <ListAddPropertyButton
-                property="jitsiRoomProperty"
+            <AddPropertyButton
+                headerText={$LL.mapEditor.properties.jitsiProperties.label()}
+                descriptionText={$LL.mapEditor.properties.jitsiProperties.description()}
+                img={visioSvg}
+                style="z-index: 8;"
                 on:click={() => {
                     onAddProperty("jitsiRoomProperty");
                 }}
             />
         {/if}
-        <ListAddPropertyButton
-            property="playAudio"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.audioProperties.label()}
+            descriptionText={$LL.mapEditor.properties.audioProperties.description()}
+            img={audioSvg}
+            style="z-index: 7;"
             on:click={() => {
                 onAddProperty("playAudio");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.linkProperties.label()}
+            descriptionText={$LL.mapEditor.properties.linkProperties.description()}
+            img={webSvg}
+            style="z-index: 6;"
             on:click={() => {
                 onAddProperty("openWebsite");
             }}
         />
     </div>
     <div class="properties-buttons tw-flex tw-flex-row tw-flex-wrap">
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="klaxoon"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.klaxoonProperties.label()}
+            descriptionText={connectionManager.currentRoom?.klaxoonToolActivated
+                ? $LL.mapEditor.properties.klaxoonProperties.description()
+                : $LL.mapEditor.properties.klaxoonProperties.disabled()}
+            img={klaxoonSvg}
+            style="z-index: 4;"
+            disabled={!connectionManager.currentRoom?.klaxoonToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "klaxoon");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="youtube"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.youtubeProperties.label()}
+            descriptionText={connectionManager.currentRoom?.youtubeToolActivated
+                ? $LL.mapEditor.properties.youtubeProperties.description()
+                : $LL.mapEditor.properties.youtubeProperties.disabled()}
+            img={youtubeSvg}
+            style="z-index: 5;"
+            disabled={!connectionManager.currentRoom?.youtubeToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "youtube");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleDrive"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleDriveProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleDriveToolActivated
+                ? $LL.mapEditor.properties.googleDriveProperties.description()
+                : $LL.mapEditor.properties.googleDriveProperties.disabled()}
+            img={googleDriveSvg}
+            style="z-index: 3;"
+            disabled={!connectionManager.currentRoom?.googleDriveToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleDrive");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleDocs"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleDocsProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleDocsToolActivated
+                ? $LL.mapEditor.properties.googleDocsProperties.description()
+                : $LL.mapEditor.properties.googleDocsProperties.disabled()}
+            img={googleDocsSvg}
+            style="z-index: 3;"
+            disabled={!connectionManager.currentRoom?.googleDocsToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleDocs");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleSheets"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleSheetsProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleSheetsToolActivated
+                ? $LL.mapEditor.properties.googleSheetsProperties.description()
+                : $LL.mapEditor.properties.googleSheetsProperties.disabled()}
+            img={googleSheetsSvg}
+            style="z-index: 2;"
+            disabled={!connectionManager.currentRoom?.googleSheetsToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleSheets");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="googleSlides"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.googleSlidesProperties.label()}
+            descriptionText={connectionManager.currentRoom?.googleSlidesToolActivated
+                ? $LL.mapEditor.properties.googleSlidesProperties.description()
+                : $LL.mapEditor.properties.googleSlidesProperties.disabled()}
+            img={googleSlidesSvg}
+            style="z-index: 1;"
+            disabled={!connectionManager.currentRoom?.googleSlidesToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "googleSlides");
             }}
         />
-        <ListAddPropertyButton
-            property="openWebsite"
-            subProperty="eraser"
+        <AddPropertyButton
+            headerText={$LL.mapEditor.properties.eraserProperties.label()}
+            descriptionText={connectionManager.currentRoom?.eraserToolActivated
+                ? $LL.mapEditor.properties.eraserProperties.description()
+                : $LL.mapEditor.properties.eraserProperties.disabled()}
+            img={eraserSvg}
+            style="z-index: 1;"
+            disabled={!connectionManager.currentRoom?.eraserToolActivated}
             on:click={() => {
                 onAddProperty("openWebsite", "eraser");
             }}
         />
     </div>
     <div class="entity-name-container">
-        <label for="objectName">{$LL.mapEditor.entityEditor.objectName()}</label>
-        <input
-            id="objectName"
-            type="text"
-            placeholder={$LL.mapEditor.entityEditor.objectNamePlaceholder()}
-            bind:value={entityName}
-            on:change={onUpdateName}
-        />
-    </div>
-    <div class="entity-name-container">
-        {#if !showDescriptionField}
-            <a href="#addDescriptionField" on:click|preventDefault|stopPropagation={toggleDescriptionField}
-                >+ {$LL.mapEditor.entityEditor.addDescriptionField()}</a
-            >
-        {:else}
-            <label for="objectDescription">{$LL.mapEditor.entityEditor.objectDescription()}</label>
-            <textarea
-                id="objectDescription"
-                placeholder={$LL.mapEditor.entityEditor.objectDescriptionPlaceholder()}
-                bind:value={entityDescription}
-                on:change={onUpdateDescription}
-            />
-        {/if}
-    </div>
-    <div class="value-switch">
-        <label for="searchable">{$LL.mapEditor.entityEditor.objectSearchable()}</label>
-        <input
-            id="searchable"
-            type="checkbox"
-            class="input-switch"
-            bind:checked={entitySearchable}
-            on:change={onUpdateSearchable}
-        />
+        <label for="objectName">Object name</label>
+        <input id="objectName" type="text" placeholder="Value" bind:value={entityName} on:change={onUpdateName} />
     </div>
     <div class="properties-container">
         {#each properties as property (property.id)}
@@ -399,69 +377,4 @@
             margin-bottom: 0;
         }
     }
-
-    .input-switch {
-        position: relative;
-        top: 0px;
-        right: 0px;
-        bottom: 0px;
-        left: 0px;
-        display: inline-block;
-        height: 1rem;
-        width: 2rem;
-        -webkit-appearance: none;
-        -moz-appearance: none;
-        appearance: none;
-        border-radius: 9999px;
-        border-width: 1px;
-        border-style: solid;
-        --tw-border-opacity: 1;
-        border-color: rgb(77 75 103 / var(--tw-border-opacity));
-        --tw-bg-opacity: 1;
-        background-color: rgb(15 31 45 / var(--tw-bg-opacity));
-        background-image: none;
-        padding: 0px;
-        --tw-text-opacity: 1;
-        color: rgb(242 253 255 / var(--tw-text-opacity));
-        outline: 2px solid transparent;
-        outline-offset: 2px;
-        cursor: url(/src/front/style/images/cursor_pointer.png), pointer;
-    }
-
-    .input-switch::before {
-        position: absolute;
-        left: -3px;
-        top: -3px;
-        height: 1.25rem;
-        width: 1.25rem;
-        border-radius: 9999px;
-        --tw-bg-opacity: 1;
-        background-color: rgb(146 142 187 / var(--tw-bg-opacity));
-        transition-property: all;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        --tw-content: "";
-        content: var(--tw-content);
-    }
-
-    .input-switch:checked {
-        --tw-border-opacity: 1;
-        border-color: rgb(146 142 187 / var(--tw-border-opacity));
-    }
-
-    .input-switch:checked::before {
-        left: 13px;
-        top: -3px;
-        --tw-bg-opacity: 1;
-        background-color: rgb(65 86 246 / var(--tw-bg-opacity));
-        content: var(--tw-content);
-        /*--tw-shadow: 0 0 7px 0 rgba(4, 255, 210, 1);
-        --tw-shadow-colored: 0 0 7px 0 var(--tw-shadow-color);
-        box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);*/
-    }
-
-    .input-switch:disabled {
-        cursor: not-allowed;
-        opacity: 0.4;
-    }
 </style>
diff --git a/play/src/front/Components/MapEditor/ItemPicker.svelte b/play/src/front/Components/MapEditor/ItemPicker.svelte
index 6d52cd9e64..781fc87870 100644
--- a/play/src/front/Components/MapEditor/ItemPicker.svelte
+++ b/play/src/front/Components/MapEditor/ItemPicker.svelte
@@ -133,7 +133,6 @@
 </script>
 
 <div class="item-picker">
-    <h3>{$LL.mapEditor.entityEditor.title()}</h3>
     <div class="item-filter">
         <input
             class="filter-input tw-h-8"
diff --git a/play/src/front/Components/MapEditor/MapEditor.svelte b/play/src/front/Components/MapEditor/MapEditor.svelte
index 4b3c36a3a0..d8557e8ad3 100644
--- a/play/src/front/Components/MapEditor/MapEditor.svelte
+++ b/play/src/front/Components/MapEditor/MapEditor.svelte
@@ -1,41 +1,25 @@
 <script lang="ts">
     import { fly } from "svelte/transition";
-    import { ArrowRightIcon } from "svelte-feather-icons";
     import { EditorToolName } from "../../Phaser/Game/MapEditor/MapEditorModeManager";
-    import {
-        mapEditorModeStore,
-        mapEditorSelectedToolStore,
-        mapEditorVisibilityStore,
-    } from "../../Stores/MapEditorStore";
-    import { gameManager } from "../../Phaser/Game/GameManager";
-    import { analyticsClient } from "../../Administration/AnalyticsClient";
-    import Explorer from "../Exploration/Explorer.svelte";
+    import { mapEditorModeStore, mapEditorSelectedToolStore } from "../../Stores/MapEditorStore";
     import MapEditorSideBar from "./MapEditorSideBar.svelte";
     import EntityEditor from "./EntityEditor.svelte";
     import AreaEditor from "./AreaEditor.svelte";
     import ConfigureMyRoom from "./WAMSettingsEditor.svelte";
     import TrashEditor from "./TrashEditor.svelte";
 
-    function closeMapEditor() {
-        analyticsClient.toggleMapEditor(false);
-        gameManager.getCurrentGameScene().getMapEditorModeManager().equipTool(undefined);
+    function closeChat() {
         mapEditorModeStore.switchMode(false);
     }
-    function hideMapEditor() {
-        mapEditorVisibilityStore.set(false);
-    }
 </script>
 
 <MapEditorSideBar />
 <div class={`map-editor tw-bg-dark-blue/95 ${$mapEditorSelectedToolStore}`}>
     {#if $mapEditorSelectedToolStore === EditorToolName.WAMSettingsEditor}
         <ConfigureMyRoom />
-    {:else if $mapEditorVisibilityStore}
+    {:else}
         <div class="sidebar" in:fly={{ x: 100, duration: 250, delay: 200 }} out:fly={{ x: 100, duration: 200 }}>
-            <button class="tw-absolute tw-right-10 tw-p-1 tw-cursor-pointer" on:click={hideMapEditor}
-                ><ArrowRightIcon size="20" /></button
-            >
-            <button class="close-window" on:click={closeMapEditor}>&#215;</button>
+            <button class="close-window" on:click={closeChat}>&#215;</button>
             {#if $mapEditorSelectedToolStore === EditorToolName.TrashEditor}
                 <TrashEditor />
             {/if}
@@ -45,9 +29,6 @@
             {#if $mapEditorSelectedToolStore === EditorToolName.AreaEditor}
                 <AreaEditor />
             {/if}
-            {#if $mapEditorSelectedToolStore === EditorToolName.ExploreTheRoom}
-                <Explorer />
-            {/if}
         </div>
     {/if}
 </div>
diff --git a/play/src/front/Components/MapEditor/MapEditorSideBar.svelte b/play/src/front/Components/MapEditor/MapEditorSideBar.svelte
index 6870a40c57..3f789d10c0 100644
--- a/play/src/front/Components/MapEditor/MapEditorSideBar.svelte
+++ b/play/src/front/Components/MapEditor/MapEditorSideBar.svelte
@@ -2,7 +2,7 @@
     import { LocalizedString } from "typesafe-i18n";
     import { LL } from "../../../i18n/i18n-svelte";
     import { EditorToolName } from "../../Phaser/Game/MapEditor/MapEditorModeManager";
-    import { mapEditorSelectedToolStore, mapEditorVisibilityStore } from "../../Stores/MapEditorStore";
+    import { mapEditorSelectedToolStore } from "../../Stores/MapEditorStore";
     import { gameManager } from "../../Phaser/Game/GameManager";
     import AreaToolImg from "../images/icon-tool-area.png";
     // import FloorToolImg from "../images/icon-tool-floor.png";
@@ -10,67 +10,50 @@
     import Tooltip from "../Util/Tooltip.svelte";
     import ConfigureImg from "../images/configure.svg";
     import TrashImg from "../images/trash.svg";
-    import ExplorerImg from "../images/explorer.svg";
-    import CloseImg from "../images/close.png";
     import { analyticsClient } from "../../Administration/AnalyticsClient";
-    import { mapEditorActivated } from "../../Stores/MenuStore";
-
     const gameScene = gameManager.getCurrentGameScene();
 
     const availableTools: { toolName: EditorToolName; img: string; tooltiptext: LocalizedString }[] = [];
 
     availableTools.push({
-        toolName: EditorToolName.ExploreTheRoom,
-        img: ExplorerImg,
-        tooltiptext: $LL.mapEditor.sideBar.exploreTheRoom(),
+        toolName: EditorToolName.AreaEditor,
+        img: AreaToolImg,
+        tooltiptext: $LL.mapEditor.sideBar.areaEditor(),
     });
-    if ($mapEditorActivated) {
-        availableTools.push({
-            toolName: EditorToolName.AreaEditor,
-            img: AreaToolImg,
-            tooltiptext: $LL.mapEditor.sideBar.areaEditor(),
-        });
-        availableTools.push(
-            {
-                toolName: EditorToolName.EntityEditor,
-                img: EntityToolImg,
-                tooltiptext: $LL.mapEditor.sideBar.entityEditor(),
-            }
-            // NOTE: Hide it untill FloorEditing is done
-            // { toolName: EditorToolName.FloorEditor, img: FloorToolImg, tooltiptext: $LL.mapEditor.sideBar.tileEditor() }
-        );
-        availableTools.push({
-            toolName: EditorToolName.WAMSettingsEditor,
-            img: ConfigureImg,
-            tooltiptext: $LL.mapEditor.sideBar.configureMyRoom(),
-        });
-        availableTools.push({
-            toolName: EditorToolName.TrashEditor,
-            img: TrashImg,
-            tooltiptext: $LL.mapEditor.sideBar.trashEditor(),
-        });
-    }
+    availableTools.push(
+        {
+            toolName: EditorToolName.EntityEditor,
+            img: EntityToolImg,
+            tooltiptext: $LL.mapEditor.sideBar.entityEditor(),
+        }
+        // NOTE: Hide it untill FloorEditing is done
+        // { toolName: EditorToolName.FloorEditor, img: FloorToolImg, tooltiptext: $LL.mapEditor.sideBar.tileEditor() }
+    );
     availableTools.push({
-        toolName: EditorToolName.CloseMapEditor,
-        img: CloseImg,
-        tooltiptext: $LL.mapEditor.sideBar.closeMapEditor(),
+        toolName: EditorToolName.WAMSettingsEditor,
+        img: ConfigureImg,
+        tooltiptext: $LL.mapEditor.sideBar.configureMyRoom(),
+    });
+    availableTools.push({
+        toolName: EditorToolName.TrashEditor,
+        img: TrashImg,
+        tooltiptext: $LL.mapEditor.sideBar.trashEditor(),
     });
 
     function switchTool(newTool: EditorToolName) {
-        mapEditorVisibilityStore.set(true);
         analyticsClient.openMapEditorTool(newTool);
         gameScene.getMapEditorModeManager().equipTool(newTool);
     }
 </script>
 
-<section class="side-bar-container" class:!tw-right-20={!$mapEditorVisibilityStore}>
+<section class="side-bar-container">
     <!--put a section to avoid lower div to be affected by some css-->
     <div class="side-bar">
         {#each availableTools as tool (tool.toolName)}
             <div class="tool-button">
                 <button
                     id={tool.toolName}
-                    class:active={$mapEditorSelectedToolStore === tool.toolName}
+                    class={tool.toolName == $mapEditorSelectedToolStore ? "active" : ""}
                     on:click|preventDefault={() => switchTool(tool.toolName)}
                     type="button"><img src={tool.img} alt="open tool {tool.toolName}" /></button
                 >
@@ -117,7 +100,7 @@
                 }
             }
             button.active {
-                border-left: 4px solid #56eaff;
+                background-color: rgb(45 45 65);
             }
         }
         .tool-button:first-child button {
@@ -129,9 +112,4 @@
             border-bottom-right-radius: 0.5em;
         }
     }
-    #CloseMapEditor {
-        img {
-            width: 1.25rem;
-        }
-    }
 </style>
diff --git a/play/src/front/Components/MapEditor/PropertyEditor/ListAddPropertyButton.svelte b/play/src/front/Components/MapEditor/PropertyEditor/ListAddPropertyButton.svelte
deleted file mode 100644
index 702128d743..0000000000
--- a/play/src/front/Components/MapEditor/PropertyEditor/ListAddPropertyButton.svelte
+++ /dev/null
@@ -1,222 +0,0 @@
-<script lang="ts">
-    import { createEventDispatcher } from "svelte";
-    import {
-        AreaDataPropertiesKeys,
-        EntityDataPropertiesKeys,
-        OpenWebsiteTypePropertiesKeys,
-    } from "@workadventure/map-editor";
-    import audioSvg from "../../images/audio-white.svg";
-    import youtubeSvg from "../../images/applications/icon_youtube.svg";
-    import klaxoonSvg from "../../images/applications/icon_klaxoon.svg";
-    import googleDriveSvg from "../../images/applications/icon_google_drive.svg";
-    import googleDocsSvg from "../../images/applications/icon_google_docs.svg";
-    import googleSheetsSvg from "../../images/applications/icon_google_sheets.svg";
-    import googleSlidesSvg from "../../images/applications/icon_google_slides.svg";
-    import eraserSvg from "../../images/applications/icon_eraser.svg";
-    import LL from "../../../../i18n/i18n-svelte";
-    import { connectionManager } from "../../../Connection/ConnectionManager";
-    import AddPropertyButton from "./AddPropertyButton.svelte";
-
-    export let property: AreaDataPropertiesKeys | EntityDataPropertiesKeys;
-    export let subProperty: OpenWebsiteTypePropertiesKeys | undefined = undefined;
-
-    const dispatch = createEventDispatcher();
-</script>
-
-{#if property === "focusable"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.focusableProperties.label()}
-        descriptionText={$LL.mapEditor.properties.focusableProperties.description()}
-        img={"resources/icons/icon_focus.png"}
-        style="z-index: 16;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "silent"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.silentProperty.label()}
-        descriptionText={$LL.mapEditor.properties.silentProperty.description()}
-        img={"resources/icons/icon_silent.png"}
-        style="z-index: 15;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "jitsiRoomProperty"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.jitsiProperties.label()}
-        descriptionText={$LL.mapEditor.properties.jitsiProperties.description()}
-        img={"resources/icons/icon_meeting.png"}
-        style="z-index: 14;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "speakerMegaphone"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.speakerMegaphoneProperties.label()}
-        descriptionText={$LL.mapEditor.properties.speakerMegaphoneProperties.description()}
-        img={"resources/icons/icon_speaker.png"}
-        style="z-index: 13;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "listenerMegaphone"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.listenerMegaphoneProperties.label()}
-        descriptionText={$LL.mapEditor.properties.listenerMegaphoneProperties.description()}
-        img={"resources/icons/icon_listener.png"}
-        style="z-index: 12;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "start"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.startProperties.label()}
-        descriptionText={$LL.mapEditor.properties.startProperties.description()}
-        img={"resources/icons/icon_start.png"}
-        style="z-index: 11;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "exit"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.exitProperties.label()}
-        descriptionText={$LL.mapEditor.properties.exitProperties.description()}
-        img={"resources/icons/icon_exit.png"}
-        style="z-index: 10;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "playAudio"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.audioProperties.label()}
-        descriptionText={$LL.mapEditor.properties.audioProperties.description()}
-        img={audioSvg}
-        style="z-index: 9;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty == undefined}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.linkProperties.label()}
-        descriptionText={$LL.mapEditor.properties.linkProperties.description()}
-        img={"resources/icons/icon_link.png"}
-        style="z-index: 8;"
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "klaxoon"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.klaxoonProperties.label()}
-        descriptionText={connectionManager.currentRoom?.klaxoonToolActivated
-            ? $LL.mapEditor.properties.klaxoonProperties.description()
-            : $LL.mapEditor.properties.klaxoonProperties.disabled()}
-        img={klaxoonSvg}
-        style="z-index: 7;"
-        disabled={!connectionManager.currentRoom?.klaxoonToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "youtube"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.youtubeProperties.label()}
-        descriptionText={connectionManager.currentRoom?.youtubeToolActivated
-            ? $LL.mapEditor.properties.youtubeProperties.description()
-            : $LL.mapEditor.properties.youtubeProperties.disabled()}
-        img={youtubeSvg}
-        style="z-index: 6;"
-        disabled={!connectionManager.currentRoom?.youtubeToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "googleDrive"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.googleDriveProperties.label()}
-        descriptionText={connectionManager.currentRoom?.googleDocsToolActivated
-            ? $LL.mapEditor.properties.googleDriveProperties.description()
-            : $LL.mapEditor.properties.googleDriveProperties.disabled()}
-        img={googleDriveSvg}
-        style="z-index: 5;"
-        disabled={!connectionManager.currentRoom?.googleDocsToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "googleDocs"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.googleDocsProperties.label()}
-        descriptionText={connectionManager.currentRoom?.googleDocsToolActivated
-            ? $LL.mapEditor.properties.googleDocsProperties.description()
-            : $LL.mapEditor.properties.googleDocsProperties.disabled()}
-        img={googleDocsSvg}
-        style="z-index: 4;"
-        disabled={!connectionManager.currentRoom?.googleDocsToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "googleSheets"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.googleSheetsProperties.label()}
-        descriptionText={connectionManager.currentRoom?.googleSheetsToolActivated
-            ? $LL.mapEditor.properties.googleSheetsProperties.description()
-            : $LL.mapEditor.properties.googleSheetsProperties.disabled()}
-        img={googleSheetsSvg}
-        style="z-index: 3;"
-        disabled={!connectionManager.currentRoom?.googleSheetsToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "googleSlides"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.googleSlidesProperties.label()}
-        descriptionText={connectionManager.currentRoom?.googleSlidesToolActivated
-            ? $LL.mapEditor.properties.googleSlidesProperties.description()
-            : $LL.mapEditor.properties.googleSlidesProperties.disabled()}
-        img={googleSlidesSvg}
-        style="z-index: 2;"
-        disabled={!connectionManager.currentRoom?.googleSlidesToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
-{#if property === "openWebsite" && subProperty === "eraser"}
-    <AddPropertyButton
-        headerText={$LL.mapEditor.properties.eraserProperties.label()}
-        descriptionText={connectionManager.currentRoom?.eraserToolActivated
-            ? $LL.mapEditor.properties.eraserProperties.description()
-            : $LL.mapEditor.properties.eraserProperties.disabled()}
-        img={eraserSvg}
-        style="z-index: 1;"
-        disabled={!connectionManager.currentRoom?.eraserToolActivated}
-        on:click={(event) => {
-            dispatch("click", event);
-        }}
-    />
-{/if}
diff --git a/play/src/front/Components/MapEditor/PropertyEditor/OpenWebsitePropertyEditor.svelte b/play/src/front/Components/MapEditor/PropertyEditor/OpenWebsitePropertyEditor.svelte
index 2046cea474..fa9d5278d0 100644
--- a/play/src/front/Components/MapEditor/PropertyEditor/OpenWebsitePropertyEditor.svelte
+++ b/play/src/front/Components/MapEditor/PropertyEditor/OpenWebsitePropertyEditor.svelte
@@ -437,7 +437,7 @@
     <span slot="content">
         {#if property.poster}
             <div class="tw-text-center">
-                <img class="tw-w-20 tw-mr-1" src={property.poster} alt="" />
+                <img class="tw-w-20  tw-mr-1" src={property.poster} alt="" />
             </div>
         {/if}
         {#if isArea}
diff --git a/play/src/front/Components/MapEditor/WAMSettingsEditor.svelte b/play/src/front/Components/MapEditor/WAMSettingsEditor.svelte
index 7dcb1569d0..474031b423 100644
--- a/play/src/front/Components/MapEditor/WAMSettingsEditor.svelte
+++ b/play/src/front/Components/MapEditor/WAMSettingsEditor.svelte
@@ -8,20 +8,15 @@
         WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM,
         mapEditorWamSettingsEditorToolCurrentMenuItemStore,
     } from "../../Stores/MapEditorStore";
-    import { userIsAdminStore } from "../../Stores/GameStore";
     import Megaphone from "./ConfigureMyRoom/Megaphone.svelte";
-    import RoomSettings from "./ConfigureMyRoom/RoomSettings.svelte";
 
-    function getCurrentComponent(): typeof Megaphone | typeof RoomSettings {
+    function getCurrentComponent() {
         switch ($mapEditorWamSettingsEditorToolCurrentMenuItemStore) {
             case WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM.Megaphone: {
                 return Megaphone;
             }
-            case WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM.RoomSettings: {
-                return RoomSettings;
-            }
             default: {
-                return RoomSettings; // Default appropriate component.
+                return "Component not found.";
             }
         }
     }
@@ -37,22 +32,6 @@
     <div class="menu">
         <h3>{$LL.mapEditor.sideBar.configureMyRoom()}</h3>
         <ul>
-            <!-- check if the user has right to update room settings -->
-            {#if $userIsAdminStore}
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <li
-                    class:selected={$mapEditorWamSettingsEditorToolCurrentMenuItemStore ===
-                        WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM.RoomSettings}
-                    on:click={() =>
-                        mapEditorWamSettingsEditorToolCurrentMenuItemStore.set(
-                            WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM.RoomSettings
-                        )}
-                >
-                    <span>Room settings</span>
-                    <ChevronRightIcon class={`tw--mr-2`} />
-                </li>
-            {/if}
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
             <li
                 class:selected={$mapEditorWamSettingsEditorToolCurrentMenuItemStore ===
                     WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM.Megaphone}
diff --git a/play/src/front/Components/Modal/ObjectDetails.svelte b/play/src/front/Components/Modal/ObjectDetails.svelte
deleted file mode 100644
index e8fc5a4275..0000000000
--- a/play/src/front/Components/Modal/ObjectDetails.svelte
+++ /dev/null
@@ -1,199 +0,0 @@
-<script lang="ts">
-    import { onDestroy, onMount } from "svelte";
-    import { Unsubscriber, writable } from "svelte/store";
-    import {
-        AreaDataPropertiesKeys,
-        EntityDataPropertiesKeys,
-        OpenWebsiteTypePropertiesKeys,
-    } from "@workadventure/map-editor";
-    import { fly } from "svelte/transition";
-    import { mapEditorModeStore, mapExplorationObjectSelectedStore } from "../../Stores/MapEditorStore";
-    import { Entity } from "../../Phaser/ECS/Entity";
-    import { AreaPreview } from "../../Phaser/Components/MapEditor/AreaPreview";
-    import AreaToolImg from "../images/icon-tool-area.png";
-    import { gameManager } from "../../Phaser/Game/GameManager";
-    import ListAddPropertyButton from "../MapEditor/PropertyEditor/ListAddPropertyButton.svelte";
-    import LL from "../../../i18n/i18n-svelte";
-    import { analyticsClient } from "../../Administration/AnalyticsClient";
-
-    // Create type for component AddPropertyButton
-    type AddPropertyButtonType = {
-        property: AreaDataPropertiesKeys | EntityDataPropertiesKeys;
-        subProperty?: OpenWebsiteTypePropertiesKeys;
-    };
-
-    let iconProperties = writable<Map<string, AddPropertyButtonType>>(new Map());
-    let holdEntity: Entity | AreaPreview | undefined;
-    let mapExplorationObjectSelectedStoreSubscription: Unsubscriber;
-    let description: string | undefined;
-
-    onMount(() => {
-        if ($mapExplorationObjectSelectedStore instanceof Entity) {
-            description = $mapExplorationObjectSelectedStore.description;
-            $mapExplorationObjectSelectedStore?.setPointedToEditColor(0xf9e82d);
-        }
-        if ($mapExplorationObjectSelectedStore instanceof AreaPreview) {
-            description = $mapExplorationObjectSelectedStore.description;
-            $mapExplorationObjectSelectedStore?.setStrokeStyle(2, 0xf9e82d);
-        }
-
-        initPropertyComponents();
-
-        // Make sure that if the user click on another object, the previous one is not selected anymore
-        holdEntity = $mapExplorationObjectSelectedStore;
-        mapExplorationObjectSelectedStoreSubscription = mapExplorationObjectSelectedStore.subscribe((value) => {
-            if (holdEntity instanceof Entity) holdEntity.setPointedToEditColor(0x000000);
-            if (holdEntity instanceof AreaPreview) holdEntity.setStrokeStyle(2, 0x000000);
-            holdEntity = value;
-            if (value instanceof Entity) value.setPointedToEditColor(0xf9e82d);
-            if (value instanceof AreaPreview) value.setStrokeStyle(2, 0xf9e82d);
-
-            initPropertyComponents();
-        });
-    });
-    onDestroy(() => {
-        if (mapExplorationObjectSelectedStoreSubscription) mapExplorationObjectSelectedStoreSubscription();
-        if ($mapExplorationObjectSelectedStore instanceof Entity)
-            $mapExplorationObjectSelectedStore.setPointedToEditColor(0x000000);
-        if ($mapExplorationObjectSelectedStore instanceof AreaPreview)
-            $mapExplorationObjectSelectedStore.setStrokeStyle(2, 0x000000);
-        if (holdEntity instanceof Entity) holdEntity.setPointedToEditColor(0x000000);
-        if (holdEntity instanceof AreaPreview) holdEntity.setStrokeStyle(2, 0x000000);
-
-        cleanPropertyComponents();
-    });
-
-    function cleanPropertyComponents() {
-        iconProperties.set(new Map());
-    }
-
-    function initPropertyComponents() {
-        cleanPropertyComponents();
-        // Create the properties buttons for the selected object
-        let newIconProperties = new Map<string, AddPropertyButtonType>();
-        if ($mapExplorationObjectSelectedStore instanceof Entity) {
-            for (const value of $mapExplorationObjectSelectedStore.getProperties()) {
-                newIconProperties.set(value.id, { property: value.type as EntityDataPropertiesKeys });
-            }
-        }
-
-        if ($mapExplorationObjectSelectedStore instanceof AreaPreview) {
-            for (const value of $mapExplorationObjectSelectedStore.getAreaData().properties.values()) {
-                newIconProperties.set(value.id, { property: value.type });
-            }
-        }
-        iconProperties.set(newIconProperties);
-    }
-
-    function close() {
-        if ($mapExplorationObjectSelectedStore instanceof Entity)
-            $mapExplorationObjectSelectedStore.setPointedToEditColor(0x000000);
-        if ($mapExplorationObjectSelectedStore instanceof AreaPreview)
-            $mapExplorationObjectSelectedStore.setStrokeStyle(2, 0x000000);
-        if (holdEntity instanceof Entity) holdEntity.setPointedToEditColor(0x000000);
-        if (holdEntity instanceof AreaPreview) holdEntity.setStrokeStyle(2, 0x000000);
-        mapExplorationObjectSelectedStore.set(undefined);
-    }
-    function goTo() {
-        if ($mapExplorationObjectSelectedStore) {
-            // Move to the selected entity or area
-            const position = gameManager
-                .getCurrentGameScene()
-                .getGameMapFrontWrapper()
-                .getTileIndexAt($mapExplorationObjectSelectedStore.x, $mapExplorationObjectSelectedStore.y);
-            gameManager
-                .getCurrentGameScene()
-                .moveTo(position, true, $mapExplorationObjectSelectedStore instanceof Entity);
-            gameManager.getCurrentGameScene().getMapEditorModeManager().equipTool(undefined);
-
-            // Close map editor to walk on the entity or zone
-            analyticsClient.toggleMapEditor(!$mapEditorModeStore);
-            mapEditorModeStore.switchMode(!$mapEditorModeStore);
-
-            // Close the modal
-            mapExplorationObjectSelectedStore.set(undefined);
-        }
-    }
-</script>
-
-<div class="object-menu tw-min-h-fit tw-rounded-3xl tw-overflow-visible" transition:fly={{ x: 1000, duration: 500 }}>
-    {#if $mapExplorationObjectSelectedStore instanceof Entity}
-        <div class="tw-p-8 tw-flex tw-flex-col tw-justify-center tw-items-center">
-            {#if $mapExplorationObjectSelectedStore?.getEntityData().name}
-                <h1 class="tw-p-2">{$mapExplorationObjectSelectedStore?.getEntityData().name.toUpperCase()}</h1>
-            {:else}
-                <h1 class="tw-p-2 tw-font-bold tw-text-3xl">
-                    {$mapExplorationObjectSelectedStore?.getPrefab().name.toUpperCase()}
-                </h1>
-            {/if}
-            <img
-                src={$mapExplorationObjectSelectedStore?.getPrefab().imagePath}
-                alt="Object"
-                class="tw-w-32 tw-h-32 tw-mb-4"
-            />
-            <p class="tw-p-0 tw-m-0">
-                {description ?? $LL.mapEditor.explorer.noDescriptionFound()}
-            </p>
-        </div>
-        <div class="tw-flex tw-flew-wrap tw-justify-center">
-            {#each [...$iconProperties.entries()] as [key, { property, subProperty }] (key)}
-                <ListAddPropertyButton {property} {subProperty} />
-            {/each}
-        </div>
-        <div
-            class="tw-flex tw-flex-row tw-justify-evenly tw-items-center tw-bg-dark-purple tw-w-full tw-p-2 tw-rounded-b-3xl"
-        >
-            <button class="tw-bg-dark-purple tw-p-4" on:click={close}>Fermer</button>
-            <button class="light tw-p-4" on:click={goTo}>
-                {$LL.mapEditor.explorer.details.moveToEntity({
-                    name: $mapExplorationObjectSelectedStore?.getPrefab().name.toUpperCase(),
-                })}
-            </button>
-        </div>
-    {:else if $mapExplorationObjectSelectedStore instanceof AreaPreview}
-        <div class="tw-p-8 tw-flex tw-flex-col tw-justify-center tw-items-center">
-            {#if $mapExplorationObjectSelectedStore.getAreaData().name}
-                <h1 class="tw-p-2 tw-font-bold tw-text-3xl">
-                    {$mapExplorationObjectSelectedStore.getAreaData().name.toUpperCase()}
-                </h1>
-            {/if}
-            <img src={AreaToolImg} alt="Object" class="tw-w-32 tw-h-32 tw-mb-4" />
-            <p class="tw-p-0 tw-m-0">
-                {description ?? $LL.mapEditor.explorer.noDescriptionFound()}
-            </p>
-        </div>
-        <div class="tw-flex tw-flew-wrap tw-justify-center">
-            {#each [...$iconProperties.entries()] as [key, { property, subProperty }] (key)}
-                <ListAddPropertyButton {property} {subProperty} />
-            {/each}
-        </div>
-        <div
-            class="tw-flex tw-flex-row tw-justify-evenly tw-items-center tw-bg-dark-purple tw-w-full tw-p-2 tw-rounded-b-3xl"
-        >
-            <button class="tw-bg-dark-purple tw-p-4" on:click={close}>
-                {$LL.mapEditor.explorer.details.close()}
-            </button>
-            <button class="light tw-p-4" on:click={goTo}>
-                {$LL.mapEditor.explorer.details.moveToArea({
-                    name: $mapExplorationObjectSelectedStore.getAreaData().name.toUpperCase(),
-                })}
-            </button>
-        </div>
-    {/if}
-</div>
-
-<style lang="scss">
-    .object-menu {
-        position: absolute;
-        width: 668px;
-        height: max-content !important;
-        z-index: 425;
-        word-break: break-all;
-        pointer-events: auto;
-        color: whitesmoke;
-        background-color: #1b2a41d9;
-        backdrop-filter: blur(40px);
-        top: 15rem;
-        left: calc(50% - 334px);
-    }
-</style>
diff --git a/play/src/front/Components/Modal/Popup.svelte b/play/src/front/Components/Modal/Popup.svelte
deleted file mode 100644
index 62ee9b9bff..0000000000
--- a/play/src/front/Components/Modal/Popup.svelte
+++ /dev/null
@@ -1,68 +0,0 @@
-<script lang="ts">
-    import { fly } from "svelte/transition";
-    import { analyticsClient } from "../../Administration/AnalyticsClient";
-    import { mapEditorModeStore } from "../../Stores/MapEditorStore";
-    import { modalPopupVisibilityStore } from "../../Stores/ModalStore";
-    import LL from "../../../i18n/i18n-svelte";
-    import { gameManager } from "../../Phaser/Game/GameManager";
-    import { EditorToolName } from "../../Phaser/Game/MapEditor/MapEditorModeManager";
-
-    let notAskAgain = false;
-
-    function close() {
-        modalPopupVisibilityStore.set(false);
-    }
-
-    function onChangesAskAgain() {
-        localStorage.setItem("notAskAgainPopupExplorerMode", `${notAskAgain}`);
-    }
-
-    function activeExplorerMode() {
-        analyticsClient.toggleMapEditor(!$mapEditorModeStore);
-        mapEditorModeStore.switchMode(!$mapEditorModeStore);
-        gameManager.getCurrentGameScene().getMapEditorModeManager().equipTool(EditorToolName.ExploreTheRoom);
-        modalPopupVisibilityStore.set(false);
-    }
-</script>
-
-<div class="popup-menu tw-min-h-fit tw-rounded-3xl tw-overflow-visible" transition:fly={{ x: 1000, duration: 500 }}>
-    <div class="tw-p-8 tw-flex tw-flex-col tw-justify-center tw-items-center">
-        <h1 class="tw-p-2">{$LL.mapEditor.explorer.popup.title()}</h1>
-        <video
-            src="https://workadventure-chat-uploads.s3.eu-west-1.amazonaws.com/upload/video/tuto-mapexplorer.mov"
-            class="tw-w-full tw-mb-4"
-            controls
-            muted
-            autoplay
-        />
-        <p class="tw-p-0 tw-m-0">
-            {$LL.mapEditor.explorer.popup.content()}
-        </p>
-        <p class="tw-p-0 tw-m-0 tw-mt-8">
-            <input type="checkbox" id="askagain" bind:checked={notAskAgain} on:change={onChangesAskAgain} />
-            <label for="askagain">{$LL.mapEditor.explorer.popup.notAskAgain()}</label>
-        </p>
-    </div>
-    <div
-        class="tw-flex tw-flex-row tw-justify-evenly tw-items-center tw-bg-dark-purple tw-w-full tw-p-2 tw-rounded-b-3xl"
-    >
-        <button on:click={close} class="tw-bg-dark-purple tw-p-4"> {$LL.mapEditor.explorer.popup.close()} </button>
-        <button on:click={activeExplorerMode} class="light tw-p-4"> {$LL.mapEditor.explorer.popup.continue()} </button>
-    </div>
-</div>
-
-<style lang="scss">
-    .popup-menu {
-        position: absolute;
-        width: 668px;
-        height: max-content !important;
-        z-index: 425;
-        word-break: break-all;
-        pointer-events: auto;
-        color: whitesmoke;
-        background-color: #1b2a41d9;
-        backdrop-filter: blur(40px);
-        top: 15rem;
-        left: calc(50% - 334px);
-    }
-</style>
diff --git a/play/src/front/Components/Video/VideoMediaBox.svelte b/play/src/front/Components/Video/VideoMediaBox.svelte
index 0eea94c5f7..9cd7674b6c 100644
--- a/play/src/front/Components/Video/VideoMediaBox.svelte
+++ b/play/src/front/Components/Video/VideoMediaBox.svelte
@@ -246,7 +246,7 @@
         style={videoEnabled
             ? ""
             : `border: solid 2px ${backGroundColor}; color: ${textColor}; background-color: ${backGroundColor}; color: ${textColor}`}
-        class="tw-flex tw-w-full"
+        class="tw-flex tw-w-full "
         class:tw-flex-col={videoEnabled}
         class:tw-h-full={videoEnabled}
         class:tw-items-center={!videoEnabled || $statusStore === "connecting" || $statusStore === "error"}
diff --git a/play/src/front/Components/images/default-map.png b/play/src/front/Components/images/default-map.png
deleted file mode 100644
index 3f59a76d72..0000000000
Binary files a/play/src/front/Components/images/default-map.png and /dev/null differ
diff --git a/play/src/front/Components/images/explorer.svg b/play/src/front/Components/images/explorer.svg
deleted file mode 100644
index cb0c29e4d7..0000000000
--- a/play/src/front/Components/images/explorer.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M406,244h26.5C426.6,156,356,85.4,268,79.5V106h-24V79.5C156,85.4,85.4,156,79.5,244H106v24H79.5
-	C85.4,356,156,426.6,244,432.5V406h24v26.5c88-5.9,158.6-76.5,164.5-164.5H406L406,244z M351.8,176.2l-55.3,114.7
-	c-1.2,2.4-3.2,4.4-5.6,5.6l-114.7,55.3c-1.7,0.8-3.4,1.2-5.2,1.2c-3.1,0-6.2-1.2-8.5-3.5c-3.6-3.6-4.5-9.1-2.3-13.7l55.3-114.7
-	c1.2-2.4,3.2-4.4,5.6-5.6l114.7-55.3c4.6-2.2,10.1-1.3,13.7,2.3C353.1,166.1,354,171.6,351.8,176.2L351.8,176.2z"/>
-<path class="st0" d="M196.7,315.3l68.6-33.1l-35.5-35.5L196.7,315.3z"/>
-<path class="st0" d="M425.1,86.9c-45.2-45.2-105.2-70-169.1-70s-123.9,24.9-169.1,70s-70,105.2-70,169.1s24.9,123.9,70,169.1
-	s105.2,70,169.1,70s123.9-24.9,169.1-70s70-105.2,70-169.1S470.2,132.1,425.1,86.9L425.1,86.9z M256,456.9
-	c-110.8,0-200.9-90.1-200.9-200.9S145.2,55.1,256,55.1S456.9,145.2,456.9,256S366.8,456.9,256,456.9z"/>
-<path class="st0" d="M282.2,265.3l33.1-68.6l-68.6,33.1L282.2,265.3z"/>
-</svg>
diff --git a/play/src/front/Components/images/loupe.svg b/play/src/front/Components/images/loupe.svg
deleted file mode 100644
index a405663461..0000000000
--- a/play/src/front/Components/images/loupe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" id="prefix__Capa_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 512 512" xml:space="preserve"><style>.prefix__st0{fill:#fff}</style><path class="prefix__st0" d="M310 190c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10z"/><path class="prefix__st0" d="M500.3 443.7L366.8 310.2C388.5 277.5 400 239.6 400 200 400 89.7 310.3 0 200 0S0 89.7 0 200s89.7 200 200 200c39.6 0 77.5-11.5 110.2-33.2l36.9 36.9 96.6 96.6c7.6 7.6 17.6 11.7 28.3 11.7s20.7-4.2 28.3-11.7c7.6-7.6 11.7-17.6 11.7-28.3s-4.2-20.7-11.7-28.3zm-194.8-98C274.7 368.1 238.2 380 200 380c-99.3 0-180-80.7-180-180S100.7 20 200 20s180 80.7 180 180c0 38.2-11.9 74.7-34.3 105.5-11.2 15.5-24.7 29-40.2 40.2zm21 9.1c10.4-8.5 19.8-17.9 28.3-28.3l28.4 28.4c-8.6 10.2-18.1 19.6-28.3 28.3l-28.4-28.4zm159.6 131.3c-3.8 3.8-8.8 5.9-14.1 5.9s-10.4-2.1-14.1-5.9l-88.8-88.8c10.1-8.7 19.6-18.1 28.3-28.3l88.8 88.8c3.8 3.8 5.9 8.8 5.9 14.1s-2.2 10.5-6 14.2z"/><path class="prefix__st0" d="M200 40c-88.2 0-160 71.8-160 160s71.8 160 160 160 160-71.8 160-160S288.2 40 200 40zm0 300c-77.2 0-140-62.8-140-140S122.8 60 200 60s140 62.8 140 140-62.8 140-140 140z"/><path class="prefix__st0" d="M312.1 157.1c-8.6-22.4-23.6-41.6-43.4-55.4C248.5 87.5 224.7 80 200 80c-5.5 0-10 4.5-10 10s4.5 10 10 10c41.1 0 78.6 25.8 93.4 64.2 1.5 4 5.3 6.4 9.3 6.4 1.2 0 2.4-.2 3.6-.7 5.2-1.9 7.7-7.7 5.8-12.8z"/></svg>
\ No newline at end of file
diff --git a/play/src/front/Components/images/maps-builder.png b/play/src/front/Components/images/maps-builder.png
new file mode 100644
index 0000000000..c0df67d8f3
Binary files /dev/null and b/play/src/front/Components/images/maps-builder.png differ
diff --git a/play/src/front/Components/images/maps-builder.svg b/play/src/front/Components/images/maps-builder.svg
deleted file mode 100644
index 06b556a7d1..0000000000
--- a/play/src/front/Components/images/maps-builder.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 477.9 477.9" style="enable-background:new 0 0 477.9 477.9;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M460.8,0c-2.7,0-5.3,0.6-7.6,1.8L323.8,66.5l-146.2-65c-0.2-0.1-0.5-0.1-0.8-0.2c-0.7-0.2-1.3-0.5-2-0.6
-			c-0.7-0.2-1.4-0.3-2.1-0.4c-1.4-0.1-2.8-0.1-4.2,0c-0.7,0.1-1.4,0.2-2.1,0.4c-0.7,0.2-1.4,0.4-2,0.6c-0.3,0.1-0.5,0.1-0.8,0.2
-			L10.1,69.7C4,72.5,0,78.6,0,85.3v375.5c0,5.8,2.9,11.2,7.8,14.3c4.8,3.2,10.9,3.6,16.2,1.3l146.7-65.2l146.7,65.2
-			c0.3,0.1,0.5,0,0.8,0.2c4.1,1.8,8.9,1.7,12.9-0.3c0.3-0.1,0.6,0,0.9-0.2l136.5-68.3c5.8-2.9,9.4-8.8,9.4-15.3V17.1
-			C477.9,7.6,470.2,0,460.8,0z M153.6,381.4L34.1,434.5V96.4l119.5-53.1V381.4z M307.2,434.5l-119.5-53.1V43.3l119.5,53.1V434.5z
-			 M443.7,382l-102.4,51.2V95.9l102.4-51.2V382z"/>
-	</g>
-</g>
-</svg>
diff --git a/play/src/front/Components/images/objects.svg b/play/src/front/Components/images/objects.svg
deleted file mode 100644
index 915d3d239a..0000000000
--- a/play/src/front/Components/images/objects.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M138.7,266.7C79.8,266.7,32,314.4,32,373.3S79.8,480,138.7,480s106.7-47.8,106.7-106.7
-	C245.3,314.5,197.5,266.7,138.7,266.7z M138.7,458.7c-47.1,0-85.3-38.2-85.3-85.3S91.5,288,138.7,288s85.3,38.2,85.3,85.3
-	C224,420.4,185.8,458.6,138.7,458.7z M426.7,32h-85.3C311.9,32,288,55.9,288,85.3v85.3c0,29.4,23.9,53.3,53.3,53.3h85.3
-	c29.4,0,53.3-23.9,53.3-53.3V85.3C480,55.9,456.1,32,426.7,32z M458.7,170.7c0,17.7-14.3,32-32,32h-85.3c-17.7,0-32-14.3-32-32V85.3
-	c0-17.7,14.3-32,32-32h85.3c17.7,0,32,14.3,32,32V170.7z M411,294c-7.4-14.9-25.5-20.9-40.4-13.5c-5.8,2.9-10.6,7.7-13.5,13.5
-	l-65.8,131.7c-7.5,14.9-1.4,33,13.5,40.4c4.2,2.1,8.8,3.2,13.5,3.2h131.7c16.6,0,30.1-13.5,30.1-30.1c0-4.7-1.1-9.3-3.2-13.5
-	L411,294z M457.3,443.8c-1.6,2.6-4.4,4.2-7.5,4.2H318.2c-4.9,0-8.8-3.9-8.8-8.8c0-1.4,0.3-2.7,0.9-4l65.8-131.7
-	c2.2-4.3,7.4-6.1,11.8-4c1.7,0.9,3.1,2.2,4,4l65.8,131.7C459.1,438,459,441.2,457.3,443.8L457.3,443.8z M47.2,46.3
-	c-5.5,8.9-6,20-1.3,29.3l65.8,131.7c7.4,14.9,25.5,20.9,40.4,13.5c5.8-2.9,10.6-7.7,13.5-13.5l65.8-131.7c7.5-14.9,1.4-33-13.5-40.4
-	c-4.2-2.1-8.8-3.2-13.5-3.2H72.8C62.4,32,52.7,37.4,47.2,46.3L47.2,46.3z M65.3,57.5c1.6-2.6,4.4-4.2,7.5-4.2h131.7
-	c4.9,0,8.8,3.9,8.8,8.8c0,1.4-0.3,2.7-0.9,4l-65.8,131.7c-2.2,4.3-7.4,6.1-11.8,4c-1.7-0.9-3.1-2.2-4-4L65,66.1
-	C63.6,63.4,63.7,60.1,65.3,57.5L65.3,57.5z"/>
-</svg>
diff --git a/play/src/front/Components/images/world.svg b/play/src/front/Components/images/world.svg
deleted file mode 100644
index 926032bcd4..0000000000
--- a/play/src/front/Components/images/world.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g id="Layer_4">
-	<path class="st0" d="M280,200c13.3,0,24-10.7,24-24v-16c0-13.3-10.7-24-24-24s-24,10.7-24,24v16C256,189.3,266.7,200,280,200z
-		 M272,160c0-4.4,3.6-8,8-8s8,3.6,8,8v16c0,4.4-3.6,8-8,8s-8-3.6-8-8V160z"/>
-	<path class="st0" d="M376,192h-16c-13.3,0-24,10.7-24,24s10.7,24,24,24h16c13.3,0,24-10.7,24-24S389.3,192,376,192z M376,224h-16
-		c-4.4,0-8-3.6-8-8s3.6-8,8-8h16c4.4,0,8,3.6,8,8S380.4,224,376,224z"/>
-	<path class="st0" d="M240,336h-32c-17.7,0-32,14.3-32,32s14.3,32,32,32h32c17.7,0,32-14.3,32-32S257.7,336,240,336z M240,384h-32
-		c-8.8,0-16-7.2-16-16s7.2-16,16-16h32c8.8,0,16,7.2,16,16S248.8,384,240,384z"/>
-	<path class="st0" d="M312,256c-4.4,0-8-3.6-8-8c0-13.3-10.7-24-24-24c-22.1,0-40,17.9-40,40v16c0,22.1,17.9,40,40,40h16
-		c22.1,0,40-17.9,40-40C336,266.7,325.3,256,312,256z M296,304h-16c-13.3,0-24-10.7-24-24v-16c0-13.3,10.7-24,24-24c4.4,0,8,3.6,8,8
-		c0,13.3,10.7,24,24,24c4.4,0,8,3.6,8,8C320,293.3,309.3,304,296,304z"/>
-	<path class="st0" d="M512,104c0-26.2-18.2-48.8-43.7-54.6c-12.4-37.7-53-58.2-90.8-45.8c-9.5,3.1-18.3,8.2-25.8,15
-		C220.7-34.4,71.6,28.9,18.6,160c-32,79.2-22.4,169.2,25.7,239.8c-0.2,0.5-0.4,1.1-0.6,1.6c-30.2,6.8-49.1,36.8-42.2,67
-		C7.2,493.9,29.9,512,56,512h112c9.6,0,19.1-2.5,27.5-7.3c137.3,33.5,275.8-50.7,309.2-188.1c4.8-19.9,7.3-40.2,7.3-60.7
-		c0.1-36.8-7.9-73.2-23.3-106.6C503.3,138.9,512,122,512,104z M454.2,58.4c0.8,3.2,3.5,5.6,6.8,6c21.9,3.1,37.1,23.3,34.1,45.2
-		c-2.7,19.5-19.3,34.2-39.1,34.4H344c-22.1-0.2-39.9-18.2-39.7-40.3c0.1-19.9,14.9-36.7,34.7-39.4c3.3-0.4,6-2.8,6.8-6
-		c7.5-30,37.9-48.2,67.8-40.7C433.6,22.7,449.2,38.3,454.2,58.4L454.2,58.4z M312,44V22.6c9.7,2.3,19.3,5.3,28.6,8.8
-		c-3.8,5.6-6.8,11.6-8.9,18c-9.2,2.1-17.7,6.4-24.8,12.7C310.2,56.6,312,50.4,312,44z M256,16c13.4,0,26.8,1.1,40,3.4V44
-		c0,11-9,20-20,20c-19.9,0-36,16.1-36,36v16c0,11-9,20-20,20h-7.6c-19.9,0-36,16.1-36,36c0,3.1,0.4,6.3,1.2,9.3l8.4,31.4
-		c7.8,29.5-2.2,60.9-25.6,80.5c-18.4,15.4-45.8,12.9-61.1-5.5c-2.8-3.3-5.1-7.1-6.7-11.1C83.4,254.4,61.7,240,37.7,240H16.6
-		C25.1,114,129.7,16.2,256,16z M56,496c-22.1-0.2-39.9-18.2-39.7-40.3c0.1-19.9,14.9-36.7,34.7-39.4c3.3-0.4,6-2.8,6.8-6
-		c7.5-30,37.9-48.2,67.8-40.7c20,5,35.7,20.6,40.7,40.7c0.8,3.2,3.5,5.6,6.8,6c21.9,2.9,37.3,23,34.4,44.9
-		c-2.6,19.8-19.4,34.6-39.4,34.7H56z M256,496v-24c0-17.7,14.3-32,32-32c26.5,0,48-21.5,48-48c-0.1-22.2,11.3-42.9,30-54.7l34-21.6
-		c15-9.5,24-26,24-43.7c0-17.7,14.3-32,32-32h39.4c0.3,5.3,0.6,10.6,0.6,16C495.9,388.5,388.5,495.9,256,496z M493.8,224H456
-		c-26.5,0-48,21.5-48,48c0,12.2-6.2,23.6-16.5,30.1l-34,21.6c-23.4,14.8-37.5,40.6-37.5,68.3c0,17.7-14.3,32-32,32
-		c-26.5,0-48,21.5-48,48v23.4c-9.7-0.6-19.4-1.9-29-3.7c19.8-23.7,16.6-59-7.1-78.8c-6.8-5.7-14.9-9.7-23.6-11.6
-		c-12.4-37.7-53-58.2-90.8-45.8c-15,4.9-28,14.7-36.9,27.7C28.7,345.2,15.9,301.1,16,256h21.7c17.5,0,33.4,10.5,40.1,26.7
-		c7.2,17.5,22.3,30.5,40.7,34.9c4.7,1.2,9.5,1.8,14.4,1.8c13.8,0,27.2-4.9,37.8-13.8c28.2-23.6,40.2-61.4,30.8-97l-8.4-31.4
-		c-2.8-10.7,3.5-21.6,14.2-24.5c1.7-0.4,3.4-0.7,5.2-0.7h7.6c19.9,0,36-16.1,36-36v-16c0-11,9-20,20-20c8.1,0,16-2.8,22.3-7.9
-		c-17.8,25.1-11.9,59.9,13.2,77.7c9.5,6.7,20.9,10.3,32.5,10.3h112c6.3,0,12.6-1.1,18.5-3.2C484.2,178.1,490.7,200.8,493.8,224z"/>
-</g>
-</svg>
diff --git a/play/src/front/Connection/LocalUserStore.ts b/play/src/front/Connection/LocalUserStore.ts
index 78ff61f49e..969d8daca9 100644
--- a/play/src/front/Connection/LocalUserStore.ts
+++ b/play/src/front/Connection/LocalUserStore.ts
@@ -263,6 +263,7 @@ class LocalUserStore {
     }
 
     setPreferredVideoInputDevice(deviceId?: string) {
+        console.log("setPreferredVideoInputDevice", deviceId);
         if (deviceId === undefined) {
             localStorage.removeItem(preferredVideoInputDevice);
             return;
diff --git a/play/src/front/Connection/RoomConnection.ts b/play/src/front/Connection/RoomConnection.ts
index f3b8c63439..f4e02e634c 100644
--- a/play/src/front/Connection/RoomConnection.ts
+++ b/play/src/front/Connection/RoomConnection.ts
@@ -59,7 +59,6 @@ import {
     AskMuteMicrophoneMessage,
     AskMutedMessage,
     AskMutedVideoMessage,
-    ModifiyWAMMetadataMessage,
 } from "@workadventure/messages";
 import { BehaviorSubject, Subject } from "rxjs";
 import type { AreaData, AtLeast, WAMEntityData } from "@workadventure/map-editor";
@@ -454,6 +453,7 @@ export class RoomConnection implements RoomConnection {
                                 break;
                             }
                             case "muteMicrophoneMessage": {
+                                console.log("muteMicrophoneSpaceUserMessage", subMessage.muteMicrophoneMessage);
                                 if (subMessage.muteMicrophoneMessage.userId !== this.userId?.toString()) break;
 
                                 this._muteMicrophoneMessage.next(subMessage.muteMicrophoneMessage);
@@ -740,6 +740,7 @@ export class RoomConnection implements RoomConnection {
                     break;
                 }
                 case "mutedMessage": {
+                    console.log("mutedMessage", message.mutedMessage);
                     this._mutedMessage.next(message.mutedMessage);
                     break;
                 }
@@ -748,6 +749,7 @@ export class RoomConnection implements RoomConnection {
                     break;
                 }
                 case "askMutedMessage": {
+                    console.log("askMutedMessage", message.askMutedMessage);
                     this._askMutedMessage.next(message.askMutedMessage);
                     break;
                 }
@@ -1368,26 +1370,6 @@ export class RoomConnection implements RoomConnection {
         });
     }
 
-    public emitModifiyWAMMetadataMessage(
-        commandId: string,
-        modifiyWAMMetadataMessage: ModifiyWAMMetadataMessage
-    ): void {
-        this.send({
-            message: {
-                $case: "editMapCommandMessage",
-                editMapCommandMessage: {
-                    id: commandId,
-                    editMapMessage: {
-                        message: {
-                            $case: "modifiyWAMMetadataMessage",
-                            modifiyWAMMetadataMessage,
-                        },
-                    },
-                },
-            },
-        });
-    }
-
     public getAllTags(): string[] {
         return this.tags;
     }
diff --git a/play/src/front/Phaser/Components/MapEditor/AreaPreview.ts b/play/src/front/Phaser/Components/MapEditor/AreaPreview.ts
index 8d70d3d8a5..9e4cf3fbc0 100644
--- a/play/src/front/Phaser/Components/MapEditor/AreaPreview.ts
+++ b/play/src/front/Phaser/Components/MapEditor/AreaPreview.ts
@@ -1,10 +1,4 @@
-import type {
-    AreaData,
-    AreaDataProperties,
-    AreaDataProperty,
-    AreaDescriptionPropertyData,
-    AtLeast,
-} from "@workadventure/map-editor";
+import type { AreaData, AreaDataProperties, AreaDataProperty, AtLeast } from "@workadventure/map-editor";
 import _ from "lodash";
 import { GameObjects } from "phaser";
 import { GameScene } from "../../Game/GameScene";
@@ -78,7 +72,6 @@ export class AreaPreview extends Phaser.GameObjects.Rectangle {
         this.setSize(bounds.width, bounds.height);
         this.setInteractive({ cursor: "grab" });
         this.scene.input.setDraggable(this);
-        this.drawAreaPreviewFromAreaData(areaData);
 
         this.showSizeAlteringSquares(false);
 
@@ -124,12 +117,8 @@ export class AreaPreview extends Phaser.GameObjects.Rectangle {
 
     public updatePreview(dataToModify: AtLeast<AreaData, "id">): void {
         _.merge(this.areaData, dataToModify);
-        this.drawAreaPreviewFromAreaData(dataToModify);
-    }
-
-    private drawAreaPreviewFromAreaData(areaData: AreaData | AtLeast<AreaData, "id">): void {
-        if (areaData.properties !== undefined) {
-            this.areaData.properties = areaData.properties;
+        if (dataToModify.properties !== undefined) {
+            this.areaData.properties = dataToModify.properties;
 
             this.propertiesIcon.forEach((icon: GameObjects.Image) => icon.destroy());
             let counter = 0;
@@ -200,6 +189,13 @@ export class AreaPreview extends Phaser.GameObjects.Rectangle {
         this.squares.forEach((square) => square.destroy());
     }
 
+    public updateAreaData(dataToChange: Partial<AreaData>): void {
+        const oldAreaData = structuredClone(this.areaData);
+        const data = { id: this.areaData.id, ...dataToChange };
+        this.updatePreview(data);
+        this.emit(AreaPreviewEvent.Updated, data, oldAreaData);
+    }
+
     private showSizeAlteringSquares(show = true): void {
         if (show && !this.visible) {
             return;
@@ -415,7 +411,7 @@ export class AreaPreview extends Phaser.GameObjects.Rectangle {
     public setAreaName(name: string): void {
         const oldAreaData = structuredClone(this.areaData);
         this.areaData.name = name;
-        const data = { id: this.areaData.id, name: this.areaData.name };
+        const data = { id: this.areaData.id, name };
         this.emit(AreaPreviewEvent.Updated, data, oldAreaData);
     }
 
@@ -499,18 +495,4 @@ export class AreaPreview extends Phaser.GameObjects.Rectangle {
         }
         this.updateSquaresPositions();
     }
-
-    public get description(): string | undefined {
-        const descriptionProperty: AreaDescriptionPropertyData | undefined = this.areaData.properties.find(
-            (p) => p.type === "areaDescriptionProperties"
-        ) as AreaDescriptionPropertyData | undefined;
-        return descriptionProperty?.description;
-    }
-
-    public get searchable(): boolean | undefined {
-        const descriptionProperty: AreaDescriptionPropertyData | undefined = this.areaData.properties.find(
-            (p) => p.type === "areaDescriptionProperties"
-        ) as AreaDescriptionPropertyData | undefined;
-        return descriptionProperty?.searchable;
-    }
 }
diff --git a/play/src/front/Phaser/ECS/Entity.ts b/play/src/front/Phaser/ECS/Entity.ts
index a8994509b5..0dc8efb7d1 100644
--- a/play/src/front/Phaser/ECS/Entity.ts
+++ b/play/src/front/Phaser/ECS/Entity.ts
@@ -3,7 +3,6 @@ import {
     EntityData,
     EntityDataProperties,
     EntityDataProperty,
-    EntityDescriptionPropertyData,
     EntityPrefab,
     GameMapProperties,
     WAMEntityData,
@@ -376,18 +375,4 @@ export class Entity extends Phaser.GameObjects.Image implements ActivatableInter
             id: this.entityId,
         };
     }
-
-    public get description(): string | undefined {
-        const descriptionProperty: EntityDescriptionPropertyData | undefined = this.entityData.properties.find(
-            (p) => p.type === "entityDescriptionProperties"
-        ) as EntityDescriptionPropertyData | undefined;
-        return descriptionProperty?.description;
-    }
-
-    public get searchable(): boolean | undefined {
-        const descriptionProperty: EntityDescriptionPropertyData | undefined = this.entityData.properties.find(
-            (p) => p.type === "entityDescriptionProperties"
-        ) as EntityDescriptionPropertyData | undefined;
-        return descriptionProperty?.searchable;
-    }
 }
diff --git a/play/src/front/Phaser/Game/CameraManager.ts b/play/src/front/Phaser/Game/CameraManager.ts
index a6b021a8fa..0be4668d0f 100644
--- a/play/src/front/Phaser/Game/CameraManager.ts
+++ b/play/src/front/Phaser/Game/CameraManager.ts
@@ -2,8 +2,6 @@ import { mapEditorModeStore } from "../../Stores/MapEditorStore";
 import { Easing } from "../../types";
 import { HtmlUtils } from "../../WebRtc/HtmlUtils";
 import type { Box } from "../../WebRtc/LayoutManager";
-import { AreaPreview } from "../Components/MapEditor/AreaPreview";
-import { Entity } from "../ECS/Entity";
 import type { Player } from "../Player/Player";
 import { hasMovedEventName } from "../Player/Player";
 import type { WaScaleManagerFocusTarget, WaScaleManager } from "../Services/WaScaleManager";
@@ -25,11 +23,6 @@ export enum CameraMode {
      * Camera is focusing on certain point and will not break this focus even on player movement
      */
     Focus = "Focus",
-
-    /**
-     * Camera is free and can be moved anywhere on the map by the user (only in the exploration mode)
-     */
-    Exploration = "Exploration",
 }
 
 export enum CameraManagerEvent {
@@ -209,6 +202,12 @@ export class CameraManager extends Phaser.Events.EventEmitter {
         }
     }
 
+    public scrollBy(x: number, y: number): void {
+        this.camera.scrollX += x;
+        this.camera.scrollY += y;
+        this.scene.markDirty();
+    }
+
     public startFollowPlayer(player: Player, duration = 0): void {
         this.playerToFollow = player;
         this.setCameraMode(CameraMode.Follow);
@@ -300,7 +299,7 @@ export class CameraManager extends Phaser.Events.EventEmitter {
         return targetZoomModifier - currentZoomModifier;
     }
 
-    public unlockCameraWithDelay(delay: number): void {
+    private unlockCameraWithDelay(delay: number): void {
         this.scene.time.delayedCall(delay, () => {
             this.cameraLocked = false;
         });
@@ -344,7 +343,6 @@ export class CameraManager extends Phaser.Events.EventEmitter {
                     return;
                 }
                 this.camera.centerOn(focusOn.x, focusOn.y);
-
                 this.emit(CameraManagerEvent.CameraUpdate, this.getCameraUpdateEventData());
             }
         );
@@ -363,45 +361,4 @@ export class CameraManager extends Phaser.Events.EventEmitter {
             zoom: this.camera.scaleManager.zoom,
         };
     }
-
-    private explorationMouseIsActive = false;
-    // Create function to define the camera on exploration mode. The camera can be moved anywhere on the map. The camera is not locked on the player. The camera can be zoomed in and out. The camera can be moved with the mouse. The camera can be moved with the keyboard. The camera can be moved with the touchpad.
-    public setExplorationMode(): void {
-        this.cameraLocked = false;
-        this.stopFollow();
-        this.cameraLocked = false;
-        this.setCameraMode(CameraMode.Exploration);
-        this.scene.cameras.main.setBounds(
-            -this.cameraBounds.x,
-            -this.cameraBounds.y,
-            this.cameraBounds.x * 3,
-            this.cameraBounds.y * 3,
-            true
-        );
-
-        // Center the camera on the player
-        this.scene.cameras.main.centerOn(this.scene.CurrentPlayer.x, this.scene.CurrentPlayer.y);
-    }
-
-    public goToEntity(entity: Entity): void {
-        this.scene.cameras.main.centerOn(entity.x, entity.y);
-        this.scene.markDirty();
-    }
-    public goToAreaPreviex(area: AreaPreview): void {
-        this.scene.cameras.main.centerOn(area.x, area.y);
-        this.scene.markDirty();
-    }
-
-    public lockCameraDuring(delay = 3000): void {
-        this.cameraLocked = true;
-        this.scene.time.delayedCall(delay, () => {
-            this.cameraLocked = false;
-        });
-    }
-
-    emit(event: string | symbol, ...args: unknown[]): boolean {
-        // If the camera is defined on Exploration mode, the camaera manager events will be not emitted
-        if (event === CameraManagerEvent.CameraUpdate && CameraMode.Exploration === this.cameraMode) false;
-        return super.emit(event, ...args);
-    }
 }
diff --git a/play/src/front/Phaser/Game/GameMap/EntitiesManager.ts b/play/src/front/Phaser/Game/GameMap/EntitiesManager.ts
index 2dcd9e7241..fdc837ac85 100644
--- a/play/src/front/Phaser/Game/GameMap/EntitiesManager.ts
+++ b/play/src/front/Phaser/Game/GameMap/EntitiesManager.ts
@@ -1,10 +1,4 @@
-import {
-    AreaDataProperties,
-    EntityData,
-    EntityDataProperties,
-    EntityPrefabRef,
-    WAMEntityData,
-} from "@workadventure/map-editor";
+import { EntityData, EntityDataProperties, EntityPrefabRef, WAMEntityData } from "@workadventure/map-editor";
 import { Observable, Subject } from "rxjs";
 import { get, Unsubscriber } from "svelte/store";
 import { z } from "zod";
@@ -40,8 +34,7 @@ export const CopyAreaEventData = z.object({
     width: z.number(),
     height: z.number(),
     name: z.string(),
-    description: z.string(),
-    properties: AreaDataProperties.optional(),
+    properties: EntityDataProperties.optional(),
 });
 
 export type CopyEntityEventData = z.infer<typeof CopyEntityEventData>;
@@ -416,15 +409,4 @@ export class EntitiesManager extends Phaser.Events.EventEmitter {
     public close() {
         this.actionsMenuStoreUnsubscriber();
     }
-
-    public setAllEntitiesPointedToEditColor(color: number) {
-        for (const entity of this.entities.values()) {
-            entity.setPointedToEditColor(color);
-        }
-    }
-    public removeAllEntitiesPointedToEditColor() {
-        for (const entity of this.entities.values()) {
-            entity.removePointedToEditColor();
-        }
-    }
 }
diff --git a/play/src/front/Phaser/Game/GameScene.ts b/play/src/front/Phaser/Game/GameScene.ts
index 519eea20b0..14f7c517da 100644
--- a/play/src/front/Phaser/Game/GameScene.ts
+++ b/play/src/front/Phaser/Game/GameScene.ts
@@ -116,14 +116,13 @@ import type { HasPlayerMovedInterface } from "../../Api/Events/HasPlayerMovedInt
 import { gameSceneIsLoadedStore, gameSceneStore } from "../../Stores/GameSceneStore";
 import { myCameraBlockedStore, myMicrophoneBlockedStore } from "../../Stores/MyMediaStore";
 import type { GameStateEvent } from "../../Api/Events/GameStateEvent";
-import { modalPopupVisibilityStore, modalVisibilityStore } from "../../Stores/ModalStore";
+import { modalVisibilityStore } from "../../Stores/ModalStore";
 import { currentPlayerWokaStore } from "../../Stores/CurrentPlayerWokaStore";
 import {
     WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM,
     mapEditorWamSettingsEditorToolCurrentMenuItemStore,
     mapEditorModeStore,
     mapEditorSelectedToolStore,
-    mapExplorationModeStore,
 } from "../../Stores/MapEditorStore";
 import { refreshPromptStore } from "../../Stores/RefreshPromptStore";
 import { debugAddPlayer, debugRemovePlayer, debugUpdatePlayer } from "../../Utils/Debuggers";
@@ -230,7 +229,6 @@ export class GameScene extends DirtyScene {
     private availabilityStatusStoreUnsubscriber!: Unsubscriber;
     private mapEditorModeStoreUnsubscriber!: Unsubscriber;
     private refreshPromptStoreStoreUnsubscriber!: Unsubscriber;
-    private mapExplorationStoreUnsubscriber!: Unsubscriber;
 
     private modalVisibilityStoreUnsubscriber!: Unsubscriber;
     private unsubscribers: Unsubscriber[] = [];
@@ -341,7 +339,6 @@ export class GameScene extends DirtyScene {
         this.load.audio("audio-webrtc-out", "/resources/objects/webrtc-out.mp3");
         this.load.audio("audio-report-message", "/resources/objects/report-message.mp3");
         this.load.audio("audio-megaphone", "/resources/objects/megaphone.mp3");
-        this.load.audio("audio-cloud", "/resources/objects/cloud.mp3");
         this.sound.pauseOnBlur = false;
 
         this.load.on(FILE_LOAD_ERROR, (file: { src: string }) => {
@@ -1380,8 +1377,7 @@ export class GameScene extends DirtyScene {
             this.followUsersColorStoreUnsubscriber != undefined ||
             this.peerStoreUnsubscriber != undefined ||
             this.mapEditorModeStoreUnsubscriber != undefined ||
-            this.refreshPromptStoreStoreUnsubscriber != undefined ||
-            this.mapExplorationStoreUnsubscriber != undefined
+            this.refreshPromptStoreStoreUnsubscriber != undefined
         ) {
             console.error(
                 "subscribeToStores => Check all subscriber undefined ",
@@ -1393,8 +1389,7 @@ export class GameScene extends DirtyScene {
                 this.followUsersColorStoreUnsubscriber,
                 this.peerStoreUnsubscriber,
                 this.mapEditorModeStoreUnsubscriber,
-                this.refreshPromptStoreStoreUnsubscriber,
-                this.mapExplorationStoreUnsubscriber
+                this.refreshPromptStoreStoreUnsubscriber
             );
 
             throw new Error("One store is already subscribed.");
@@ -1629,14 +1624,6 @@ export class GameScene extends DirtyScene {
                 this.userInputManager.restoreControls();
             }
         });
-
-        this.mapExplorationStoreUnsubscriber = mapExplorationModeStore.subscribe((exploration) => {
-            if (exploration) {
-                this.cameraManager.setExplorationMode();
-            } else {
-                this.input.keyboard?.enableGlobalCapture();
-            }
-        });
     }
 
     //todo: into dedicated classes
@@ -2544,7 +2531,6 @@ ${escapedMessage}
         this.userIsJitsiDominantSpeakerStoreUnsubscriber?.();
         this.jitsiParticipantsCountStoreUnsubscriber?.();
         this.availabilityStatusStoreUnsubscriber?.();
-        this.mapExplorationStoreUnsubscriber?.();
         for (const unsubscriber of this.unsubscribers) {
             unsubscriber();
         }
@@ -2727,14 +2713,9 @@ ${escapedMessage}
         }
     }
 
-    public moveTo(position: { x: number; y: number }, measuredInPixels = true, tryFindingNearestAvailable = false) {
+    public moveTo(position: { x: number; y: number }) {
         this.pathfindingManager
-            .findPath(
-                this.gameMapFrontWrapper.getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y),
-                position,
-                measuredInPixels,
-                tryFindingNearestAvailable
-            )
+            .findPath(this.gameMapFrontWrapper.getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y), position)
             .then((path) => {
                 if (path && path.length > 0) {
                     this.CurrentPlayer.setPathToFollow(path).catch((reason) => console.warn(reason));
@@ -3357,34 +3338,12 @@ ${escapedMessage}
         });
     }
 
-    zoomByFactor(zoomFactor: number, velocity?: number) {
+    zoomByFactor(zoomFactor: number) {
         if (this.cameraManager.isCameraLocked()) {
             return;
         }
-        // If the zoom modifier is over the max zoom out, we propose to the user to switch to the explorer mode
-        // Rule: if the velocity is over 1, we could imagine that the user force to switch on the explorer mode
-        if (
-            velocity &&
-            velocity > 1 &&
-            zoomFactor < 1 &&
-            waScaleManager.zoomModifier <= waScaleManager.maxZoomOut &&
-            !get(mapEditorModeStore)
-        ) {
-            const askAgainPopup = localStorage.getItem("notAskAgainPopupExplorerMode");
-            if (askAgainPopup == undefined || localStorage.getItem("notAskAgainPopupExplorerMode") === "false") {
-                modalPopupVisibilityStore.set(true);
-            } else {
-                const matEditoreModeState = get(mapEditorModeStore);
-                analyticsClient.toggleMapEditor(!matEditoreModeState);
-                mapEditorModeStore.switchMode(!matEditoreModeState);
-            }
-
-            // Lock the camera to keep the same zoom after animation. The camera will be unlock when the Explorer tool is activated or after 3000ms.
-            this.cameraManager.lockCameraDuring(3000);
-            return;
-        }
-
         waScaleManager.handleZoomByFactor(zoomFactor);
+        // biggestAvailableAreaStore.recompute();
     }
 
     public createSuccessorGameScene(autostart: boolean, reconnecting: boolean) {
diff --git a/play/src/front/Phaser/Game/MapEditor/Commands/Entity/UpdateEntityFrontCommand.ts b/play/src/front/Phaser/Game/MapEditor/Commands/Entity/UpdateEntityFrontCommand.ts
index f0919f311f..61ed41b9a1 100644
--- a/play/src/front/Phaser/Game/MapEditor/Commands/Entity/UpdateEntityFrontCommand.ts
+++ b/play/src/front/Phaser/Game/MapEditor/Commands/Entity/UpdateEntityFrontCommand.ts
@@ -1,4 +1,4 @@
-import { GameMap, UpdateEntityCommand, WAMEntityData, WAMFileFormat } from "@workadventure/map-editor";
+import { GameMap, UpdateEntityCommand, WAMEntityData } from "@workadventure/map-editor";
 import { EntitiesManager } from "../../../GameMap/EntitiesManager";
 import { Entity } from "../../../../ECS/Entity";
 import { GameScene } from "../../../GameScene";
@@ -18,7 +18,7 @@ export class UpdateEntityFrontCommand extends UpdateEntityCommand implements Fro
         super(gameMap, entityId, dataToModify, commandId, oldConfig);
     }
 
-    public execute(): Promise<WAMFileFormat | undefined> {
+    public execute(): Promise<void> {
         const returnVal = super.execute();
         this.handleEntityUpdate(this.newConfig);
 
diff --git a/play/src/front/Phaser/Game/MapEditor/Commands/WAM/UpdateWAMMetadataFrontCommand.ts b/play/src/front/Phaser/Game/MapEditor/Commands/WAM/UpdateWAMMetadataFrontCommand.ts
deleted file mode 100644
index 9493a6506d..0000000000
--- a/play/src/front/Phaser/Game/MapEditor/Commands/WAM/UpdateWAMMetadataFrontCommand.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Command, WAMFileFormat } from "@workadventure/map-editor";
-import { ModifiyWAMMetadataMessage } from "@workadventure/messages";
-import { FrontCommandInterface } from "../FrontCommandInterface";
-import { RoomConnection } from "../../../../../Connection/RoomConnection";
-
-/**
- * Represents a front command for updating WAM metadata.
- */
-export class UpdateWAMMetadataFrontCommand extends Command implements FrontCommandInterface {
-    constructor(private readonly modifiyWAMMetadataMessage: ModifiyWAMMetadataMessage, commandId?: string) {
-        super(commandId);
-    }
-
-    /**
-     * Gets the undo command for updating WAM metadata.
-     * @returns The undo command.
-     */
-    public getUndoCommand(): UpdateWAMMetadataFrontCommand {
-        return new UpdateWAMMetadataFrontCommand(this.modifiyWAMMetadataMessage, this.commandId);
-    }
-
-    /**
-     * Emits an event to modify WAM metadata.
-     * @param roomConnection - The room connection.
-     */
-    public emitEvent(roomConnection: RoomConnection): void {
-        roomConnection.emitModifiyWAMMetadataMessage(this.commandId, this.modifiyWAMMetadataMessage);
-    }
-
-    /**
-     * Executes the command to update WAM metadata.
-     * @returns A promise that resolves when the command is executed.
-     */
-    public execute(): Promise<void | undefined | WAMFileFormat> {
-        console.warn("UpdateWAMMetadataFrontCommand.execute() is not implemented");
-        return Promise.resolve(undefined);
-    }
-}
diff --git a/play/src/front/Phaser/Game/MapEditor/MapEditorModeManager.ts b/play/src/front/Phaser/Game/MapEditor/MapEditorModeManager.ts
index dd11d1786e..ce2d0ad661 100644
--- a/play/src/front/Phaser/Game/MapEditor/MapEditorModeManager.ts
+++ b/play/src/front/Phaser/Game/MapEditor/MapEditorModeManager.ts
@@ -6,7 +6,6 @@ import debug from "debug";
 import type { RoomConnection } from "../../../Connection/RoomConnection";
 import type { GameScene } from "../GameScene";
 import { mapEditorModeStore, mapEditorSelectedToolStore } from "../../../Stores/MapEditorStore";
-import { mapEditorActivated } from "../../../Stores/MenuStore";
 import { AreaEditorTool } from "./Tools/AreaEditorTool";
 import type { MapEditorTool } from "./Tools/MapEditorTool";
 import { FloorEditorTool } from "./Tools/FloorEditorTool";
@@ -15,8 +14,6 @@ import { WAMSettingsEditorTool } from "./Tools/WAMSettingsEditorTool";
 import { FrontCommandInterface } from "./Commands/FrontCommandInterface";
 import { FrontCommand } from "./Commands/FrontCommand";
 import { TrashEditorTool } from "./Tools/TrashEditorTool";
-import { ExplorerTool } from "./Tools/ExplorerTool";
-import { CloseTool } from "./Tools/CloseTool";
 
 export enum EditorToolName {
     AreaEditor = "AreaEditor",
@@ -24,8 +21,6 @@ export enum EditorToolName {
     EntityEditor = "EntityEditor",
     WAMSettingsEditor = "WAMSettingsEditor",
     TrashEditor = "TrashEditor",
-    ExploreTheRoom = "ExploreTheRoom",
-    CloseMapEditor = "CloseMapEditor",
 }
 
 const logger = debug("map-editor");
@@ -91,8 +86,6 @@ export class MapEditorModeManager {
             [EditorToolName.FloorEditor]: new FloorEditorTool(this),
             [EditorToolName.WAMSettingsEditor]: new WAMSettingsEditorTool(this),
             [EditorToolName.TrashEditor]: new TrashEditorTool(this),
-            [EditorToolName.ExploreTheRoom]: new ExplorerTool(this),
-            [EditorToolName.CloseMapEditor]: new CloseTool(),
         };
         this.activeTool = undefined;
         this.lastlyUsedTool = undefined;
@@ -235,47 +228,25 @@ export class MapEditorModeManager {
 
     public handleKeyDownEvent(event: KeyboardEvent): void {
         this.currentlyActiveTool?.handleKeyDownEvent(event);
-        const mapEditorModeActivated = get(mapEditorActivated);
-        if (!mapEditorModeActivated) return;
         switch (event.key.toLowerCase()) {
             case "`": {
-                this.equipTool(undefined);
+                this.equipTool();
                 break;
             }
             case "1": {
-                this.equipTool(EditorToolName.ExploreTheRoom);
-                break;
-            }
-            case "2": {
-                if (!mapEditorModeActivated) {
-                    this.equipTool(EditorToolName.CloseMapEditor);
-                    break;
-                }
                 this.equipTool(EditorToolName.AreaEditor);
                 break;
             }
-            case "3": {
-                if (!mapEditorModeActivated) break;
+            case "2": {
                 this.equipTool(EditorToolName.EntityEditor);
                 break;
             }
-            case "4": {
-                if (!mapEditorModeActivated) break;
-                this.equipTool(EditorToolName.WAMSettingsEditor);
-                break;
-            }
-            case "5": {
-                if (!mapEditorModeActivated) break;
-                this.equipTool(EditorToolName.TrashEditor);
-                break;
-            }
-            case "6": {
-                if (!mapEditorModeActivated) break;
-                this.equipTool(EditorToolName.CloseMapEditor);
+            case "3": {
+                // NOTE: Hide it untill FloorEditing is done
+                // this.equipTool(EditorToolName.FloorEditor);
                 break;
             }
             case "z": {
-                if (!mapEditorModeActivated) break;
                 // Todo replace with key combo https://photonstorm.github.io/phaser3-docs/Phaser.Input.Keyboard.KeyCombo.html
                 if (this.ctrlKey?.isDown) {
                     if (this.shiftKey?.isDown) {
@@ -428,7 +399,7 @@ export class MapEditorModeManager {
         this.mapEditorModeUnsubscriber();
     }
 
-    public get currentlyActiveTool(): MapEditorTool | undefined {
+    private get currentlyActiveTool(): MapEditorTool | undefined {
         return this.activeTool ? this.editorTools[this.activeTool] : undefined;
     }
 
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/AreaEditorTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/AreaEditorTool.ts
index c1dab0191a..0648a3e0dd 100644
--- a/play/src/front/Phaser/Game/MapEditor/Tools/AreaEditorTool.ts
+++ b/play/src/front/Phaser/Game/MapEditor/Tools/AreaEditorTool.ts
@@ -25,7 +25,7 @@ export class AreaEditorTool extends MapEditorTool {
     /**
      * Visual representations of map Areas objects
      */
-    private areaPreviews: AreaPreview[] = [];
+    private areaPreviews: AreaPreview[];
     private currentlySelectedPreview: AreaPreview | undefined;
 
     private active: boolean;
@@ -62,6 +62,7 @@ export class AreaEditorTool extends MapEditorTool {
         this.shiftKey = this.scene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.SHIFT);
         this.ctrlKey = this.scene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.CTRL);
 
+        this.areaPreviews = this.createAreaPreviews();
         this.active = false;
         this.drawingNewArea = false;
 
@@ -94,7 +95,6 @@ export class AreaEditorTool extends MapEditorTool {
     }
 
     public activate(): void {
-        this.areaPreviews = this.createAreaPreviews();
         this.active = true;
         this.scene.input.setTopOnly(false);
         this.updateAreaPreviews();
@@ -105,7 +105,6 @@ export class AreaEditorTool extends MapEditorTool {
     }
 
     public destroy(): void {
-        this.areaPreviews.forEach((preview) => preview.destroy());
         this.selectedAreaPreviewStoreSubscriber();
         this.unbindEventHandlers();
         this.scene.input.setDefaultCursor("auto");
@@ -468,6 +467,8 @@ export class AreaEditorTool extends MapEditorTool {
             return;
         }
 
+        console.log("handleAreaUpdate", oldConfig, newConfig);
+
         const area = this.areaPreviews.find((area) => area.getAreaData().id === newConfig.id);
 
         if (area) {
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/CloseTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/CloseTool.ts
deleted file mode 100644
index d251d8a57f..0000000000
--- a/play/src/front/Phaser/Game/MapEditor/Tools/CloseTool.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { EditMapCommandMessage } from "@workadventure/messages";
-import { GameMapFrontWrapper } from "../../GameMap/GameMapFrontWrapper";
-import { mapEditorModeStore, mapEditorVisibilityStore } from "../../../../Stores/MapEditorStore";
-import { gameManager } from "../../GameManager";
-import { analyticsClient } from "../../../../Administration/AnalyticsClient";
-import { MapEditorTool } from "./MapEditorTool";
-
-export class CloseTool implements MapEditorTool {
-    public update(time: number, dt: number): void {
-        console.warn("Method not implemented.", time, dt);
-    }
-    public clear(): void {
-        console.warn("Method not implemented.");
-    }
-    public activate(): void {
-        analyticsClient.toggleMapEditor(false);
-        gameManager.getCurrentGameScene().getMapEditorModeManager().equipTool(undefined);
-        mapEditorModeStore.switchMode(false);
-        mapEditorVisibilityStore.set(false);
-    }
-    public destroy(): void {
-        console.warn("Method not implemented.");
-    }
-    public subscribeToGameMapFrontWrapperEvents(gameMapFrontWrapper: GameMapFrontWrapper): void {
-        console.warn("Method not implemented.", gameMapFrontWrapper);
-    }
-    public handleKeyDownEvent(event: KeyboardEvent): void {
-        console.warn("Method not implemented.", event);
-    }
-    public handleIncomingCommandMessage(editMapCommandMessage: EditMapCommandMessage): Promise<void> {
-        console.warn("Method not implemented.", editMapCommandMessage);
-        return Promise.resolve();
-    }
-}
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/EntityRelatedEditorTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/EntityRelatedEditorTool.ts
index 0ac0e92bb8..2b81fcc166 100644
--- a/play/src/front/Phaser/Game/MapEditor/Tools/EntityRelatedEditorTool.ts
+++ b/play/src/front/Phaser/Game/MapEditor/Tools/EntityRelatedEditorTool.ts
@@ -10,7 +10,6 @@ import {
     mapEditorSelectedEntityDraggedStore,
     mapEditorSelectedEntityPrefabStore,
     mapEditorSelectedEntityStore,
-    mapEditorVisibilityStore,
 } from "../../../../Stores/MapEditorStore";
 import { GameMapFrontWrapper } from "../../GameMap/GameMapFrontWrapper";
 import { TexturesHelper } from "../../../Helpers/TexturesHelper";
@@ -58,7 +57,6 @@ export abstract class EntityRelatedEditorTool extends MapEditorTool {
     public activate(): void {
         this.scene.input.topOnly = true;
         this.entitiesManager.makeAllEntitiesInteractive();
-        mapEditorVisibilityStore.set(true);
     }
 
     public destroy(): void {
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/ExplorerTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/ExplorerTool.ts
deleted file mode 100644
index 1f68a760d7..0000000000
--- a/play/src/front/Phaser/Game/MapEditor/Tools/ExplorerTool.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-import { EditMapCommandMessage } from "@workadventure/messages";
-import debug from "debug";
-import { Unsubscriber, get } from "svelte/store";
-import { AreaData, AreaDescriptionPropertyData } from "@workadventure/map-editor";
-import { GameMapFrontWrapper } from "../../GameMap/GameMapFrontWrapper";
-import { analyticsClient } from "../../../../Administration/AnalyticsClient";
-import {
-    mapEditorVisibilityStore,
-    mapExplorationAreasStore,
-    mapExplorationEntitiesStore,
-    mapExplorationModeStore,
-    mapExplorationObjectSelectedStore,
-} from "../../../../Stores/MapEditorStore";
-import { gameManager } from "../../GameManager";
-import { GameScene } from "../../GameScene";
-import { Entity } from "../../../ECS/Entity";
-import { MapEditorModeManager } from "../MapEditorModeManager";
-import { EntitiesManager } from "../../GameMap/EntitiesManager";
-import { AreaPreview } from "../../../Components/MapEditor/AreaPreview";
-import {
-    INITIAL_ZOOM_OUT_EXPLORER_MODE,
-    MAX_ZOOM_OUT_EXPLORER_MODE,
-    waScaleManager,
-} from "../../../Services/WaScaleManager";
-import { MapEditorTool } from "./MapEditorTool";
-
-const logger = debug("explorer-tool");
-
-export class ExplorerTool implements MapEditorTool {
-    private scene: GameScene;
-    private downIsPressed = false;
-    private upIsPressed = false;
-    private leftIsPressed = false;
-    private rightIsPressed = false;
-    private explorationMouseIsActive = false;
-    private entitiesManager: EntitiesManager;
-    private lastCameraCenterXToZoom = 0;
-    private lastCameraCenterYToZoom = 0;
-    private mapExplorationEntitiesSubscribe: Unsubscriber | undefined;
-
-    private keyDownHandler = (event: KeyboardEvent) => {
-        if (event.key === "ArrowDown" || event.key === "s") {
-            this.downIsPressed = true;
-        }
-        if (event.key === "ArrowUp" || event.key === "w" || event.key === "z") {
-            this.upIsPressed = true;
-        }
-        if (event.key === "ArrowLeft" || event.key === "q" || event.key === "a") {
-            this.leftIsPressed = true;
-        }
-        if (event.key === "ArrowRight" || event.key === "d") {
-            this.rightIsPressed = true;
-        }
-    };
-    private keyUpHandler = (event: KeyboardEvent) => {
-        // Define new zone to zoom
-        if (this.downIsPressed || this.upIsPressed || this.leftIsPressed || this.rightIsPressed)
-            this.defineZoomToCenterCameraPosition();
-        if (event.key === "ArrowDown" || event.key === "s") {
-            this.downIsPressed = false;
-        }
-        if (event.key === "ArrowUp" || event.key === "w" || event.key === "z") {
-            this.upIsPressed = false;
-        }
-        if (event.key === "ArrowLeft" || event.key === "q" || event.key === "a") {
-            this.leftIsPressed = false;
-        }
-        if (event.key === "ArrowRight" || event.key === "d") {
-            this.rightIsPressed = false;
-        }
-        this.mapEditorModeManager.handleKeyDownEvent(event);
-    };
-    private wheelHandler = (
-        pointer: Phaser.Input.Pointer,
-        gameObjects: Phaser.GameObjects.GameObject[],
-        deltaX: number,
-        deltaY: number,
-        deltaZ: number
-    ) => {
-        // Calculate the velocity of the scroll
-        const velocity = deltaY / 53;
-        const zoomFactor = 1 - velocity * 0.1;
-        // Restore camera mode
-        this.scene.zoomByFactor(zoomFactor, velocity);
-    };
-    private pointerDownHandler = (pointer: Phaser.Input.Pointer) => {
-        this.explorationMouseIsActive = true;
-        this.scene.input.setDefaultCursor("grabbing");
-    };
-    private pointerMoveHandler = (pointer: Phaser.Input.Pointer) => {
-        if (!this.explorationMouseIsActive) return;
-        this.scene.cameras.main.scrollX -= pointer.velocity.x / 10;
-        this.scene.cameras.main.scrollY -= pointer.velocity.y / 10;
-
-        // Define new zone to zoom
-        this.defineZoomToCenterCameraPosition();
-
-        this.scene.markDirty();
-    };
-    private pointerUpHandler = (pointer: Phaser.Input.Pointer, gameObjects: Phaser.GameObjects.GameObject[]) => {
-        this.scene.input.setDefaultCursor("grab");
-        this.explorationMouseIsActive = false;
-
-        if (gameObjects.length > 0) {
-            const gameObject = gameObjects[0];
-            if (gameObject instanceof Entity || gameObject instanceof AreaPreview)
-                mapExplorationObjectSelectedStore.set(gameObject);
-        }
-
-        this.scene.markDirty();
-    };
-
-    constructor(private mapEditorModeManager: MapEditorModeManager) {
-        this.scene = gameManager.getCurrentGameScene();
-        this.entitiesManager = this.scene.getGameMapFrontWrapper().getEntitiesManager();
-    }
-
-    public update(time: number, dt: number): void {
-        const factorToMove = 10 * (1 / waScaleManager.zoomModifier);
-        if (this.downIsPressed) {
-            this.scene.cameras.main.scrollY += factorToMove;
-        }
-        if (this.upIsPressed) {
-            this.scene.cameras.main.scrollY -= factorToMove;
-        }
-        if (this.leftIsPressed) {
-            this.scene.cameras.main.scrollX -= factorToMove;
-        }
-        if (this.rightIsPressed) {
-            this.scene.cameras.main.scrollX += factorToMove;
-        }
-
-        get(mapExplorationAreasStore)?.forEach((preview) => preview.update(time, dt));
-
-        // Dirty the scene to update the camera position if it has changed
-        if (this.downIsPressed || this.upIsPressed || this.leftIsPressed || this.rightIsPressed) this.scene.markDirty();
-    }
-
-    public clear(): void {
-        // Put analytics for exploration mode
-        analyticsClient.closeExplorationMode();
-        this.scene.getCameraManager().unlockCameraWithDelay(0);
-
-        // Restore controls of the scene
-        this.scene.userInputManager.restoreControls();
-
-        // Remove all controls for the exploration mode
-        this.scene.input.keyboard?.off("keydown", this.keyDownHandler);
-        this.scene.input.keyboard?.off("keyup", this.keyUpHandler);
-        this.scene.input.off("wheel", this.wheelHandler);
-        this.scene.input.off("pointerdown", this.pointerDownHandler);
-        this.scene.input.off("pointermove", this.pointerMoveHandler);
-        this.scene.input.off("pointerup", this.pointerUpHandler);
-        this.scene.input.off(Phaser.Input.Events.GAME_OUT, this.pointerUpHandler);
-
-        // Restore focus target
-        waScaleManager.setFocusTarget(undefined);
-        // Restore camera mode
-        this.scene.getCameraManager().startFollowPlayer(this.scene.CurrentPlayer, 1000);
-
-        // Restore entities
-        this.entitiesManager.removeAllEntitiesPointedToEditColor();
-        this.removeAllAreasPreviewPointedToEditColor();
-
-        // Restore cursor
-        this.scene.input.setDefaultCursor("auto");
-
-        // Restore zoom factor
-        if (waScaleManager.zoomModifier < INITIAL_ZOOM_OUT_EXPLORER_MODE) this.scene.zoomByFactor(3);
-
-        // Define initial zoom max
-        waScaleManager.maxZoomOut = INITIAL_ZOOM_OUT_EXPLORER_MODE;
-
-        // Mark the scene as dirty
-        this.scene.markDirty();
-
-        // Unsubscribe to entities store
-        if (this.mapExplorationEntitiesSubscribe) this.mapExplorationEntitiesSubscribe();
-
-        // Disable store of map exploration mode
-        mapExplorationObjectSelectedStore.set(undefined);
-        mapExplorationModeStore.set(false);
-        mapEditorVisibilityStore.set(true);
-        mapExplorationAreasStore.set(undefined);
-    }
-    public activate(): void {
-        // Put analytics for exploration mode
-        analyticsClient.openExplorationMode();
-
-        // Active store of map exploration mode
-        mapExplorationModeStore.set(true);
-        mapEditorVisibilityStore.set(true);
-
-        const entitySearchableMap = new Map<string, Entity>();
-        gameManager
-            .getCurrentGameScene()
-            .getGameMapFrontWrapper()
-            .getEntitiesManager()
-            .getEntities()
-            .forEach((entity, key) => {
-                if (entity.searchable) {
-                    entitySearchableMap.set(key, entity);
-                }
-            });
-        mapExplorationEntitiesStore.set(entitySearchableMap);
-
-        // Define new cursor
-        this.scene.input.setDefaultCursor("grab");
-
-        // Disable controls of the scene
-        this.scene.userInputManager.disableControls();
-
-        // Implement all controls for the exploration mode
-        this.scene.input.setTopOnly(false);
-        this.scene.input.keyboard?.on("keydown", this.keyDownHandler);
-        this.scene.input.keyboard?.on("keyup", this.keyUpHandler);
-        this.scene.input.on("wheel", this.wheelHandler);
-        this.scene.input.on("pointerdown", this.pointerDownHandler);
-        this.scene.input.on("pointermove", this.pointerMoveHandler);
-        this.scene.input.on("pointerup", this.pointerUpHandler);
-        this.scene.input.on(Phaser.Input.Events.GAME_OUT, this.pointerUpHandler);
-
-        // Define new camera mode
-        this.scene.getCameraManager().setExplorationMode();
-
-        // Rules: if the user click on the action bar to open the explorater mode, we define new zoom
-        if (waScaleManager.zoomModifier > MAX_ZOOM_OUT_EXPLORER_MODE) this.scene.zoomByFactor(0.5);
-
-        // Define new zoom max
-        waScaleManager.maxZoomOut = MAX_ZOOM_OUT_EXPLORER_MODE;
-
-        // Make all entities interactive
-        this.entitiesManager.makeAllEntitiesInteractive();
-        this.entitiesManager.setAllEntitiesPointedToEditColor(0x000000);
-        this.setAllAreasPreviewPointedToEditColor();
-
-        this.scene.playSound("audio-cloud");
-
-        // Mark the scene as dirty
-        this.scene.markDirty();
-
-        // Create flash animation
-        this.scene.cameras.main.flash();
-
-        // Create zoon animation
-        this.scene.cameras.main.zoomEffect.start(0.8, 500);
-        // FIWME: the zoom effect working, but the and of effect can be calledback. Override this effect and call method complete
-        setTimeout(() => {
-            this.scene.cameras.main.zoomEffect.start(1, 500);
-        }, 500);
-
-        // Define new zone to zoom
-        this.defineZoomToCenterCameraPosition();
-
-        // Create subscribe to entities store
-        this.mapExplorationEntitiesSubscribe = mapExplorationEntitiesStore.subscribe((entities) => {
-            this.entitiesManager.setAllEntitiesPointedToEditColor(0x000000);
-            this.scene.markDirty();
-        });
-    }
-    public destroy(): void {
-        this.clear();
-    }
-    public subscribeToGameMapFrontWrapperEvents(gameMapFrontWrapper: GameMapFrontWrapper): void {
-        logger("subscribeToGameMapFrontWrapperEvents => Method not implemented.");
-    }
-    public handleKeyDownEvent(event: KeyboardEvent): void {
-        logger("handleKeyDownEvent => Method not implemented.");
-    }
-    public handleIncomingCommandMessage(editMapCommandMessage: EditMapCommandMessage): Promise<void> {
-        // Refresh the entities store
-        mapExplorationEntitiesStore.set(
-            gameManager.getCurrentGameScene().getGameMapFrontWrapper().getEntitiesManager().getEntities()
-        );
-        return Promise.resolve();
-    }
-
-    private setAllAreasPreviewPointedToEditColor() {
-        const areaConfigs = this.scene.getGameMapFrontWrapper().getAreas();
-        const areaPreviews = get(mapExplorationAreasStore) ?? new Map<string, AreaPreview>();
-        if (!areaConfigs) return;
-        for (const [key, config] of areaConfigs.entries()) {
-            if (
-                !(config.properties.find((p) => p.type === "areaDescriptionProperties") as AreaDescriptionPropertyData)
-                    ?.searchable
-            )
-                continue;
-            let areaPreview = areaPreviews.get(key);
-            if (areaPreview) {
-                areaPreview.updatePreview(config);
-            } else {
-                areaPreview = this.createAndSaveAreaPreview(config);
-            }
-            areaPreviews.set(key, areaPreview);
-        }
-        mapExplorationAreasStore.set(areaPreviews);
-    }
-
-    private removeAllAreasPreviewPointedToEditColor() {
-        const areas = get(mapExplorationAreasStore);
-        if (!areas) return;
-        for (const [key, area] of areas.entries()) {
-            area.setVisible(false);
-            area.destroy();
-            areas.delete(key);
-        }
-        areas.clear();
-    }
-
-    private createAndSaveAreaPreview(areaConfig: AreaData): AreaPreview {
-        return new AreaPreview(this.scene, structuredClone(areaConfig));
-    }
-
-    public defineZoomToCenterCameraPosition() {
-        // FIXME from the svelte component, the udate isn't dispatch in totaly at the same time after to move the camera
-        setTimeout(() => {
-            const cameraCenterXToZoom = this.scene.cameras.main.worldView.x + this.scene.cameras.main.width / 2;
-            const cameraCenterYToZoom = this.scene.cameras.main.worldView.y + this.scene.cameras.main.height / 2;
-            if (
-                cameraCenterXToZoom != this.lastCameraCenterXToZoom ||
-                cameraCenterYToZoom != this.lastCameraCenterYToZoom
-            ) {
-                waScaleManager.setFocusTarget({ x: cameraCenterXToZoom, y: cameraCenterYToZoom });
-                this.lastCameraCenterXToZoom = cameraCenterXToZoom;
-                this.lastCameraCenterYToZoom = cameraCenterYToZoom;
-            }
-        }, 100);
-    }
-}
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/TrashEditorTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/TrashEditorTool.ts
index 2fa6f395c1..b4aac5f96f 100644
--- a/play/src/front/Phaser/Game/MapEditor/Tools/TrashEditorTool.ts
+++ b/play/src/front/Phaser/Game/MapEditor/Tools/TrashEditorTool.ts
@@ -3,13 +3,13 @@ import { EditMapCommandMessage } from "@workadventure/messages";
 import { MapEditorModeManager } from "../MapEditorModeManager";
 import { AreaPreview, AreaPreviewEvent } from "../../../Components/MapEditor/AreaPreview";
 import { DeleteAreaFrontCommand } from "../Commands/Area/DeleteAreaFrontCommand";
-import { mapEditorSelectedAreaPreviewStore, mapEditorVisibilityStore } from "../../../../Stores/MapEditorStore";
+import { mapEditorSelectedAreaPreviewStore } from "../../../../Stores/MapEditorStore";
 import { SizeAlteringSquare } from "../../../Components/MapEditor/SizeAlteringSquare";
 import { Entity } from "../../../ECS/Entity";
 import { EntityRelatedEditorTool } from "./EntityRelatedEditorTool";
 
 export class TrashEditorTool extends EntityRelatedEditorTool {
-    private areaPreviews: AreaPreview[] = [];
+    private areaPreviews: AreaPreview[];
     protected ctrlKey?: Phaser.Input.Keyboard.Key;
     private active = false;
 
@@ -18,6 +18,8 @@ export class TrashEditorTool extends EntityRelatedEditorTool {
 
         this.active = false;
         this.ctrlKey = this.scene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.CTRL);
+        this.areaPreviews = this.createAreaPreviews();
+        this.bindEventHandlers();
     }
 
     private createAreaPreviews(): AreaPreview[] {
@@ -208,19 +210,14 @@ export class TrashEditorTool extends EntityRelatedEditorTool {
 
     public activate() {
         super.activate();
-        this.areaPreviews = this.createAreaPreviews();
-        this.bindEventHandlers();
         this.active = true;
         this.setAreaPreviewsVisibility(true);
         this.updateAreaPreviews();
         this.scene.markDirty();
-        mapEditorVisibilityStore.set(false);
     }
 
     public clear() {
         super.clear();
-        this.areaPreviews.forEach((preview) => preview.destroy());
-        this.unbindEventHandlers();
         this.active = false;
         this.setAreaPreviewsVisibility(false);
         this.scene.markDirty();
diff --git a/play/src/front/Phaser/Game/MapEditor/Tools/WAMSettingsEditorTool.ts b/play/src/front/Phaser/Game/MapEditor/Tools/WAMSettingsEditorTool.ts
index b3e0f644ee..3f875e6497 100644
--- a/play/src/front/Phaser/Game/MapEditor/Tools/WAMSettingsEditorTool.ts
+++ b/play/src/front/Phaser/Game/MapEditor/Tools/WAMSettingsEditorTool.ts
@@ -3,7 +3,6 @@ import { GameMapFrontWrapper } from "../../GameMap/GameMapFrontWrapper";
 import { GameScene } from "../../GameScene";
 import { MapEditorModeManager } from "../MapEditorModeManager";
 import { UpdateWAMSettingFrontCommand } from "../Commands/WAM/UpdateWAMSettingFrontCommand";
-import { mapEditorVisibilityStore } from "../../../../Stores/MapEditorStore";
 import { MapEditorTool } from "./MapEditorTool";
 
 export class WAMSettingsEditorTool extends MapEditorTool {
@@ -23,7 +22,7 @@ export class WAMSettingsEditorTool extends MapEditorTool {
         console.info("WAMSettingsEditorTool clear");
     }
     public activate(): void {
-        mapEditorVisibilityStore.set(false);
+        console.info("WAMSettingsEditorTool activate");
     }
     public destroy(): void {
         console.info("WAMSettingsEditorTool destroy");
diff --git a/play/src/front/Phaser/Login/ResizableScene.ts b/play/src/front/Phaser/Login/ResizableScene.ts
index d4387cd61f..906137447f 100644
--- a/play/src/front/Phaser/Login/ResizableScene.ts
+++ b/play/src/front/Phaser/Login/ResizableScene.ts
@@ -1,5 +1,20 @@
 import { Scene } from "phaser";
+import DOMElement = Phaser.GameObjects.DOMElement;
 
 export abstract class ResizableScene extends Scene {
     public abstract onResize(): void;
+
+    /**
+     * Centers the DOM element on the X axis.
+     *
+     * @param object
+     * @param defaultWidth The width of the DOM element. We try to compute it but it may not be available if called from "create".
+     */
+    public centerXDomElement(object: DOMElement, defaultWidth: number): void {
+        object.x =
+            this.scale.width / 2 -
+            (object && object.node && object.node.getBoundingClientRect().width > 0
+                ? object.node.getBoundingClientRect().width / 2 / this.scale.zoom
+                : defaultWidth / this.scale.zoom);
+    }
 }
diff --git a/play/src/front/Phaser/Services/HdpiManager.ts b/play/src/front/Phaser/Services/HdpiManager.ts
index 85bebced78..1d0817e3db 100644
--- a/play/src/front/Phaser/Services/HdpiManager.ts
+++ b/play/src/front/Phaser/Services/HdpiManager.ts
@@ -5,7 +5,6 @@ interface Size {
 
 export class HdpiManager {
     private _zoomModifier = 1;
-    private _maxZoomOut = 1;
 
     /**
      *
@@ -37,19 +36,19 @@ export class HdpiManager {
         const optimalZoomLevel = this.getOptimalZoomLevel(realPixelNumber);
 
         // Has the canvas more pixels than the screen? This is forbidden
-        if (optimalZoomLevel * this._zoomModifier < this._maxZoomOut) {
+        if (optimalZoomLevel * this._zoomModifier < 1) {
             // Let's reset the zoom modifier (WARNING this is a SIDE EFFECT in a getter)
-            this._zoomModifier = this._maxZoomOut / optimalZoomLevel;
-
-            const maxGameWidth = Math.ceil(realPixelScreenSize.width / optimalZoomLevel / this._zoomModifier);
-            const maxGameHeight = Math.ceil(realPixelScreenSize.height / optimalZoomLevel / this._zoomModifier);
+            this._zoomModifier = 1 / optimalZoomLevel;
 
             return {
                 game: {
-                    width: maxGameWidth,
-                    height: maxGameHeight,
+                    width: realPixelScreenSize.width,
+                    height: realPixelScreenSize.height,
+                },
+                real: {
+                    width: realPixelScreenSize.width,
+                    height: realPixelScreenSize.height,
                 },
-                real: realPixelScreenSize,
             };
         }
 
@@ -73,7 +72,10 @@ export class HdpiManager {
                     width: minGameWidth,
                     height: minGameHeight,
                 },
-                real: realPixelScreenSize,
+                real: {
+                    width: realPixelScreenSize.width,
+                    height: realPixelScreenSize.height,
+                },
             };
         }
 
@@ -108,12 +110,4 @@ export class HdpiManager {
     public set zoomModifier(zoomModifier: number) {
         this._zoomModifier = zoomModifier;
     }
-
-    public set maxZoomOut(maxZoomOut: number) {
-        this._maxZoomOut = maxZoomOut;
-    }
-
-    public get maxZoomOut(): number {
-        return this._maxZoomOut;
-    }
 }
diff --git a/play/src/front/Phaser/Services/WaScaleManager.ts b/play/src/front/Phaser/Services/WaScaleManager.ts
index cac700c6d8..a92c17c177 100644
--- a/play/src/front/Phaser/Services/WaScaleManager.ts
+++ b/play/src/front/Phaser/Services/WaScaleManager.ts
@@ -5,9 +5,6 @@ import { HtmlUtils } from "../../WebRtc/HtmlUtils";
 import { HdpiManager } from "./HdpiManager";
 import ScaleManager = Phaser.Scale.ScaleManager;
 
-export const MAX_ZOOM_OUT_EXPLORER_MODE = 0.4;
-export const INITIAL_ZOOM_OUT_EXPLORER_MODE = 1;
-
 export enum WaScaleManagerEvent {
     RefreshFocusOnTarget = "wa-scale-manager:refresh-focus-on-target",
 }
@@ -81,7 +78,6 @@ export class WaScaleManager {
         if (this.focusTarget.width && this.focusTarget.height) {
             this.zoomModifier = this.getTargetZoomModifierFor(this.focusTarget.width, this.focusTarget.height);
         }
-
         this.game.events.emit(WaScaleManagerEvent.RefreshFocusOnTarget, this.focusTarget);
     }
 
@@ -91,7 +87,7 @@ export class WaScaleManager {
 
     public getTargetZoomModifierFor(viewportWidth: number, viewportHeight: number) {
         const { width: gameWidth, height: gameHeight } = coWebsiteManager.getGameSize();
-        const devicePixelRatio = window.devicePixelRatio ?? this.hdpiManager.maxZoomOut;
+        const devicePixelRatio = window.devicePixelRatio ?? 1;
 
         const { real: realSize } = this.hdpiManager.getOptimalGameSize({
             width: gameWidth * devicePixelRatio,
@@ -145,13 +141,6 @@ export class WaScaleManager {
     public get uiScalingFactor(): number {
         return this.actualZoom > 1 ? 1 : 1.2;
     }
-
-    public set maxZoomOut(maxZoomOut: number) {
-        this.hdpiManager.maxZoomOut = maxZoomOut;
-    }
-    public get maxZoomOut(): number {
-        return this.hdpiManager.maxZoomOut;
-    }
 }
 
 export const waScaleManager = new WaScaleManager(640 * 480, 196 * 196);
diff --git a/play/src/front/Phaser/UserInput/GameSceneUserInputHandler.ts b/play/src/front/Phaser/UserInput/GameSceneUserInputHandler.ts
index 20a33afc72..5decedd545 100644
--- a/play/src/front/Phaser/UserInput/GameSceneUserInputHandler.ts
+++ b/play/src/front/Phaser/UserInput/GameSceneUserInputHandler.ts
@@ -21,12 +21,7 @@ export class GameSceneUserInputHandler implements UserInputHandlerInterface {
         deltaY: number,
         deltaZ: number
     ): void {
-        // Calculate the velocity of the zoom
-        const velocity = deltaY / 53;
-        // Calculate the zoom factor
-        const zoomFactor = 1 - velocity * 0.1;
-        // Apply the zoom
-        this.gameScene.zoomByFactor(zoomFactor, velocity);
+        this.gameScene.zoomByFactor(1 - (deltaY / 53) * 0.1);
     }
 
     public handlePointerUpEvent(pointer: Phaser.Input.Pointer, gameObjects: Phaser.GameObjects.GameObject[]): void {
@@ -77,7 +72,9 @@ export class GameSceneUserInputHandler implements UserInputHandlerInterface {
     public handlePointerMoveEvent(pointer: Phaser.Input.Pointer, gameObjects: Phaser.GameObjects.GameObject[]): void {}
 
     public handleKeyDownEvent(event: KeyboardEvent): KeyboardEvent {
-        this.gameScene.getMapEditorModeManager()?.handleKeyDownEvent(event);
+        if (get(mapEditorModeStore)) {
+            this.gameScene.getMapEditorModeManager()?.handleKeyDownEvent(event);
+        }
         switch (event.code) {
             case "KeyE": {
                 mapEditorModeStore.switchMode(!get(mapEditorModeStore));
diff --git a/play/src/front/Phaser/UserInput/UserInputManager.ts b/play/src/front/Phaser/UserInput/UserInputManager.ts
index 3c784e0902..53cfc9a833 100644
--- a/play/src/front/Phaser/UserInput/UserInputManager.ts
+++ b/play/src/front/Phaser/UserInput/UserInputManager.ts
@@ -175,6 +175,10 @@ export class UserInputManager {
         ];
     }
 
+    clearAllListeners() {
+        this.scene.input.keyboard?.removeAllListeners();
+    }
+
     disableControls() {
         try {
             this.scene.input.keyboard?.disableGlobalCapture();
@@ -300,9 +304,6 @@ export class UserInputManager {
         this.scene.input.on(
             Phaser.Input.Events.POINTER_MOVE,
             (pointer: Phaser.Input.Pointer, gameObjects: Phaser.GameObjects.GameObject[]) => {
-                if (this.isInputDisabled) {
-                    return;
-                }
                 this.userInputHandler.handlePointerMoveEvent(pointer, gameObjects);
             }
         );
diff --git a/play/src/front/Space/Space.ts b/play/src/front/Space/Space.ts
index 87daf1b358..b9456e50f0 100644
--- a/play/src/front/Space/Space.ts
+++ b/play/src/front/Space/Space.ts
@@ -97,6 +97,7 @@ export class Space {
                             newUser: user,
                             changes: partialUser,
                         });
+                        console.log("updateSpaceUserMessageStream", user);
                         this._users.set(partialUser.id, user);
                     }
                 }
diff --git a/play/src/front/Stores/MapEditorStore.ts b/play/src/front/Stores/MapEditorStore.ts
index 94d27a640a..43cdbf7fbc 100644
--- a/play/src/front/Stores/MapEditorStore.ts
+++ b/play/src/front/Stores/MapEditorStore.ts
@@ -1,25 +1,20 @@
 import type { EntityPrefab, EntityDataProperties } from "@workadventure/map-editor";
-import { writable } from "svelte/store";
+import { writable, get } from "svelte/store";
 import type { AreaPreview } from "../Phaser/Components/MapEditor/AreaPreview";
 import { EditorToolName } from "../Phaser/Game/MapEditor/MapEditorModeManager";
 import { Entity } from "../Phaser/ECS/Entity";
+import { mapEditorActivated } from "./MenuStore";
 
 type ObjectValues<T> = T[keyof T];
 
-export const mapEditorVisibilityStore = writable<boolean>(true);
-
 function createMapEditorModeStore() {
     const { set, subscribe } = writable(false);
 
-    subscribe((value) => {
-        mapEditorVisibilityStore.set(value === true);
-    });
-
     return {
         subscribe,
         set,
         switchMode: (value: boolean) => {
-            set(value);
+            set(get(mapEditorActivated) && value);
         },
     };
 }
@@ -71,14 +66,8 @@ export const mapEditorEntityModeStore = writable<MapEditorEntityToolMode>("ADD")
 
 export enum WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM {
     Megaphone = "Megaphone",
-    RoomSettings = "Room Settings",
 }
 
 export const mapEditorWamSettingsEditorToolCurrentMenuItemStore = writable<
     WAM_SETTINGS_EDITOR_TOOL_MENU_ITEM | undefined
 >(undefined);
-
-export const mapExplorationModeStore = writable<boolean>(false);
-export const mapExplorationObjectSelectedStore = writable<Entity | AreaPreview | undefined>(undefined);
-export const mapExplorationEntitiesStore = writable<Map<string, Entity>>(new Map());
-export const mapExplorationAreasStore = writable<Map<string, AreaPreview> | undefined>(new Map());
diff --git a/play/src/front/Stores/MediaStore.ts b/play/src/front/Stores/MediaStore.ts
index 5fc3b7554f..d315d81f35 100644
--- a/play/src/front/Stores/MediaStore.ts
+++ b/play/src/front/Stores/MediaStore.ts
@@ -247,6 +247,7 @@ export const videoConstraintStore = derived(
         } as MediaTrackConstraints;
 
         if ($cameraDeviceIdStore !== undefined) {
+            console.log("Using camera device ID", $cameraDeviceIdStore);
             constraints.deviceId = {
                 exact: $cameraDeviceIdStore,
             };
@@ -781,8 +782,10 @@ export const speakerListStore = derived(deviceListStore, ($deviceListStore) => {
 export const selectDefaultSpeaker = () => {
     const devices = get(speakerListStore);
     if (devices !== undefined && devices.length > 0) {
+        console.log("Selecting default speaker");
         speakerSelectedStore.set(devices[0].deviceId);
     } else {
+        console.log("No output device found");
         speakerSelectedStore.set(undefined);
     }
 };
@@ -837,6 +840,7 @@ cameraListStore.subscribe((devices) => {
     // If we cannot find the device ID, let's remove it.
     if (isConstrainDOMStringParameters(deviceId)) {
         if (!devices.find((device) => device.deviceId === deviceId.exact)) {
+            console.log("Camera unplugged, removing constraint on deviceId");
             requestedCameraDeviceIdStore.set(undefined);
         }
     }
@@ -863,6 +867,7 @@ microphoneListStore.subscribe((devices) => {
     // If we cannot find the device ID, let's remove it.
     if (isConstrainDOMStringParameters(deviceId)) {
         if (!devices.find((device) => device.deviceId === deviceId.exact)) {
+            console.log("Microphone unplugged, removing constraint on deviceId");
             requestedMicrophoneDeviceIdStore.set(undefined);
         }
     }
diff --git a/play/src/front/Stores/ModalStore.ts b/play/src/front/Stores/ModalStore.ts
index e7abd87c41..01d8af54cf 100644
--- a/play/src/front/Stores/ModalStore.ts
+++ b/play/src/front/Stores/ModalStore.ts
@@ -5,6 +5,3 @@ export const showLimitRoomModalStore = writable(false);
 
 export const modalIframeStore = writable<ModalEvent | null>(null);
 export const modalVisibilityStore = writable(false);
-export const modalPopupVisibilityStore = writable(false);
-
-export const roomListVisibilityStore = writable<boolean>(false);
diff --git a/play/src/front/Stores/StreamableCollectionStore.ts b/play/src/front/Stores/StreamableCollectionStore.ts
index 468cd5c07d..fe7091c108 100644
--- a/play/src/front/Stores/StreamableCollectionStore.ts
+++ b/play/src/front/Stores/StreamableCollectionStore.ts
@@ -46,8 +46,10 @@ function createStreamableCollectionStore(): Readable<Map<string, Streamable>> {
             $peerStore.forEach(addPeer);
 
             $broadcastTracksStore.forEach((trackWrapper) => {
+                console.log("trackWrapper", trackWrapper);
                 if (trackWrapper instanceof JitsiTrackWrapper) {
                     const cameraTrackWrapper = trackWrapper.cameraTrackWrapper;
+                    console.log("cameraTrackWrapper", cameraTrackWrapper);
                     if (/*!cameraTrackWrapper.isEmpty() &&*/ !trackWrapper.isLocal) {
                         addPeer(cameraTrackWrapper);
                     }
diff --git a/play/src/front/Streaming/Jitsi/JitsiConferenceWrapper.ts b/play/src/front/Streaming/Jitsi/JitsiConferenceWrapper.ts
index 499bd8370b..8c543ef7d6 100644
--- a/play/src/front/Streaming/Jitsi/JitsiConferenceWrapper.ts
+++ b/play/src/front/Streaming/Jitsi/JitsiConferenceWrapper.ts
@@ -74,6 +74,7 @@ export class JitsiConferenceWrapper {
     }
 
     public static join(connection: JitsiConnection, jitsiRoomName: string): Promise<JitsiConferenceWrapper> {
+        console.log("JitsiConferenceWrapper => join", jitsiRoomName);
         return new Promise((resolve, reject) => {
             const JitsiMeetJS = window.JitsiMeetJS;
             const room = connection.initJitsiConference(jitsiRoomName, {});
@@ -525,7 +526,7 @@ export class JitsiConferenceWrapper {
     private addRemoteTrack(track: JitsiTrack, allowOverride: boolean) {
         const videoTracks = track.getOriginalStream().getVideoTracks();
         if (videoTracks.length > 0) {
-            console.info("JitsiConferenceWrapper => addRemoteTrack => videoTracks", videoTracks[0].getSettings());
+            console.log("JitsiConferenceWrapper => addRemoteTrack => videoTracks", videoTracks[0].getSettings());
         }
         debug("JitsiConferenceWrapper => addRemoteTrack", track.getType());
         this._streamStore.update((tracks) => {
diff --git a/play/src/front/Streaming/Jitsi/JitsiTrackWrapper.ts b/play/src/front/Streaming/Jitsi/JitsiTrackWrapper.ts
index 43ce731f79..7d9a2f6772 100644
--- a/play/src/front/Streaming/Jitsi/JitsiTrackWrapper.ts
+++ b/play/src/front/Streaming/Jitsi/JitsiTrackWrapper.ts
@@ -77,7 +77,7 @@ export class JitsiTrackWrapper implements TrackWrapper {
     setJitsiTrack(jitsiTrack: JitsiTrack, allowOverride = false) {
         // Let's start by suppressing any "echo". setJitsiTrack can be called multiple times for the same track
         // For some reason, Jitsi can trigger the remoteTrack event several times.
-        console.info(
+        console.log(
             "this.cameraTrackWrapper.getVideoTrack()?.getTrack().getSettings() === jitsiTrack.getTrack().getSettings()",
             this.cameraTrackWrapper.getVideoTrack()?.getTrack().getSettings() === jitsiTrack.getTrack().getSettings()
         );
@@ -159,6 +159,7 @@ export class JitsiTrackWrapper implements TrackWrapper {
                                 oldScreenSharingTrack?.dispose();
                             }
                         }
+                        console.log("Switching camera track to screen sharing track");
                         this.screenSharingTrackWrapper.setVideoTrack(jitsiTrack);
                         this.cameraTrackWrapper.setVideoTrack(undefined);
 
diff --git a/play/src/front/Utils/PathfindingManager.ts b/play/src/front/Utils/PathfindingManager.ts
index 2d4af9984f..12b980b5f4 100644
--- a/play/src/front/Utils/PathfindingManager.ts
+++ b/play/src/front/Utils/PathfindingManager.ts
@@ -124,4 +124,12 @@ export class PathfindingManager {
         this.easyStar.setGrid(grid);
         this.easyStar.setAcceptableTiles([PathTileType.Walkable, PathTileType.Exit]);
     }
+
+    private logGridToTheConsole(grid: number[][]): void {
+        let rowNumber = 0;
+        for (const row of grid) {
+            console.info(`${rowNumber}:\t${row}`);
+            rowNumber += 1;
+        }
+    }
 }
diff --git a/play/src/front/Utils/ScreenWakeLock.ts b/play/src/front/Utils/ScreenWakeLock.ts
index f66133e7b1..a2784b273d 100644
--- a/play/src/front/Utils/ScreenWakeLock.ts
+++ b/play/src/front/Utils/ScreenWakeLock.ts
@@ -4,6 +4,7 @@ class ScreenWakeLock {
     constructor() {
         if ("wakeLock" in navigator) {
             this.isSupported = true;
+            console.log("Screen Wake Lock API supported!");
         } else {
             this.isSupported = false;
             console.info("Wake lock is not supported by this browser.");
diff --git a/play/src/front/WebRtc/CoWebsite/JitsiCoWebsite.ts b/play/src/front/WebRtc/CoWebsite/JitsiCoWebsite.ts
index 1ba53e3753..7442e0877f 100644
--- a/play/src/front/WebRtc/CoWebsite/JitsiCoWebsite.ts
+++ b/play/src/front/WebRtc/CoWebsite/JitsiCoWebsite.ts
@@ -225,7 +225,7 @@ export class JitsiCoWebsite extends SimpleCoWebsite {
                                 .querySelector<HTMLIFrameElement>('[id*="jitsi" i]');
 
                             if (cancelled /*&& iframe*/) {
-                                console.info("CLOSING BECAUSE CANCELLED AFTER LOAD");
+                                console.log("CLOSING BECAUSE CANCELLED AFTER LOAD");
                                 //this.closeOrUnload(iframe);
                                 this.destroy();
                                 return;
@@ -257,7 +257,7 @@ export class JitsiCoWebsite extends SimpleCoWebsite {
                 });
 
             cancel(() => {
-                console.info("CLOSING Canceling JitsiCoWebsite");
+                console.log("CLOSING Canceling JitsiCoWebsite");
                 cancelled = true;
                 this.unload().catch((err) => {
                     console.error("Cannot unload Jitsi co-website while cancel loading", err);
@@ -285,9 +285,9 @@ export class JitsiCoWebsite extends SimpleCoWebsite {
 
     unload(): Promise<void> {
         if (this.loadPromise) {
-            console.info("CLOSING unload JitsiCoWebsite");
+            console.log("CLOSING unload JitsiCoWebsite");
         } else {
-            console.info("CLOSING NOOOOT unload JitsiCoWebsite");
+            console.log("CLOSING NOOOOT unload JitsiCoWebsite");
         }
         try {
             this.loadPromise?.cancel();
diff --git a/play/src/front/WebRtc/VideoPeer.ts b/play/src/front/WebRtc/VideoPeer.ts
index 277328e3d3..1a7e4eb806 100644
--- a/play/src/front/WebRtc/VideoPeer.ts
+++ b/play/src/front/WebRtc/VideoPeer.ts
@@ -312,6 +312,7 @@ export class VideoPeer extends Peer implements TrackStreamWrapperInterface {
     public destroy(): void {
         try {
             this._connected = false;
+            console.log("destroy => this.toClose", this.toClose, this.closing);
             if (!this.toClose || this.closing) {
                 return;
             }
diff --git a/play/src/i18n/de-DE/mapEditor.ts b/play/src/i18n/de-DE/mapEditor.ts
index 2d2949644d..3eb1abc1df 100644
--- a/play/src/i18n/de-DE/mapEditor.ts
+++ b/play/src/i18n/de-DE/mapEditor.ts
@@ -7,7 +7,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         entityEditor: "Entität bearbeiten",
         tileEditor: "Kachel bearbeiten",
         trashEditor: "Papierkorb",
-        closeMapEditor: "Karte schließen",
     },
     properties: {
         silentProperty: {
@@ -153,10 +152,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
     areaEditor: {
         editInstructions: "Klicken Sie auf eine Fläche, um ihre Eigenschaften zu ändern.",
         nameLabel: "Name",
-        nameLabelPlaceholder: "Geben Sie hier den Namen des Bereichs ein.",
-        areaDescription: "Beschreibung",
-        areaDescriptionPlaceholder: "Geben Sie hier die Beschreibung des Bereichs ein.",
-        addDescriptionField: "Beschreibung hinzufügen",
     },
     areaEditorInstructions: {
         title: "Wie funktioniert das?",
@@ -175,11 +170,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         buttonLabel: "Knopfbeschrifung",
         editInstructions: "Klicken Sie auf ein Objekt, um seine Eigenschaften zu ändern.",
         selectObject: "Klicken Sie auf ein Objekt, um es auszuwählen",
-        objectName: "Objektname",
-        objectNamePlaceholder: "Geben Sie hier den Namen des Objekts ein.",
-        objectDescription: "Objektbeschreibung",
-        objectDescriptionPlaceholder: "Geben Sie hier die Beschreibung des Objekts ein.",
-        addDescriptionField: "Beschreibung hinzufügen",
     },
     settings: {
         loading: "Laden...",
diff --git a/play/src/i18n/dsb-DE/mapEditor.ts b/play/src/i18n/dsb-DE/mapEditor.ts
index 65a83279bb..c849c92627 100644
--- a/play/src/i18n/dsb-DE/mapEditor.ts
+++ b/play/src/i18n/dsb-DE/mapEditor.ts
@@ -7,7 +7,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         entityEditor: "Entitu wobźěłaś",
         tileEditor: "Kachlu wobźěłaś",
         trashEditor: "Zbórk",
-        closeMapEditor: "Mapu zacyniś",
     },
     properties: {
         silentProperty: {
@@ -154,10 +153,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
     areaEditor: {
         editInstructions: "Klikniśo na wobceŕk, aby jogo kakosći pśeměnili.",
         nameLabel: "Mě",
-        nameLabelPlaceholder: "Mě",
-        areaDescription: "Pśedpokładny opis",
-        areaDescriptionPlaceholder: "Pśedpokładny opis",
-        addDescriptionField: "Opis pśidaś",
     },
     entityEditor: {
         itemPicker: {
@@ -172,11 +167,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         buttonLabel: "Wopismo bublina",
         editInstructions: "Klikniśo na objekt, aby jogo kakosći pśeměnili.",
         selectObject: "Klikniśo na objekt, aby jen wuzwólili",
-        objectName: "Mě",
-        objectNamePlaceholder: "Mě",
-        objectDescription: "Pśedpokładny opis",
-        objectDescriptionPlaceholder: "Pśedpokładny opis",
-        addDescriptionField: "Opis pśidaś",
     },
     settings: {
         loading: "Lodujo se...",
diff --git a/play/src/i18n/en-US/actionbar.ts b/play/src/i18n/en-US/actionbar.ts
index 93ec7f918e..dd0d78c3ce 100644
--- a/play/src/i18n/en-US/actionbar.ts
+++ b/play/src/i18n/en-US/actionbar.ts
@@ -12,7 +12,7 @@ const actionbar: BaseTranslation = {
     enableMegaphone: "Enable megaphone",
     disableMegaphone: "Disable megaphone",
     menu: "Open / Close menu",
-    mapEditor: "Open / Close map manager",
+    mapEditor: "Open / Close mapEditor",
     mapEditorMobileLocked: "Map editor is locked on mobile mode",
     bo: "Open back office",
     subtitle: {
diff --git a/play/src/i18n/en-US/mapEditor.ts b/play/src/i18n/en-US/mapEditor.ts
index 574c998a4b..313c8a20e3 100644
--- a/play/src/i18n/en-US/mapEditor.ts
+++ b/play/src/i18n/en-US/mapEditor.ts
@@ -10,8 +10,6 @@ const mapEditor: BaseTranslation = {
         tileEditor: "Tile editor tool",
         configureMyRoom: "Configure my room",
         trashEditor: "Trash",
-        exploreTheRoom: "Explore the room",
-        closeMapEditor: "Close map editor",
     },
     properties: {
         silentProperty: {
@@ -163,19 +161,12 @@ const mapEditor: BaseTranslation = {
     areaEditor: {
         editInstructions: "Click an area to modify its properties.",
         nameLabel: "Name",
-        nameLabelPlaceholder: "MyArea",
-        areaDescription: "Description",
-        areaDescriptionPlaceholder: "My area is a...",
-        areaSerchable: "Searchable into the exploration mode",
-        addDescriptionField: "Add description field",
     },
     areaEditorInstructions: {
         title: "How it works ?",
         description: "Draw a zone on the map to create a new one.",
     },
     entityEditor: {
-        title: "Put your object",
-        editing: "Editing: {name}",
         itemPicker: {
             searchPlaceholder: "Search",
             backToSelectObject: "Back to select object",
@@ -188,12 +179,6 @@ const mapEditor: BaseTranslation = {
         buttonLabel: "Button Label",
         editInstructions: "Click an entity to modify its properties.",
         selectObject: "Click on an object to select it",
-        objectName: "Object Name",
-        objectNamePlaceholder: "MyObject",
-        objectDescription: "Object Description",
-        objectDescriptionPlaceholder: "My object is a...",
-        objectSearchable: "Searchable into the exploration mode",
-        addDescriptionField: "Add description field",
     },
     settings: {
         loading: "Loading",
@@ -220,62 +205,6 @@ const mapEditor: BaseTranslation = {
                 },
             },
         },
-        room: {
-            title: "Room Settings",
-            description: "Configure your room",
-            inputs: {
-                name: "Room name",
-                description: "Room description",
-                tags: "Tags",
-                copyright: "Room license",
-                thumbnail: "Room thumbnail",
-            },
-            helps: {
-                description: "A description of the map. Can be used in social networks when sharing a link to the map.",
-                tags: "A list of tags. Can be used to grant access to the map.",
-                thumbnail:
-                    "URL to a thumbnail image. This image will be used in social networks when sharing a link to the map.",
-                copyright:
-                    "Copyright notice for this map. Can be a link to a license. Parts of this map like tilesets or images can have their own copyright.",
-            },
-            actions: {
-                save: "Save",
-                confirm: "Confirm",
-                success: "Room settings saved",
-                error: "Error while saving room settings",
-            },
-            confirmSave:
-                "Confirm that you want to save the changes to the map. This will create a new version of the map, disconnect all players and reload the map for all players.",
-        },
-    },
-    explorer: {
-        title: "Explore the room",
-        description:
-            "Allow to explore the room. You be able to move around the room and interact with objects. 2 mode are available: 'Exploration' and 'Search'. The 'Search mode' mode will propose you to search or filter entities and areas in the room. The 'Exploration mode' mode will let you move freely in the room.",
-        explorationModeTitle: "Exploration mode",
-        explorationModeDescription: "Move freely in the room and explore the different areas and entities 🗺️",
-        searchModeTitle: "Search mode",
-        searchModeDescription: "Search or filter entities and areas in the room 🧐",
-        noEntitiesFound: "No entity found in the room 🙅‍♂️",
-        entitiesFound: "object{{s}} found",
-        noAreasFound: "No area found in the room 🙅‍♀️",
-        areasFound: "area{{s}} found",
-        noDescriptionFound: "No description found 🫥",
-        details: {
-            close: "Close",
-            moveToEntity: "Move to entity {name}",
-            moveToArea: "Move to area {name}",
-        },
-        popup: {
-            title: "Do you intend to keep using Explorer mode? 🤔",
-            content:
-                "The explorer mode allows you to visualize the map, find objects and areas. There are 2 systems in the explorer mode, the free exploration system or the object and area search system. The video above shows you how to use the explorer mode 💪",
-            notAskAgain: "Do not ask again",
-            close: "Close",
-            continue: "Continue",
-            // Translate previous sentence to english
-            // "The explorer mode allows you to visualize the map, find objects and areas. There are 2 systems in the explorer mode, the free exploration system or the object and area search system. The video above shows you how to use the explorer mode 💪"
-        },
     },
 };
 
diff --git a/play/src/i18n/fr-FR/mapEditor.ts b/play/src/i18n/fr-FR/mapEditor.ts
index 5da2cce664..15f16e189a 100644
--- a/play/src/i18n/fr-FR/mapEditor.ts
+++ b/play/src/i18n/fr-FR/mapEditor.ts
@@ -9,10 +9,8 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         areaEditor: "Outil d'édition de zone",
         entityEditor: "Outil d'édition d'entités",
         tileEditor: "Outil d'édition de tuiles",
-        configureMyRoom: "Configurer le salon",
+        configureMyRoom: "Configurer la salle",
         trashEditor: "Corbeille",
-        exploreTheRoom: "Explorer le salon",
-        closeMapEditor: "Fermer l'éditeur de carte",
     },
     properties: {
         silentProperty: {
@@ -161,19 +159,12 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
     areaEditor: {
         editInstructions: "Sélectionnez une zone pour modifier ses propriétés.",
         nameLabel: "Nom de la zone",
-        nameLabelPlaceholder: "MaZone",
-        areaDescription: "Description de la zone",
-        areaDescriptionPlaceholder: "Description de la zone",
-        areaSerchable: "Recherchable dans le mode exploration",
-        addDescriptionField: "Ajouter une description",
     },
     areaEditorInstructions: {
         title: "Comment ca marche ?",
         description: "Dessinez une zone sur la carte afin d'en créer une nouvelle.",
     },
     entityEditor: {
-        title: "Outil d'édition d'entités",
-        editing: "Edition : {name}",
         itemPicker: {
             searchPlaceholder: "Rechercher",
             backToSelectObject: "Retour à la sélection d'objet",
@@ -186,12 +177,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         buttonLabel: "Texte du bouton",
         editInstructions: "Sélectionnez un objet pour modifier ses propriétés.",
         selectObject: "Cliquer sur un objet pour le selectionner",
-        objectName: "Nom de l'objet",
-        objectNamePlaceholder: "MonObjet",
-        objectDescription: "Description de l'objet",
-        objectDescriptionPlaceholder: "Description de l'objet",
-        objectSearchable: "Recherchable dans le mode exploration",
-        addDescriptionField: "Ajouter une description",
     },
     settings: {
         loading: "Chargement en cours",
@@ -219,33 +204,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
             },
         },
     },
-    explorer: {
-        title: "Explorateur de carte",
-        description:
-            "Permet d'explorer la salle. Vous pourrez vous déplacer dans la salle et interagir avec les objets. Deux modes sont disponibles : 'Exploration' et 'Recherche'. Le mode 'Recherche' vous proposera de rechercher ou de filtrer les entités et les zones de la salle. Le mode 'Exploration' vous permettra de vous déplacer librement dans la salle.",
-        explorationModeTitle: "Mode exploration",
-        explorationModeDescription: "Naviguer dans la carte et interagir avec les entités et les zones 🚶‍♂️",
-        searchModeTitle: "Mode recherche",
-        searchModeDescription: "Rechercher ou filtrer les entités et les zones dans la carte 🧐",
-        noEntitiesFound: "Aucune entité trouvée dans la carte 🙅‍♂️",
-        entitiesFound: "Entités trouvées",
-        noAreasFound: "Aucune zone trouvée dans la carte 🙅‍♀️",
-        areasFound: "Zones trouvées",
-        noDescriptionFound: "No description found 🫥",
-        details: {
-            close: "Fermer",
-            moveToEntity: "Aller à l'entité {name}",
-            moveToArea: "Aller à la zone {name}",
-        },
-        popup: {
-            title: "Est-ce que tu veux continuer avec le Map Explorer ? 🤔",
-            content:
-                "Le mode exploreur permet de visualiser la carte, trouver des objets et des zones. Il existe 2 systèmes dans le mode exploreur, le système d'exploration libre ou le système de recherche d'objets et de zone. La vidéo ci-dessus vous montre comment utiliser le mode exploreur 💪",
-            notAskAgain: "Ne plus demander",
-            close: "Fermer",
-            continue: "Continuer",
-        },
-    },
 };
 
 export default mapEditor;
diff --git a/play/src/i18n/hsb-DE/mapEditor.ts b/play/src/i18n/hsb-DE/mapEditor.ts
index 5b792b9e27..599f0b772b 100644
--- a/play/src/i18n/hsb-DE/mapEditor.ts
+++ b/play/src/i18n/hsb-DE/mapEditor.ts
@@ -7,7 +7,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         entityEditor: "Entita wobdźěłać",
         tileEditor: "Kachlu wobdźěłać",
         trashEditor: "papjernik",
-        closeMapEditor: "Mapu zacyniś",
     },
     properties: {
         silentProperty: {
@@ -153,10 +152,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
     areaEditor: {
         editInstructions: "Klikńće na płoninu, zo byšće jeje kajkosće změnili.",
         nameLabel: "mjeno",
-        nameLabelPlaceholder: "mjeno",
-        areaDescription: "pśedstajenje",
-        areaDescriptionPlaceholder: "pśedstajenje",
-        addDescriptionField: "Pśedstajenje přidać",
     },
     areaEditorInstructions: {
         title: "Kako deluje?",
@@ -175,11 +170,6 @@ const mapEditor: DeepPartial<Translation["mapEditor"]> = {
         buttonLabel: "kneflowe popisanje",
         editInstructions: "Klikńće na objekt, zo byšće jeho kajkosće změnili.",
         selectObject: "Klikńće na objekt, zo byšće jón wuzwolił.",
-        objectName: "mjeno",
-        objectNamePlaceholder: "mjeno",
-        objectDescription: "pśedstajenje",
-        objectDescriptionPlaceholder: "pśedstajenje",
-        addDescriptionField: "Pśedstajenje přidać",
     },
     settings: {
         loading: "Laden...",
diff --git a/play/src/pusher/services/AdminApi.ts b/play/src/pusher/services/AdminApi.ts
index fd378c1735..64f9176659 100644
--- a/play/src/pusher/services/AdminApi.ts
+++ b/play/src/pusher/services/AdminApi.ts
@@ -664,11 +664,7 @@ class AdminApi implements AdminInterface {
             });
     }
 
-    async getUrlRoomsFromSameWorld(
-        roomUrl: string,
-        locale?: string,
-        tags?: string[]
-    ): Promise<ShortMapDescriptionList> {
+    async getUrlRoomsFromSameWorld(roomUrl: string, locale?: string): Promise<ShortMapDescriptionList> {
         /**
          * @openapi
          * /api/room/sameWorld:
@@ -707,15 +703,8 @@ class AdminApi implements AdminInterface {
          *         schema:
          *             $ref: '#/definitions/ErrorApiErrorData'
          */
-
-        // Build the URL to call the API
-        const url = new URL(`${ADMIN_API_URL}/api/room/sameWorld`);
-        url.searchParams.append("roomUrl", roomUrl);
-        if (tags) {
-            url.searchParams.append("tags", tags.join(","));
-        }
         return axios
-            .get<unknown>(url.toString(), {
+            .get<unknown>(ADMIN_API_URL + "/api/room/sameWorld" + "?roomUrl=" + encodeURIComponent(roomUrl), {
                 headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale ?? "en" },
             })
             .then((data) => {
diff --git a/play/src/pusher/services/AdminInterface.ts b/play/src/pusher/services/AdminInterface.ts
index 622ed2f8ab..1fb7d97507 100644
--- a/play/src/pusher/services/AdminInterface.ts
+++ b/play/src/pusher/services/AdminInterface.ts
@@ -79,7 +79,7 @@ export interface AdminInterface {
      * @param roomUrl
      * @return string[]
      */
-    getUrlRoomsFromSameWorld(roomUrl: string, locale?: string, tags?: string[]): Promise<ShortMapDescriptionList>;
+    getUrlRoomsFromSameWorld(roomUrl: string, locale?: string): Promise<ShortMapDescriptionList>;
 
     /**
      * @param accessToken
diff --git a/play/src/pusher/services/ShortMapDescription.ts b/play/src/pusher/services/ShortMapDescription.ts
index 6a4ad8802c..4e9ae56683 100644
--- a/play/src/pusher/services/ShortMapDescription.ts
+++ b/play/src/pusher/services/ShortMapDescription.ts
@@ -1,13 +1,10 @@
-import { WAMMetadata } from "@workadventure/map-editor";
 import { z } from "zod";
 
-const ShortMapDescription = z
-    .object({
-        name: z.string(),
-        roomUrl: z.string(),
-        wamUrl: z.string().optional(),
-    })
-    .merge(WAMMetadata);
+const ShortMapDescription = z.object({
+    roomUrl: z.string(),
+    name: z.string(),
+    wamUrl: z.string().optional(),
+});
 
 export const ShortMapDescriptionList = z.array(ShortMapDescription);
 
diff --git a/play/src/pusher/services/SocketManager.ts b/play/src/pusher/services/SocketManager.ts
index ab4ec7896c..d0af0e411f 100644
--- a/play/src/pusher/services/SocketManager.ts
+++ b/play/src/pusher/services/SocketManager.ts
@@ -1296,11 +1296,11 @@ export class SocketManager implements ZoneEventListener {
     async handleRoomsFromSameWorldQuery(client: Socket, queryMessage: QueryMessage) {
         let roomDescriptions: ShortMapDescription[];
         try {
-            roomDescriptions = await adminService.getUrlRoomsFromSameWorld(
-                client.getUserData().roomId,
-                undefined,
-                client.getUserData().tags
-            );
+            roomDescriptions = await adminService.getUrlRoomsFromSameWorld(client.getUserData().roomId);
+        } catch (e) {
+            console.warn("SocketManager => handleRoomsFromSameWorldQuery => error while getting other rooms list", e);
+            // Nothing to do with the error
+            Sentry.captureException(e);
             client.send(
                 ServerToClientMessage.encode({
                     message: {
@@ -1308,19 +1308,9 @@ export class SocketManager implements ZoneEventListener {
                         answerMessage: {
                             id: queryMessage.id,
                             answer: {
-                                $case: "roomsFromSameWorldAnswer",
-                                roomsFromSameWorldAnswer: {
-                                    roomDescriptions: roomDescriptions.map((room) => ({
-                                        ...room,
-                                        name: room.name ?? "",
-                                        roomUrl: room.roomUrl ?? "",
-                                        description: room.description ?? undefined, // Add this line to ensure description is not null
-                                        wamUrl: room.wamUrl ?? undefined, // Add this line to ensure wamUrl is not null
-                                        copyright: room.copyright ?? undefined, // Add this line to ensure copyright is not null
-                                        thumbnail: room.thumbnail ?? undefined, // Add this line to ensure thumbnail is not null
-                                        areasSearchable: room.areasSearchable ?? undefined, // Add this line to ensure areasSearchable is not null
-                                        entitiesSearchable: room.entitiesSearchable ?? undefined, // Add this line to ensure entitiesSearchable is not null
-                                    })),
+                                $case: "error",
+                                error: {
+                                    message: e instanceof Error ? e.message + e.stack : "Unknown error",
                                 },
                             },
                         },
@@ -1328,34 +1318,25 @@ export class SocketManager implements ZoneEventListener {
                 }).finish(),
                 true
             );
-        } catch (e) {
-            console.warn("SocketManager => handleRoomsFromSameWorldQuery => error while getting other rooms list", e);
-            try {
-                client.send(
-                    ServerToClientMessage.encode({
-                        message: {
-                            $case: "answerMessage",
-                            answerMessage: {
-                                id: queryMessage.id,
-                                answer: {
-                                    $case: "error",
-                                    error: {
-                                        message: e instanceof Error ? e.message + e.stack : "Unknown error",
-                                    },
-                                },
+            return;
+        }
+        client.send(
+            ServerToClientMessage.encode({
+                message: {
+                    $case: "answerMessage",
+                    answerMessage: {
+                        id: queryMessage.id,
+                        answer: {
+                            $case: "roomsFromSameWorldAnswer",
+                            roomsFromSameWorldAnswer: {
+                                roomDescriptions,
                             },
                         },
-                    }).finish(),
-                    true
-                );
-                // Nothing to do with the error
-                Sentry.captureException(e);
-                return;
-            } catch (e) {
-                Sentry.captureException(e);
-                console.warn("SocketManager => handleRoomsFromSameWorldQuery => error while sending error message", e);
-            }
-        }
+                    },
+                },
+            }).finish(),
+            true
+        );
     }
 
     handleLeaveSpace(client: Socket, spaceName: string) {
diff --git a/play/tests/front/Phaser/Services/HdpiManager.test.ts b/play/tests/front/Phaser/Services/HdpiManager.test.ts
index 8d880fbf5a..a59e622c08 100644
--- a/play/tests/front/Phaser/Services/HdpiManager.test.ts
+++ b/play/tests/front/Phaser/Services/HdpiManager.test.ts
@@ -46,12 +46,9 @@ describe("Test HdpiManager", () => {
 
         hdpiManager.zoomModifier = 1 / 10;
 
-        const screen = { width: 1280, height: 768 };
         const result = hdpiManager.getOptimalGameSize({ width: 1280, height: 768 });
-        expect(result.game.width).toBeGreaterThanOrEqual(screen.width);
-        expect(result.game.width).toBeLessThanOrEqual(screen.width * 1.1);
-        expect(result.game.height).toBeGreaterThanOrEqual(screen.height);
-        expect(result.game.height).toBeLessThanOrEqual(screen.height * 1.1);
+        expect(result.game.width).toEqual(1280);
+        expect(result.game.height).toEqual(768);
         expect(hdpiManager.zoomModifier).toEqual(2 / 3);
     });
 });
diff --git a/tests/tests/map_editor.spec.ts b/tests/tests/map_editor.spec.ts
index 0eeaa942eb..230a5aebaf 100644
--- a/tests/tests/map_editor.spec.ts
+++ b/tests/tests/map_editor.spec.ts
@@ -5,7 +5,6 @@ import MapEditor from "./utils/mapeditor";
 import Megaphone from "./utils/map-editor/megaphone";
 import AreaEditor from "./utils/map-editor/areaEditor";
 import EntityEditor from "./utils/map-editor/entityEditor";
-import Exploration from "./utils/map-editor/exploration";
 import Map from "./utils/map";
 import ConfigureMyRoom from "./utils/map-editor/configureMyRoom";
 import {resetWamMaps} from "./utils/map-editor/uploader";
@@ -401,68 +400,4 @@ test.describe('Map editor', () => {
   // Create test for Google picker spreadsheet
   // Create test fir Google picker presentation
   // Create test for Google picker drive
-
-  test('Successfully set searchable processus for entity and zone', async ({ page, browser, request, browserName }) => {
-    /*if (browser.browserType() === webkit) {
-      // Webkit is somehow failing on this, maybe it is too slow
-      //eslint-disable-next-line playwright/no-skipped-test
-      test.skip();
-      return;
-    }*/
-
-    await resetWamMaps(request);
-    await page.goto(Map.url("empty"));
-    await login(page, "test", 3);
-    // Because webkit in playwright does not support Camera/Microphone Permission by settings
-    if(browserName === "webkit"){
-      await hideNoCamera(page);
-    }
-
-    // Open the map editor
-    await Menu.openMapEditor(page);
-
-    // Area
-    await MapEditor.openAreaEditor(page);
-    await AreaEditor.drawArea(page, {x: 1*32*1.5, y: 5}, {x: 9*32*1.5, y: 4*32*1.5});
-    await AreaEditor.setAreaName(page, 'My Focusable Zone');
-    await AreaEditor.setAreaDescription(page, 'This is a focus zone to test the search feature in the exploration mode. It should be searchable.');
-    await AreaEditor.setAreaSearcheable(page, true);
-    await AreaEditor.addProperty(page, 'Focusable');
-
-    // Entity
-    // Webkit is somehow failing on this, maybe it is too slow
-    if (browser.browserType() !== webkit) {
-      //eslint-disable-next-line playwright/no-skipped-test
-      await MapEditor.openEntityEditor(page);
-      await EntityEditor.selectEntity(page, 0, 'small table');
-      await EntityEditor.moveAndClick(page, 14*32, 13*32);
-      await EntityEditor.quitEntitySelector(page);
-      await EntityEditor.moveAndClick(page, 14*32, 13*32);
-      await EntityEditor.setEntityName(page, 'My Jitsi Entity');
-      await EntityEditor.setEntityDescription(page, 'This is a Jitsi entity to test the search feature in the exploration mode. It should be searchable.');
-      await EntityEditor.setEntitySearcheable(page, true);
-      await EntityEditor.addProperty(page, 'Jitsi Room');
-    }
-
-    // Open the map exploration mode
-    await MapEditor.openExploration(page);
-    await Exploration.openSreachMode(page);
-
-    // Excpected 1 entity and 1 zone in the search result
-    // With webkit, something wrong to put an object and clik on it, so in this case, we don't have an object
-    if (browser.browserType() !== webkit) {
-      // Test if the entity is searchable
-      await expect(page.locator('.map-editor .sidebar .entities')).toContainText('1 objects found');
-      await page.locator('.map-editor .sidebar .entities').click();
-      expect(await page.locator('.map-editor .sidebar .entity-items .item').count()).toBe(1);
-    }else{
-      // For webkit, we don't have an object
-      await expect(page.locator('.map-editor .sidebar .entities')).toContainText('No entity found in the room 🙅‍♂️');
-    }
-
-    // Test if the area is searchable
-    await expect(page.locator('.map-editor .sidebar .areas')).toContainText('1 areas found');
-    await page.locator('.map-editor .sidebar .areas').click();
-    expect(await page.locator('.map-editor .sidebar .area-items .item').count()).toBe(1);
-  });
 });
diff --git a/tests/tests/meeting.spec.ts b/tests/tests/meeting.spec.ts
index d00444deb7..e8fb3fd739 100644
--- a/tests/tests/meeting.spec.ts
+++ b/tests/tests/meeting.spec.ts
@@ -87,7 +87,7 @@ test.describe('Meeting actions test', () => {
     // Create a new area
     await MapEditor.openAreaEditor(page);
     // Draw the area
-    await AreaEditor.drawArea(page, {x: 0*32*1.5, y: 5}, {x: 9*32*1.5, y: 4*32*1.5});
+    await AreaEditor.drawArea(page, {x: 1*32*1.5, y: 5}, {x: 9*32*1.5, y: 4*32*1.5});
     // Add a property Speaker zone to create new Jitsi meeting zone
     await AreaEditor.addProperty(page, 'Speaker zone');
     // Set the speaker zone property
@@ -96,8 +96,7 @@ test.describe('Meeting actions test', () => {
     await Menu.closeMapEditor(page);
 
     // Move user "Alice" to the new area
-    //await Map.teleportToPosition(page, 4*32, 2*32);
-    await Map.walkTo(page, 'ArrowUp', 2000);
+    await Map.teleportToPosition(page, 4*32, 2*32);
 
     // Add a second user "Bob"
     const newBrowser = await browser.browserType().launch();
@@ -106,9 +105,7 @@ test.describe('Meeting actions test', () => {
     // Login user "Bob"
     await login(userBob, "Bob", 3);
     // Move user "Bob" to the new area
-    // FIME: the teleportToPosition does not work ??
-    //await Map.teleportToPosition(userBob, 4*32, 2*32);
-    await Map.walkTo(userBob, 'ArrowUp', 2000);
+    await Map.teleportToPosition(userBob, 4*32, 2*32);
 
     // The user in the bubble meeting should be visible
     await expect(page.locator('.cameras-container .other-cameras .jitsi-video')).toBeVisible({timeout: 20_000});
diff --git a/tests/tests/utils/map-editor/areaEditor.ts b/tests/tests/utils/map-editor/areaEditor.ts
index 0193f6978e..597ff0baa7 100644
--- a/tests/tests/utils/map-editor/areaEditor.ts
+++ b/tests/tests/utils/map-editor/areaEditor.ts
@@ -26,20 +26,9 @@ class AreaEditor {
     }
 
     async setAreaName(page: Page, name: string){
-        await page.getByPlaceholder('MyArea').click();
-        await page.getByPlaceholder('MyArea').fill(name);
-        await page.getByPlaceholder('MyArea').press('Enter');
-    }
-
-    async setAreaDescription(page: Page, Description: string){
-        await page.getByText('+ Add description field').click();
-        await page.getByPlaceholder('My area is a...').click();
-        await page.getByPlaceholder('My area is a...').fill(Description);
-        await page.getByPlaceholder('My area is a...').press('Enter');
-    }
-
-    async setAreaSearcheable(page: Page, value: boolean){
-        await page.locator('.map-editor .sidebar input#searchable').setChecked(value);
+        await page.getByPlaceholder('Value').click();
+        await page.getByPlaceholder('Value').fill(name);
+        await page.getByPlaceholder('Value').press('Enter');
     }
 
     async setExitProperty(page: Page, mapName: string, startAreaName: string){
diff --git a/tests/tests/utils/map-editor/entityEditor.ts b/tests/tests/utils/map-editor/entityEditor.ts
index aaf35eb5a8..d1979e0300 100644
--- a/tests/tests/utils/map-editor/entityEditor.ts
+++ b/tests/tests/utils/map-editor/entityEditor.ts
@@ -26,23 +26,6 @@ class EntityEditor {
     async addProperty(page: Page, property: string) {
         await page.locator('.map-editor .sidebar .properties-buttons .add-property-button', {hasText: property}).click();
     }
-
-    async setEntityName(page: Page, name: string){
-        await page.getByPlaceholder('MyObject').click();
-        await page.getByPlaceholder('MyObject').fill(name);
-        await page.getByPlaceholder('MyObject').press('Enter');
-    }
-
-    async setEntityDescription(page: Page, Description: string){
-        await page.getByText('+ Add description field').click();
-        await page.getByPlaceholder('My object is a...').click();
-        await page.getByPlaceholder('My object is a...').fill(Description);
-        await page.getByPlaceholder('My object is a...').press('Enter');
-    }
-
-    async setEntitySearcheable(page: Page, value: boolean){
-        await page.locator('.map-editor .sidebar input#searchable').setChecked(value);
-    }
 }
 
 export default new EntityEditor();
diff --git a/tests/tests/utils/map-editor/exploration.ts b/tests/tests/utils/map-editor/exploration.ts
deleted file mode 100644
index 557717ba18..0000000000
--- a/tests/tests/utils/map-editor/exploration.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Page } from "@playwright/test";
-
-class Exploration {
-    async openSreachMode(page: Page) {
-        await page.locator('.map-editor .sidebar .properties-buttons .add-property-button', {hasText: 'Search mode'}).click();
-    }
-}
-export default new Exploration();
diff --git a/tests/tests/utils/mapeditor.ts b/tests/tests/utils/mapeditor.ts
index b4d28fc897..ece240a35f 100644
--- a/tests/tests/utils/mapeditor.ts
+++ b/tests/tests/utils/mapeditor.ts
@@ -14,10 +14,6 @@ class MapEditor {
     async openEntityEditor(page: Page) {
         await page.locator('section.side-bar-container .side-bar .tool-button button#EntityEditor').first().click();
     }
-
-    async openExploration(page: Page) {
-        await page.locator('section.side-bar-container .side-bar .tool-button button#ExploreTheRoom').first().click();
-    }
 }
 
 export default new MapEditor();
\ No newline at end of file