diff --git a/package.json b/package.json
index 1d2ddf2..1798064 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ui",
-	"version": "6.4.4",
+	"version": "6.4.5",
 	"license": "BUSL-1.1",
 	"private": true,
 	"packageManager": "pnpm@9.14.4",
diff --git a/src/lib/components/ui/chat/UserList.svelte b/src/lib/components/ui/chat/UserList.svelte
index 445c2af..7a62dde 100644
--- a/src/lib/components/ui/chat/UserList.svelte
+++ b/src/lib/components/ui/chat/UserList.svelte
@@ -11,7 +11,7 @@
   $: processed = Object.entries(users)
 </script>
 
-<div class='flex flex-col w-72 max-w-full px-5 overflow-hidden'>
+<div class='flex flex-col w-full md:w-72 max-w-full px-5 overflow-y-auto md:max-h-full max-h-[40%]'>
   <div class='text-md font-bold pl-1 pb-2'>
     {processed.length} Member(s)
   </div>
diff --git a/src/lib/components/ui/irc/interface.svelte b/src/lib/components/ui/irc/interface.svelte
index 4926ea6..a1b8800 100644
--- a/src/lib/components/ui/irc/interface.svelte
+++ b/src/lib/components/ui/irc/interface.svelte
@@ -49,8 +49,11 @@
 
 <div class='flex flex-col w-full relative px-md-4 h-full overflow-hidden'>
   <div class='flex md:flex-row flex-col-reverse w-full h-full pt-4'>
-    <div class='flex flex-col justify-end overflow-hidden flex-grow px-4 md:pb-4'>
-      <Messages messages={client.messages} />
+    <div class='flex flex-col justify-end overflow-clip flex-grow px-4 pb-4 h-full min-h-0'>
+      <div class='mb-auto hidden md:block text-center font-bold text-lg'>Global App Chat</div>
+      <div class='h-full overflow-y-scroll min-h-0 w-full'>
+        <Messages messages={client.messages} />
+      </div>
       <div class='flex mt-4 gap-2'>
         <Button on:click={quit} size='icon' class='border-0 shrink-0' variant='outline'>
           <DoorOpen size={18} />
@@ -68,5 +71,6 @@
       </div>
     </div>
     <UserList users={processedUsers} />
+    <div class='md:hidden px-6 text-center font-bold text-lg'>Global App Chat</div>
   </div>
 </div>
diff --git a/src/routes/app/w2g/+page.ts b/src/routes/app/w2g/+page.ts
index 8a9eb47..b14b78f 100644
--- a/src/routes/app/w2g/+page.ts
+++ b/src/routes/app/w2g/+page.ts
@@ -7,7 +7,7 @@ import { w2globby } from '$lib/modules/w2g/lobby'
 
 export function load () {
   const lastVal = get(server.last)
-  w2globby.value ??= new W2GClient(generateRandomHexCode(16), true, lastVal?.media.id ? { mediaId: lastVal.media.id, episode: lastVal.episode, torrent: lastVal.id } : undefined)
+  w2globby.value ??= new W2GClient(generateRandomHexCode(8), true, lastVal?.media.id ? { mediaId: lastVal.media.id, episode: lastVal.episode, torrent: lastVal.id } : undefined)
 
   redirect(302, '/app/w2g/' + w2globby.value.code)
 }
diff --git a/src/routes/app/w2g/[id]/+page.svelte b/src/routes/app/w2g/[id]/+page.svelte
index 8f416d5..dfbd8b9 100644
--- a/src/routes/app/w2g/[id]/+page.svelte
+++ b/src/routes/app/w2g/[id]/+page.svelte
@@ -60,8 +60,11 @@
 
 <div class='flex flex-col w-full relative px-md-4 h-full overflow-hidden'>
   <div class='flex md:flex-row flex-col-reverse w-full h-full pt-4'>
-    <div class='flex flex-col justify-end overflow-hidden flex-grow px-4 pb-4'>
-      <Messages {messages} />
+    <div class='flex flex-col justify-end overflow-clip flex-grow px-4 pb-4 h-full min-h-0'>
+      <div class='mb-auto hidden md:block text-center font-bold text-lg'>Watch Together {$w2globby?.code}</div>
+      <div class='h-full overflow-y-scroll min-h-0 w-full'>
+        <Messages {messages} />
+      </div>
       <div class='flex mt-4 gap-2'>
         <Button on:click={quit} size='icon' class='border-0 shrink-0' variant='outline'>
           <DoorOpen size={18} />
@@ -82,5 +85,6 @@
       </div>
     </div>
     <UserList users={prcoessedUsers} />
+    <div class='md:hidden px-6 text-center font-bold text-lg'>Watch Together {$w2globby?.code}</div>
   </div>
 </div>