diff --git a/src/functional_tests/test_gatekeeper.py b/src/functional_tests/test_gatekeeper.py
index da503e3..c3d8256 100644
--- a/src/functional_tests/test_gatekeeper.py
+++ b/src/functional_tests/test_gatekeeper.py
@@ -1,3 +1,5 @@
+import time
+
 from selenium.webdriver.common.by import By
 
 from .base import FunctionalTest
@@ -195,6 +197,23 @@ class GatekeeperTest(FunctionalTest):
         ))
         self.assertFalse(Room.objects.filter(name="Doomed Room").exists())
 
+    def test_gatekeeper_overlay_persists_after_htmx_poll(self):
+        # 1. Create room directly (GATHERING) and navigate to its gate URL
+        self.create_pre_authenticated_session("founder@test.io")
+        founder = User.objects.get(email="founder@test.io")
+        room = Room.objects.create(name="Persistent Room", owner=founder)
+        self.browser.get(self.live_server_url + f"/gameboard/room/{room.id}/gate/")
+        # 2. Assert overlay visible on initial page load
+        self.wait_for(
+            lambda: self.browser.find_element(By.CSS_SELECTOR, ".gate-overlay")
+        )
+        # 3. Wait for HTMX poll cycle to fire (poll interval is 3s)
+        time.sleep(4)
+        # 4. Assert overlay still present and visible after poll
+        overlays = self.browser.find_elements(By.CSS_SELECTOR, ".gate-overlay")
+        self.assertEqual(len(overlays), 1)
+        self.assertTrue(overlays[0].is_displayed())
+
     def test_gamer_can_abandon_room_via_gear_menu(self):
         founder = User.objects.create(email="founder@test.io")
         room = Room.objects.create(name="Dragon's Den", owner=founder)
diff --git a/src/static_src/scss/_gameboard.scss b/src/static_src/scss/_gameboard.scss
index 7414f5d..39caa7a 100644
--- a/src/static_src/scss/_gameboard.scss
+++ b/src/static_src/scss/_gameboard.scss
@@ -93,6 +93,15 @@ body.page-gameboard {
     }
 }
 
+#id_applet_my_games {
+
+    ul {
+        display: flex;
+        flex-direction: column;
+        
+    }
+}
+
 #id_tooltip_portal {
     position: fixed;
     z-index: 9999;
diff --git a/src/templates/apps/gameboard/_partials/_applet-my-games.html b/src/templates/apps/gameboard/_partials/_applet-my-games.html
index 3840616..ae4edc1 100644
--- a/src/templates/apps/gameboard/_partials/_applet-my-games.html
+++ b/src/templates/apps/gameboard/_partials/_applet-my-games.html
@@ -7,7 +7,7 @@
         {% for room in my_games %}
             <li><a href="{% url 'epic:gatekeeper' room.id %}">{{ room.name }}</a></li>
         {% empty %}
-            <li><small>No games yet</small></li>
+            <li class="game-list-item"><small>No games yet</small></li>
         {% endfor %}
     </ul>
 </section>
\ No newline at end of file
diff --git a/src/templates/apps/gameboard/_partials/_applet-new-game.html b/src/templates/apps/gameboard/_partials/_applet-new-game.html
index 3710f93..698a6a8 100644
--- a/src/templates/apps/gameboard/_partials/_applet-new-game.html
+++ b/src/templates/apps/gameboard/_partials/_applet-new-game.html
@@ -6,6 +6,6 @@
     <form method="POST" action="{% url "epic:create_room" %}">
         {% csrf_token %}
         <input id="id_new_game_name" name="name" type="text" placeholder="Room name" />
-        <button type="submit" id="id_create_game_btn" class="btn btn-primary btn-xl">Start<br>Game</button>
+        <button type="submit" id="id_create_game_btn" class="btn btn-confirm">OK</button>
     </form>
 </section>
