From cc58d02a280f5abc599b9d95af0169fde4949751 Mon Sep 17 00:00:00 2001
From: Cybernetic-O-Cult <cyberneticocult@gmail.com>
Date: Sun, 13 Apr 2025 16:47:33 -0400
Subject: [PATCH 1/2] Moved the UI elements to their own inner div and left the
 disconnect overlay in coreui div.

---
 src/client/components/CoreUI.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/client/components/CoreUI.js b/src/client/components/CoreUI.js
index 2e85c733..6c410ea6 100644
--- a/src/client/components/CoreUI.js
+++ b/src/client/components/CoreUI.js
@@ -102,20 +102,26 @@ function Content({ world, width, height }) {
       css={css`
         position: absolute;
         inset: 0;
-        display: ${visible ? 'block' : 'none'};
       `}
     >
       {disconnected && <Disconnected />}
-      <Reticle world={world} />
-      {<Toast world={world} />}
-      {ready && <Side world={world} player={player} menu={menu} />}
-      {ready && menu?.type === 'app' && code && (
-        <CodeEditor key={`code-${menu.app.data.id}`} world={world} app={menu.app} blur={menu.blur} />
-      )}
-      {avatar && <AvatarPane key={avatar.hash} world={world} info={avatar} />}
-      {apps && <AppsPane world={world} close={() => world.ui.toggleApps()} />}
-      {!ready && <LoadingOverlay />}
-      {kicked && <KickedOverlay code={kicked} />}
+	  <div
+		className='coreui-inner'
+		css={css`
+          display: ${visible ? 'block' : 'none'};
+        `}
+	  >
+		<Reticle world={world} />
+		{<Toast world={world} />}
+		{ready && <Side world={world} player={player} menu={menu} />}
+		{ready && menu?.type === 'app' && code && (
+          <CodeEditor key={`code-${menu.app.data.id}`} world={world} app={menu.app} blur={menu.blur} />
+		)}
+		{avatar && <AvatarPane key={avatar.hash} world={world} info={avatar} />}
+		{apps && <AppsPane world={world} close={() => world.ui.toggleApps()} />}
+		{!ready && <LoadingOverlay />}
+		{kicked && <KickedOverlay code={kicked} />}
+	  </div>
     </div>
   )
 }

From cc84cfeb3b273c754351b03ed5ea211a17430fdc Mon Sep 17 00:00:00 2001
From: Cybernetic-O-Cult <cyberneticocult@gmail.com>
Date: Sat, 26 Apr 2025 16:23:50 -0400
Subject: [PATCH 2/2] Added missing div.

---
 src/client/components/CoreUI.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/client/components/CoreUI.js b/src/client/components/CoreUI.js
index ee9b6bdd..128b410f 100644
--- a/src/client/components/CoreUI.js
+++ b/src/client/components/CoreUI.js
@@ -116,24 +116,25 @@ function Content({ world, width, height }) {
       `}
     >
       {disconnected && <Disconnected />}
-	  <div
-		className='coreui-inner'
-		css={css`
+      <div
+        className='coreui-inner'
+        css={css`
           display: ${visible ? 'block' : 'none'};
         `}
-	  >
-      <Reticle world={world} />
-      {<Toast world={world} />}
-      {ready && <Side world={world} player={player} menu={menu} />}
-      {ready && menu?.type === 'app' && code && (
-        <CodeEditor key={`code-${menu.app.data.id}`} world={world} app={menu.app} blur={menu.blur} />
-      )}
-      {avatar && <AvatarPane key={avatar.hash} world={world} info={avatar} />}
-      {apps && <AppsPane world={world} close={() => world.ui.toggleApps()} />}
-      {!ready && <LoadingOverlay />}
-      {kicked && <KickedOverlay code={kicked} />}
-      {ready && isTouch && <TouchBtns world={world} />}
-      <div id='core-ui-portal' />
+      >
+        <Reticle world={world} />
+        {<Toast world={world} />}
+        {ready && <Side world={world} player={player} menu={menu} />}
+        {ready && menu?.type === 'app' && code && (
+          <CodeEditor key={`code-${menu.app.data.id}`} world={world} app={menu.app} blur={menu.blur} />
+        )}
+        {avatar && <AvatarPane key={avatar.hash} world={world} info={avatar} />}
+        {apps && <AppsPane world={world} close={() => world.ui.toggleApps()} />}
+        {!ready && <LoadingOverlay />}
+        {kicked && <KickedOverlay code={kicked} />}
+        {ready && isTouch && <TouchBtns world={world} />}
+        <div id='core-ui-portal' />
+      </div>
     </div>
   )
 }