diff --git a/public/index.html b/public/index.html
index f4e3d57e1..e919eebf5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1120,27 +1120,24 @@
             </div>
             <div class="drawer-content closedDrawer">
                 <div id="wi-holder">
-                    <div id="world_info_block">
-                        <h3>World Info</h3>
-                        <div id="world_info_buttons">
-                            <div id="world_create_button" class="right_menu_button">
-                                <h4>+Create</h4>
-                            </div>
-                            <div id="world_import_button" class="right_menu_button">
-                                <h4>+Import</h4>
-                            </div>
-                        </div>
+                    <h3>
+                        World Info
+                        <a href="/notes#worldinfo" class="notes-link" target="_blank">
+                            <span class="note-link-span">?</span>
+                        </a>
+                    </h3>
+                    <form id="form_world_import" action="javascript:void(null);" method="post" enctype="multipart/form-data">
+                        <input type="file" id="world_import_file" accept=".json" name="avatar" hidden>
+                    </form>
+                    <div class="world_info_select_block">
+                        <select id="world_info" class="flexGrow">
+                            <option value="None">None</option>
+                        </select>
+                        <div id="world_create_button" class="menu_button fa-solid fa-plus" title="Create"></div>
+                        <div id="world_import_button" class="menu_button fa-solid fa-file-arrow-up" title="Import"></div>
+                        <div id="world_info_edit_button" class="menu_button fa-solid fa-pencil" title="Details"></div>
                     </div>
-                    <h4>How to use <a href="/notes#worldinfo" class="notes-link" target="_blank"><span class="note-link-span">?</span></a></h4>
-                    <div id="rm_world_import" class="right_menu" style="display: none;">
-                        <form id="form_world_import" action="javascript:void(null);" method="post" enctype="multipart/form-data">
-                            <input type="file" id="world_import_file" accept=".json" name="avatar">
-                        </form>
-                    </div>
-                    <select id="world_info">
-                        <option value="None">None</option>
-                    </select>
-                    <input id="world_info_edit_button" class="menu_button" type="submit" value="Details">
+
                     <div id="world_info_depth_block">
                         <h4>
                             Scan Depth <a href="/notes#scandepth" class="notes-link" target="_blank"><span class="note-link-span">?</span></a>
@@ -1378,10 +1375,6 @@
                             </form>
                         </div>
                     </div>
-
-
-
-                    <!-- </div> -->
                 </div>
             </div>
         </div>
@@ -1738,86 +1731,6 @@
             <div id="world_popup_export" class="menu_button">Export</div>
             <div id="world_popup_delete" class="menu_button">Delete World</div>
         </div>
