diff --git a/WebHostLib/static/styles/options/player.css b/WebHostLib/static/styles/options/player.css
index 4d42dac62dcf..be324822fb82 100644
--- a/WebHostLib/static/styles/options/player.css
+++ b/WebHostLib/static/styles/options/player.css
@@ -45,8 +45,9 @@ html {
   text-align: justify;
 }
 #player-options #options-meta, #player-options .options {
-  column-count: 1;
-  column-gap: 1.5rem;
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-gap: 1.5rem;
   margin-bottom: 1.5rem;
 }
 #player-options .group-container {
@@ -85,10 +86,6 @@ html {
   line-height: 28px;
   margin-right: 24px;
 }
-#player-options .option-container label .tooltip-container {
-  position: absolute;
-  z-index: 99999;
-}
 #player-options .option-container .option-subcontainer {
   display: flex;
   flex-direction: column;
@@ -254,6 +251,8 @@ html {
     font-size: 16px;
   }
   #player-options #options-meta, #player-options .options {
+    grid-template-columns: 1fr 1fr;
+    grid-gap: 0.5rem 1.5rem;
     column-count: 2;
   }
   #player-options .group-container summary, #player-options .group-container h3 {
diff --git a/WebHostLib/static/styles/options/player.css.map b/WebHostLib/static/styles/options/player.css.map
index 88dd7b79a6db..6b7d8a81a58c 100644
--- a/WebHostLib/static/styles/options/player.css.map
+++ b/WebHostLib/static/styles/options/player.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["player.scss"],"names":[],"mappings":"AAAQ;AAER;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAIR;EAII;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAIR;EACI;;AAGJ;EACI;;AAEA;EACI;;AAIR;EACI;EACA;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;AAEA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;EACA;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAKR;EAEQ;IACI;;EAGJ;IACI;;;AAMZ;EACI;IACI;IACA;;EAGI;IACI;IACA;;EAGJ;IACI;;EAGJ;IACI;;EAIR;IAGI;;EAIA;IACI;;EAKJ;IACI;IACA;;EAIA;IACI;IACA;IACA;;EAGJ;IACI;IACA","file":"player.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["player.scss"],"names":[],"mappings":"AAAQ;AAER;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAIR;EACI;;AAGJ;EACI;;AAEA;EACI;;AAIR;EACI;EACA;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;AAEA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;EACA;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAKR;EAEQ;IACI;;EAGJ;IACI;;;AAMZ;EACI;IACI;IACA;;EAGI;IACI;IACA;;EAGJ;IACI;;EAGJ;IACI;;EAIR;IACI;IACA;IACA;;EAIA;IACI;;EAKJ;IACI;IACA;;EAIA;IACI;IACA;IACA;;EAGJ;IACI;IACA","file":"player.css"}
\ No newline at end of file
diff --git a/WebHostLib/static/styles/options/player.scss b/WebHostLib/static/styles/options/player.scss
index be534ceea33c..60423d0934c6 100644
--- a/WebHostLib/static/styles/options/player.scss
+++ b/WebHostLib/static/styles/options/player.scss
@@ -52,11 +52,9 @@ html {
     }
 
     #options-meta, .options {
-        //display: grid;
-        //grid-template-columns: 1fr;
-        //grid-gap: 1.5rem;
-        column-count: 1;
-        column-gap: 1.5rem;
+        display: grid;
+        grid-template-columns: 1fr;
+        grid-gap: 1.5rem;
         margin-bottom: 1.5rem;
     }
 
@@ -98,11 +96,6 @@ html {
             min-height: 32px;
             line-height: 28px;
             margin-right: 24px;
-
-            .tooltip-container {
-                position: absolute;
-                z-index: 99999;
-            }
         }
 
         .option-subcontainer {
@@ -308,8 +301,8 @@ html {
         }
 
         #options-meta, .options {
-            //grid-template-columns: 1fr 1fr;
-            //grid-gap: 0.5rem 1.5rem;
+            grid-template-columns: 1fr 1fr;
+            grid-gap: 0.5rem 1.5rem;
             column-count: 2;
         }
 
diff --git a/WebHostLib/templates/playerOptions/macros.html b/WebHostLib/templates/playerOptions/macros.html
index 30367c63b557..a4788050f649 100644
--- a/WebHostLib/templates/playerOptions/macros.html
+++ b/WebHostLib/templates/playerOptions/macros.html
@@ -202,7 +202,7 @@
 
 {% macro OptionTitle(option_name, option) %}
     <label for="{{ option_name }}">
-        {{ option.display_name | default(option_name) }}<span class="nobr">:&nbsp;<span
+        {{ option.display_name | default(option_name) }}<span class="nobr">: <span
             class="interactive tooltip-container"
             {% if not (option.rich_text_doc | default(world.web.rich_text_options_doc, true)) %}
               data-tooltip="{{ (option.__doc__ | default("Please document me!")) | replace("\n    ", "\n") | escape | trim }}"
diff --git a/WebHostLib/templates/playerOptions/playerOptions.html b/WebHostLib/templates/playerOptions/playerOptions.html
index 2beca44006f4..6cfe1c79510c 100644
--- a/WebHostLib/templates/playerOptions/playerOptions.html
+++ b/WebHostLib/templates/playerOptions/playerOptions.html
@@ -73,7 +73,7 @@ <h2>Player Options</h2>
             <div id="options-meta">
                 <div class="option-container">
                     <label for="player-name">
-                        Player Name:&nbsp;
+                        Player Name:
                         <span class="interactive tooltip-container">
                             (?)<span class="tooltip">{{ PlayerNameHelp() | safe }}</span>
                         </span>
@@ -84,7 +84,7 @@ <h2>Player Options</h2>
                 </div>
                 <div class="js-required option-container">
                     <label for="game-options-preset">
-                        Options Preset:&nbsp;
+                        Options Preset:
                         <span
                             class="interactive tooltip-container"
                             data-tooltip="Select from a list of developer-curated presets (if any) or reset all options to their defaults."