\ No newline at end of file
diff --git a/src/templates/apps/gameboard/_partials/_gatekeeper.html b/src/templates/apps/gameboard/_partials/_gatekeeper.html
index 1d11da7..9bb2428 100644
--- a/src/templates/apps/gameboard/_partials/_gatekeeper.html
+++ b/src/templates/apps/gameboard/_partials/_gatekeeper.html
@@ -1,36 +1,45 @@
-<div class="gate-modal" role="dialog" aria-label="Gatekeeper">
-    <header class="gate-header">
-        <h1>{{ room.name }}</h1>
-        <span class="gate-status">{{ room.gate_status }}</span>
-    </header>
+<div
+    id="id_gate_wrapper"
+    hx-get="{% url 'epic:gate_status' room.id %}"
+    hx-trigger="every 3s"
+    hx-swap="outerHTML"
+>
+    <div class="gate-overlay">
+        <div class="gate-modal" role="dialog" aria-label="Gatekeeper">
+            <header class="gate-header">
+                <h1>{{ room.name }}</h1>
+                <span class="gate-status">{{ room.gate_status }}</span>
+            </header>
 
-    <div class="gate-slots">
-        {% for slot in slots %}
-            <div
-                class="gate-slot{% if slot.status == 'EMPTY' %} empty{% elif slot.status == 'FILLED' %} filled{% endif %}"
-                data-slot="{{ slot.slot_number }}"
-            >
-                <span class="slot-number">{{ slot.slot_number }}</span>
-                {% if slot.gamer %}
-                    <span class="slot-gamer">{{ slot.gamer.email }}</span>
+            <div class="gate-slots">
+                {% for slot in slots %}
+                    <div
+                        class="gate-slot{% if slot.status == 'EMPTY' %} empty{% elif slot.status == 'FILLED' %} filled{% endif %}"
+                        data-slot="{{ slot.slot_number }}"
+                    >
+                        <span class="slot-number">{{ slot.slot_number }}</span>
+                        {% if slot.gamer %}
+                            <span class="slot-gamer">{{ slot.gamer.email }}</span>
 
-                {% else %}
-                    <span class="slot-gamer">empty</span>
-                {% endif %}
-                {% if slot.status == 'EMPTY' and request.user.is_authenticated and not user_has_slot %}
-                    <form method="POST" action="{% url "epic:drop_token" room.id slot.slot_number %}">
-                        {% csrf_token %}
-                        <button type="submit" class="btn drop-token-btn btn-primary btn-xl">Drop Token</button>
-                    </form>
-                    {% endif %}
+                        {% else %}
+                            <span class="slot-gamer">empty</span>
+                        {% endif %}
+                        {% if slot.status == 'EMPTY' and request.user.is_authenticated and not user_has_slot %}
+                            <form method="POST" action="{% url "epic:drop_token" room.id slot.slot_number %}">
+                                {% csrf_token %}
+                                <button type="submit" class="btn drop-token-btn btn-primary btn-xl">Drop Token</button>
+                            </form>
+                            {% endif %}
+                    </div>
+                {% endfor %}
             </div>
-        {% endfor %}
+            {% if request.user == room.owner %}
+                <form method="POST" action="{% url 'epic:invite_gamer' room.id %}">
+                    {% csrf_token %}
+                    <input type="email" name="invitee_email" id="id_invite_email" placeholder="friend@example.com">
+                    <button type="submit" id="id_invite_btn" class="btn btn-primary btn-xl">Invite</button>
+                </form>
+            {% endif %}
+        </div>
     </div>
-    {% if request.user == room.owner %}
-        <form method="POST" action="{% url 'epic:invite_gamer' room.id %}">
-            {% csrf_token %}
-            <input type="email" name="invitee_email" id="id_invite_email" placeholder="friend@example.com">
-            <button type="submit" id="id_invite_btn" class="btn btn-primary btn-xl">Invite</button>
-        </form>
-    {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/templates/apps/gameboard/room.html b/src/templates/apps/gameboard/room.html
index 05c6072..cff3d52 100644
--- a/src/templates/apps/gameboard/room.html
+++ b/src/templates/apps/gameboard/room.html
@@ -10,18 +10,9 @@
             <div class="room-table"></div>
         </div>
 
-        <div
-            id="id_gate_wrapper"
-            hx-get="{% url 'epic:gate_status' room.id %}"
-            hx-trigger="every 3s"
-            hx-swap="outerHTML"
-        >
-            {% if room.gate_status == "GATHERING" %}
-                <div class="gate-overlay">
-                    {% include "apps/gameboard/_partials/_gatekeeper.html" %}
-                </div>
-            {% endif %}
-        </div>
+        {% if room.gate_status == "GATHERING" %}
+            {% include "apps/gameboard/_partials/_gatekeeper.html" %}
+        {% endif %}
         {% include "apps/gameboard/_partials/_room_gear.html" %}
     </div>
 {% endblock content %}
\ No newline at end of file