-
-        <div id="entry_edit_template">
-            <div class="world_entry">
-                <form class="world_entry_form">
-                    <div class="world_entry_thin_controls">
-                        <div class="world_entry_form_control">
-                            <label for="key">
-                                <h4>Key</h4>
-                                <h5>Comma-separated list of keywords (e.g: foo,bar).</h5>
-                            </label>
-                            <textarea class="text_pole" name="key" rows="1" placeholder="" maxlength="250"></textarea>
-                        </div>
-                        <div class="world_entry_form_control keysecondary">
-                            <label for="keysecondary">
-                                <h4>Secondary Key</h4>
-                                <h5>Comma-separated list of additional keywords.</h5>
-                            </label>
-                            <textarea class="text_pole" name="keysecondary" rows="1" placeholder="" maxlength="250"></textarea>
-                        </div>
-                    </div>
-                    <div class="world_entry_thin_controls">
-                        <div class="world_entry_form_control">
-                            <label for="order">
-                                <h4>Insertion Order</h4>
-                                <h5>Higher order number entries will be inserted first.</h5>
-                            </label>
-                            <input class="text_pole" type="number" name="order" placeholder="" />
-                        </div>
-                        <div class="world_entry_form_control">
-                            <label for="comment">
-                                <h4>Comment</h4>
-                                <h5>Optional comment (doesn't affect the AI).</h5>
-                            </label>
-                            <textarea class="text_pole" rows="1" name="comment" maxlength="250"></textarea>
-                        </div>
-                    </div>
-                    <div class="world_entry_form_control">
-                        <label for="content">
-                            <h4>Content</h4>
-                            <h5>Text that will be inserted to the prompt upon activation.</h5>
-                        </label>
-                        <textarea class="text_pole" name="content" rows="4" placeholder=""></textarea>
-                    </div>
-                    <div class="world_entry_form_control world_entry_form_horizontal">
-                        <label class="checkbox">
-                            <input type="checkbox" name="constant" />
-                            <h4>Constant</h4>
-                        </label>
-                        <label class="checkbox">
-                            <input type="checkbox" name="selective" />
-                            <h4>Selective</h4>
-                        </label>
-                        <div class="world_entry_form_control world_entry_form_radios">
-                            <div>
-                                <label><input type="radio" name="position" value="0">
-                                    <h4>Before Chara</h4>
-                                </label>
-                            </div>
-                            <div>
-                                <label><input type="radio" name="position" value="1">
-                                    <h4>After Chara</h4>
-                                </label>
-                            </div>
-                        </div>
-                        <span class="world_popup_expander">&nbsp;</span>
-                        <h5 class="world_entry_form_uid">
-                            UID:
-                            &nbsp;
-                            <span class="world_entry_form_uid_value"></span>
-                        </h5>
-                        <h5 class="world_entry_form_tokens">
-                            Tokens used:
-                            &nbsp;
-                            <span class="world_entry_form_token_counter">0</span>
-                        </h5>
-                        <input class="menu_button delete_entry_button" type="submit" value="Delete Entry" />
-                    </div>
-                </form>
-            </div>
-        </div>
     </div>
     <div id="shadow_select_chat_popup">
         <div id="select_chat_popup">
@@ -1849,6 +1762,86 @@
 
     <!-- templates for JS to reuse when needed -->
 
+    <div id="entry_edit_template" class="template_element">
+        <div class="world_entry">
+            <form class="world_entry_form">
+                <div class="world_entry_thin_controls">
+                    <div class="world_entry_form_control">
+                        <label for="key">
+                            <h4>Key</h4>
+                            <h5>Comma-separated list of keywords (e.g: foo,bar).</h5>
+                        </label>
+                        <textarea class="text_pole" name="key" rows="1" placeholder="" maxlength="250"></textarea>
+                    </div>
+                    <div class="world_entry_form_control keysecondary">
+                        <label for="keysecondary">
+                            <h4>Secondary Key</h4>
+                            <h5>Comma-separated list of additional keywords.</h5>
+                        </label>
+                        <textarea class="text_pole" name="keysecondary" rows="1" placeholder="" maxlength="250"></textarea>
+                    </div>
+                </div>
+                <div class="world_entry_thin_controls">
+                    <div class="world_entry_form_control">
+                        <label for="order">
+                            <h4>Insertion Order</h4>
+                            <h5>Higher order number entries will be inserted first.</h5>
+                        </label>
+                        <input class="text_pole" type="number" name="order" placeholder="" />
+                    </div>
+                    <div class="world_entry_form_control">
+                        <label for="comment">
+                            <h4>Comment</h4>
+                            <h5>Optional comment (doesn't affect the AI).</h5>
+                        </label>
+                        <textarea class="text_pole" rows="1" name="comment" maxlength="250"></textarea>
+                    </div>
+                </div>
+                <div class="world_entry_form_control">
+                    <label for="content">
+                        <h4>Content</h4>
+                        <h5>Text that will be inserted to the prompt upon activation.</h5>
+                    </label>
+                    <textarea class="text_pole" name="content" rows="4" placeholder=""></textarea>
+                </div>
+                <div class="world_entry_form_control world_entry_form_horizontal">
+                    <label class="checkbox">
+                        <input type="checkbox" name="constant" />
+                        <h4>Constant</h4>
+                    </label>
+                    <label class="checkbox">
+                        <input type="checkbox" name="selective" />
+                        <h4>Selective</h4>
+                    </label>
+                    <div class="world_entry_form_control world_entry_form_radios">
+                        <div>
+                            <label><input type="radio" name="position" value="0">
+                                <h4>Before Chara</h4>
+                            </label>
+                        </div>
+                        <div>
+                            <label><input type="radio" name="position" value="1">
+                                <h4>After Chara</h4>
+                            </label>
+                        </div>
+                    </div>
+                    <span class="world_popup_expander">&nbsp;</span>
+                    <h5 class="world_entry_form_uid">
+                        UID:
+                        &nbsp;
+                        <span class="world_entry_form_uid_value"></span>
+                    </h5>
+                    <h5 class="world_entry_form_tokens">
+                        Tokens used:
+                        &nbsp;
+                        <span class="world_entry_form_token_counter">0</span>
+                    </h5>
+                    <input class="menu_button delete_entry_button" type="submit" value="Delete Entry" />
+                </div>
+            </form>
+        </div>
+    </div>
+
     <div id="character_template" class="template_element">
         <div class="character_select flex-container wide100p alignitemsflexstart" chid="" id="">
             <div class="avatar" title="">
diff --git a/public/script.js b/public/script.js
index c18fbc39e..d972ef44a 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2446,7 +2446,7 @@ function resultCheckStatusNovel() {
 
 async function renameCharacter() {
     const oldAvatar = characters[this_chid].avatar;
-    const newValue = await callPopup('New name:', 'input', characters[this_chid].name);
+    const newValue = await callPopup('<h3>New name:</h3>', 'input', characters[this_chid].name);
 
     if (newValue && newValue !== characters[this_chid].name) {
         const body = JSON.stringify({ avatar_url: oldAvatar, new_name: newValue });
diff --git a/public/style.css b/public/style.css
index b6f21335f..266dac9a3 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1549,30 +1549,11 @@ input[type=search]:focus::-webkit-search-cancel-button {
     display: none;
 }
 
-#world_info {
-    margin-bottom: 0;
-}
-
-#world_info_block {
+.world_info_select_block {
     display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-#world_import_button,
-#world_create_button {
-    cursor: pointer;
-    display: inline-block;
-    padding: 0;
-    margin: 0;
-}
-
-#world_import_button h4,
-#world_create_button h4 {
-    margin-top: auto;
-    margin-bottom: auto;
-    margin-left: 1rem;
-
+    flex-direction: row;
+    align-items: baseline;
+    gap: 5px;
 }
 
 #world_popup {
@@ -1619,10 +1600,6 @@ input[type=search]:focus::-webkit-search-cancel-button {
     margin-left: 1rem;
 }
 
-#entry_edit_template {
-    display: none !important;
-}
-
 .world_entry:not(:last-child)::after {
     margin-top: 1rem;
     height: 1px;
@@ -1659,6 +1636,10 @@ input[type=search]:focus::-webkit-search-cancel-button {
     cursor: pointer;
 }
 
+#form_world_import {
+    display: none;
+}
+
 #form_rename_world input:not(:last-child) {
     margin-right: 10px;
 }
@@ -3471,8 +3452,9 @@ toolcool-color-picker {
 }
 
 .openai_logit_bias_preset_form .menu_button,
-.openai_preset_buttons .menu_button {
-    padding: 7px;
+.openai_preset_buttons .menu_button,
+.world_info_select_block .menu_button {
+    padding: 8px;
 }
 
 .openai_logit_bias_list:empty::before {