diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte
index a1277ed2..620884cf 100644
--- a/front/src/Components/App.svelte
+++ b/front/src/Components/App.svelte
@@ -1,166 +1,52 @@
-
- {#if $loginSceneVisibleStore}
-
-
-
- {/if}
- {#if $selectCharacterSceneVisibleStore}
-
-
-
- {/if}
- {#if $customCharacterSceneVisibleStore}
-
-
-
- {/if}
- {#if $selectCompanionSceneVisibleStore}
-
-
-
- {/if}
- {#if $enableCameraSceneVisibilityStore}
-
-
-
- {/if}
- {#if $banMessageStore.length > 0}
-
-
-
- {:else if $textMessageStore.length > 0}
-
-
-
- {/if}
- {#if $soundPlayingStore}
-
- {/if}
- {#if $audioManagerVisibilityStore}
-
- {/if}
- {#if $layoutManagerVisibilityStore}
-
-
-
- {/if}
- {#if $showReportScreenStore !== userReportEmpty}
-
-
-
- {/if}
- {#if $followStateStore !== "off" || $peerStore.size > 0}
-
-
-
- {/if}
- {#if $menuIconVisiblilityStore}
-
-
-
- {/if}
- {#if $menuVisiblilityStore}
-
-
-
- {/if}
- {#if $emoteMenuStore}
-
-
-
- {/if}
- {#if $gameOverlayVisibilityStore}
-
-
-
-
-
- {/if}
- {#if $helpCameraSettingsVisibleStore}
-
-
-
- {/if}
- {#if $showLimitRoomModalStore}
-
-
-
- {/if}
- {#if $showShareLinkMapModalStore}
-
-
-
- {/if}
- {#if $requestVisitCardsStore}
-
- {/if}
- {#if $errorStore.length > 0}
-
-
-
- {/if}
+{#if $errorStore.length > 0}
+
+
+
+{:else if $loginSceneVisibleStore}
+
+
+
+{:else if $selectCharacterSceneVisibleStore}
+
+
+
+{:else if $customCharacterSceneVisibleStore}
+
+
+
+{:else if $selectCompanionSceneVisibleStore}
+
+
+
+{:else if $enableCameraSceneVisibilityStore}
+
+
+
+{:else}
+
+
{#if $chatVisibilityStore}
{/if}
- {#if $warningContainerStore}
-
- {/if}
-
+{/if}
diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte
index 3385d6da..87b949c7 100644
--- a/front/src/Components/AudioManager/AudioManager.svelte
+++ b/front/src/Components/AudioManager/AudioManager.svelte
@@ -157,13 +157,16 @@
diff --git a/front/src/Components/Chat/Chat.svelte b/front/src/Components/Chat/Chat.svelte
index c4756a36..cd9b90b5 100644
--- a/front/src/Components/Chat/Chat.svelte
+++ b/front/src/Components/Chat/Chat.svelte
@@ -43,7 +43,7 @@