diff --git a/MusicPlayerV2-GUI/src/components/playerView.vue b/MusicPlayerV2-GUI/src/components/playerView.vue
index 44ff8a4..9b4d2f3 100644
--- a/MusicPlayerV2-GUI/src/components/playerView.vue
+++ b/MusicPlayerV2-GUI/src/components/playerView.vue
@@ -74,8 +74,6 @@
 
 
 <script setup lang="ts">
-    // TODO: Handle resize, hide all non-essential controls when below 900px width
-
     import { ref, type Ref } from 'vue';
     import playlistView from '@/components/playlistView.vue';
     import MusicKitJSWrapper from '@/scripts/music-player';
diff --git a/MusicPlayerV2-GUI/src/views/AppView.vue b/MusicPlayerV2-GUI/src/views/AppView.vue
index 6194820..b919bcc 100644
--- a/MusicPlayerV2-GUI/src/views/AppView.vue
+++ b/MusicPlayerV2-GUI/src/views/AppView.vue
@@ -69,10 +69,12 @@
 
     const selectPlaylist = ( id: string ) => {
         player.value.selectPlaylist( id );
+        player.value.controlUI( 'show' );
     }
 
     const selectCustomPlaylist = ( playlist: ReadFile[] ) => {
         player.value.selectCustomPlaylist( playlist );
+        player.value.controlUI( 'show' );
     }
 
     fetch( localStorage.getItem( 'url' ) + '/checkUserStatus', { credentials: 'include' } ).then( res => {
diff --git a/MusicPlayerV2-GUI/src/views/RemoteView.vue b/MusicPlayerV2-GUI/src/views/RemoteView.vue
index f732fb8..db80c24 100644
--- a/MusicPlayerV2-GUI/src/views/RemoteView.vue
+++ b/MusicPlayerV2-GUI/src/views/RemoteView.vue
@@ -172,6 +172,7 @@
         text-align: justify;
         background-color: rgb(2, 16, 61);
         color: white;
+        min-height: 100vh;
     }
 
     .loaded {
diff --git a/backend/src/app.ts b/backend/src/app.ts
index 909fc99..39468e1 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -68,33 +68,47 @@ const run = () => {
 
     io.on( 'connection', ( socket ) => {
         socket.on( 'create-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => {
-            if ( room.token === socketData[ room.name ].roomToken ) {
-                socket.join( room.name );
-                cb( {
-                    status: true,
-                    msg: 'ADDED_TO_ROOM'
-                } );
+            if ( socketData[ room.name ] ) {
+                if ( room.token === socketData[ room.name ].roomToken ) {
+                    socket.join( room.name );
+                    cb( {
+                        status: true,
+                        msg: 'ADDED_TO_ROOM'
+                    } );
+                } else {
+                    cb( {
+                        status: false,
+                        msg: 'ERR_TOKEN_INVALID'
+                    } );
+                }
             } else {
                 cb( {
                     status: false,
-                    msg: 'ERR_TOKEN_INVALID'
+                    msg: 'ERR_NAME_INVALID'
                 } );
             }
         } );
 
         socket.on( 'delete-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => {
-            if ( room.token === socketData[ room.name ].roomToken ) {
-                socket.leave( room.name );
-                socket.to( room.name ).emit( 'delete-share', room.name );
-                socketData[ room.name ] = undefined;
-                cb( {
-                    status: true,
-                    msg: 'ROOM_DELETED'
-                } );
+            if ( socketData[ room.name ] ) {
+                if ( room.token === socketData[ room.name ].roomToken ) {
+                    socket.leave( room.name );
+                    socket.to( room.name ).emit( 'delete-share', room.name );
+                    socketData[ room.name ] = undefined;
+                    cb( {
+                        status: true,
+                        msg: 'ROOM_DELETED'
+                    } );
+                } else {
+                    cb( {
+                        status: false,
+                        msg: 'ERR_TOKEN_INVALID'
+                    } );
+                }
             } else {
                 cb( {
                     status: false,
-                    msg: 'ERR_TOKEN_INVALID'
+                    msg: 'ERR_NAME_INVALID'
                 } );
             }
         } );
@@ -117,7 +131,8 @@ const run = () => {
                 cb( {
                     msg: 'ERR_NO_ROOM_WITH_THIS_ID',
                     status: false,
-                } )
+                } );
+                socket.disconnect();
             }
         } );