diff --git a/files/assets/css/orgy.css b/files/assets/css/orgy.css
index 5b626837b..f2d0bd40b 100644
--- a/files/assets/css/orgy.css
+++ b/files/assets/css/orgy.css
@@ -1,11 +1,12 @@
 .orgy-top-container {
     display: flex;
-    flex-flow: row wrap;
+    flex-flow: row nowrap;
     justify-content: space-around;
 }
 
 .orgy-chat-window-item {
     flex-grow: 2;
+    width: fit-content;
 }
 .orgy-info-window-item {
     max-width: 550px;
diff --git a/files/templates/orgy.html b/files/templates/orgy.html
index 6a2aead00..e27bd8326 100644
--- a/files/templates/orgy.html
+++ b/files/templates/orgy.html
@@ -11,14 +11,23 @@
 	<div class="container pb-4">
         
 		<div class="orgy-top-container">
-            <div class="orgy-info-window-item">
+            <div class="col text-left d-none d-lg-block pt-3 orgy-info-window-item">
                 <h2>Deboonking Aliens with Style 'n' Grace</h1>
                 <div>
                     <lite-youtube videoid="xYXlak-APuA" params="autoplay=1&modestbranding=1"/>
                 </div>
                 {{macros.chat_users_list()}}
             </div>
+            
             <div class="orgy-chat-window-item">
+                <div id="chat-group-template" class="d-none">
+                    {{macros.chat_group_template()}}
+                    </div>
+                </div>
+    
+                <div id="chat-line-template" class="d-none">
+                    {{macros.chat_line_template()}}
+                </div>
                 {{macros.chat_users_online()}}
                 {{macros.chat_window(vlink)}}
             </div>