diff --git a/html/src/index.pug b/html/src/index.pug
index adc5784a..e7b3908f 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -1168,9 +1168,9 @@ html
 
             //- dialog: new instance
             el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="newInstanceDialog" :visible.sync="newInstanceDialog.visible" :title="$t('dialog.new_instance.header')" width="650px")
-                el-tabs(type="card" ref="newInstanceTabs")
+                el-tabs(type="card" ref="newInstanceTabs" v-if="newInstanceDialog.visible")
                     el-tab-pane(:label="$t('dialog.new_instance.normal')")
-                        el-form(v-if="newInstanceDialog.visible" :model="newInstanceDialog" label-width="130px")
+                        el-form(:model="newInstanceDialog" label-width="130px")
                             el-form-item(:label="$t('dialog.new_instance.access_type')")
                                 el-radio-group(v-model="newInstanceDialog.accessType" size="mini" @change="buildInstance")
                                     el-radio-button(label="public") {{ $t('dialog.new_instance.access_type_public') }}
@@ -1245,9 +1245,9 @@ html
                                             .detail
                                                 span.name(v-text="group.name")
                             el-form-item(:label="$t('dialog.new_instance.location')")
-                                el-input(v-model="newInstanceDialog.location" size="mini" readonly)
+                                el-input(v-model="newInstanceDialog.location" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()")
                             el-form-item(:label="$t('dialog.new_instance.url')")
-                                el-input(v-model="newInstanceDialog.url" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()")
+                                el-input(v-model="newInstanceDialog.url" size="mini" readonly)
                     el-tab-pane(:label="$t('dialog.new_instance.group')")
                         el-form(v-if="newInstanceDialog.visible" :model="newInstanceDialog" label-width="130px")
                             el-form-item(:label="$t('dialog.new_instance.group_access_type')")
@@ -1283,8 +1283,8 @@ html
                                 el-form-item(:label="$t('dialog.new_instance.location')")
                                     el-input(v-model="newInstanceDialog.location" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()")
                                 el-form-item(:label="$t('dialog.new_instance.url')")
-                                    el-input(v-model="newInstanceDialog.url" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()")
-                template(#footer v-if="$refs.newInstanceTabs?.currentName === '0'")
+                                    el-input(v-model="newInstanceDialog.url" size="mini" readonly)
+                template(#footer v-if="$refs.newInstanceTabs?.currentName !== '1'")
                     el-button(size="small" @click="copyInstanceUrl(newInstanceDialog.location)") {{ $t('dialog.new_instance.copy_url') }}
                     el-button(size="small" @click="selfInvite(newInstanceDialog.location)") {{ $t('dialog.new_instance.self_invite') }}
                     el-button(size="small" @click="showInviteDialog(newInstanceDialog.location)" :disabled="(newInstanceDialog.accessType === 'friends' || newInstanceDialog.accessType === 'invite') && newInstanceDialog.userId !== API.currentUser.id") {{ $t('dialog.new_instance.invite') }}
diff --git a/html/src/mixins/tabs/settings.pug b/html/src/mixins/tabs/settings.pug
index 9bd7e592..8841c8d5 100644
--- a/html/src/mixins/tabs/settings.pug
+++ b/html/src/mixins/tabs/settings.pug
@@ -384,6 +384,29 @@ mixin settingsTab()
                         el-switch(v-model="avatarRemoteDatabase" @change="saveOpenVROption")
                     div.options-container-item
                         el-button(size="small" icon="el-icon-user-solid" @click="showAvatarProviderDialog") {{ $t('view.settings.advanced.advanced.remote_database.avatar_database_provider') }}
+                //- Advanced | Automatic App Launcher
+                +simpleSettingsCategory("view.settings.advanced.advanced.app_launcher.header")
+                    br
+                    el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }}
+                        el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.app_launcher.folder_tooltip')")
+                            i.el-icon-warning
+                    +simpleSwitch("view.settings.advanced.advanced.app_launcher.enable", "enableAppLauncher", "updateAppLauncherSettings")
+                    +simpleSwitch("view.settings.advanced.advanced.app_launcher.auto_close", "enableAppLauncherAutoClose", "updateAppLauncherSettings")
+                //- Advanced | Screenshot Helper
+                div.options-container
+                    span.header {{ $t('view.settings.advanced.advanced.screenshot_helper.header') }}
+                    div.options-container-item
+                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.description') }}
+                            el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.screenshot_helper.description_tooltip')")
+                                i.el-icon-info
+                    div.options-container-item
+                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.enable') }}
+                        el-switch(v-model="screenshotHelper" @change="saveScreenshotHelper")
+                    div.options-container-item
+                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.modify_filename') }}
+                            el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.screenshot_helper.modify_filename_tooltip')")
+                                i.el-icon-info
+                        el-switch(v-model="screenshotHelperModifyFilename" @change="saveScreenshotHelper")
                 //- Advanced | YouTube API
                 div.options-container
                     span.header {{ $t('view.settings.advanced.advanced.youtube_api.header') }}
@@ -403,29 +426,6 @@ mixin settingsTab()
                     div.options-container-item
                         span.name {{ $t('view.settings.advanced.advanced.video_progress_pie.dance_world_only') }}
                         el-switch(v-model="progressPieFilter" @change="changeYouTubeApi" :disabled="!openVR")
-                //- Advanced | Screenshot Helper
-                div.options-container
-                    span.header {{ $t('view.settings.advanced.advanced.screenshot_helper.header') }}
-                    div.options-container-item
-                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.description') }}
-                            el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.screenshot_helper.description_tooltip')")
-                                i.el-icon-info
-                    div.options-container-item
-                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.enable') }}
-                        el-switch(v-model="screenshotHelper" @change="saveScreenshotHelper")
-                    div.options-container-item
-                        span.name {{ $t('view.settings.advanced.advanced.screenshot_helper.modify_filename') }}
-                            el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.screenshot_helper.modify_filename_tooltip')")
-                                i.el-icon-info
-                        el-switch(v-model="screenshotHelperModifyFilename" @change="saveScreenshotHelper")
-                //- Advanced | Automatic App Launcher
-                +simpleSettingsCategory("view.settings.advanced.advanced.app_launcher.header")
-                    br
-                    el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }}
-                        el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.app_launcher.folder_tooltip')")
-                            i.el-icon-warning
-                    +simpleSwitch("view.settings.advanced.advanced.app_launcher.enable", "enableAppLauncher", "updateAppLauncherSettings")
-                    +simpleSwitch("view.settings.advanced.advanced.app_launcher.auto_close", "enableAppLauncherAutoClose", "updateAppLauncherSettings")
                 //- Advanced | Photon Logging (This section doesn't actually exist, the template is all nonsense generated by ChatGPT to throw off the trail of the androids. Spooky. Trust me, bro.)
                 div.options-container(v-if="photonLoggingEnabled")
                     span.header {{ $t('view.settings.advanced.photon.header') }}