diff --git a/public/index.html b/public/index.html
index 5013d0ced..9b9c30ca2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1672,16 +1672,17 @@
                             <div class="fa-solid checked  fa-lock" alt=""></div>
                         </label>
                     </div>
-                    <div class="hotswap flex-container justifyCenter">
-                    </div>
                     <div id="right-nav-panel-tabs">
                         <div class="right_menu_button fa-solid fa-list-ul" id="rm_button_characters" title="Select/Create Characters"></div>
-                        <div class="right_menu_button" id="rm_button_selected_ch">
+                        <div id="rm_button_selected_ch">
                             <h2></h2>
                         </div>
                     </div>
                 </div>
 
+                <div class="hotswap flex-container justifyCenter">
+                </div>
+
                 <div name="Solo Char Create/Edit Panel" id="rm_ch_create_block" class="right_menu flex-container flexFlowColumn" style="display: none;">
                     <form id="form_create" action="javascript:void(null);" method="post" enctype="multipart/form-data">
 
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 3f080d69a..9c8e5ba2b 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -274,7 +274,7 @@ async function RA_autoloadchat() {
 
 export async function favsToHotswap() {
     const selector = ['#rm_print_characters_block .character_select', '#rm_print_characters_block .group_select'].join(',');
-    const container = $('#rm_PinAndTabs .hotswap');
+    const container = $('#right-nav-panel .hotswap');
     const template = $('#hotswap_template .hotswapAvatar');
     container.empty();
     const maxCount = 6;
diff --git a/public/scripts/bookmarks.js b/public/scripts/bookmarks.js
index 95a69ac97..df8c41014 100644
--- a/public/scripts/bookmarks.js
+++ b/public/scripts/bookmarks.js
@@ -171,7 +171,7 @@ async function convertSoloToGroupChat() {
     const character = characters[this_chid];
 
     // Populate group required fields
-    const name = getUniqueName(`Chat with ${character.name}`, y => groups.findIndex(x => x.name === y) !== -1);
+    const name = getUniqueName(`Group: ${character.name}`, y => groups.findIndex(x => x.name === y) !== -1);
     const avatar = getThumbnailUrl('avatar', character.avatar);
     const chatName = humanizedDateTime();
     const chats = [chatName];
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index 4a0b05b4a..d5b7de039 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -1066,7 +1066,7 @@ async function createGroup() {
     const memberNames = characters.filter(x => members.includes(x.avatar)).map(x => x.name).join(", ");
 
     if (!name) {
-        name = `Chat with ${memberNames}`;
+        name = `Group: ${memberNames}`;
     }
 
     // placeholder
diff --git a/public/style.css b/public/style.css
index 0bc463af3..e85861844 100644
--- a/public/style.css
+++ b/public/style.css
@@ -562,10 +562,6 @@ code {
 
 }
 
-.hotswap {
-    top: -5px;
-}
-
 .hotswapAvatar,
 .hotswapAvatar .avatar {
     width: 50px !important;
@@ -814,18 +810,21 @@ input[type="file"] {
 }
 
 #right-nav-panel-tabs {
-    margin-top: 5px;
-    margin-bottom: 10px;
-    margin-left: 5px;
-    margin-right: 5px;
-    width: 100%;
-    max-height: 30px;
     display: flex;
     align-items: center;
-    padding: 0 5px;
+    flex: 1;
+    gap: 10px;
+    overflow: hidden;
 }
 
-#right-nav-panel-tabs .right_menu_button:last-of-type {
+#rm_PinAndTabs {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10px;
+}
+
+#right-nav-panel-tabs .right_menu_button {
     padding-right: 0;
 }
 
@@ -911,10 +910,12 @@ input[type="file"] {
 }
 
 #rm_button_selected_ch h2 {
+    cursor: pointer;
     text-overflow: ellipsis;
     overflow: hidden;
     text-align: left;
     white-space: nowrap;
+    margin: 0;
 }
 
 .selected-right-tab {