diff --git a/muxplex/frontend/index.html b/muxplex/frontend/index.html
index 7334556..88cedad 100644
--- a/muxplex/frontend/index.html
+++ b/muxplex/frontend/index.html
@@ -87,12 +87,15 @@
       <nav class="settings-tabs">
         <button class="settings-tab settings-tab--active" data-tab="display">Display</button>
         <button class="settings-tab" data-tab="sessions">Sessions</button>
-        <button class="settings-tab" data-tab="notifications">Notifications</button>
         <button class="settings-tab" data-tab="new-session">Commands</button>
         <button class="settings-tab" data-tab="devices">Multi-Device</button>
       </nav>
       <div class="settings-content">
         <div class="settings-panel" data-tab="display">
+          <div class="settings-field">
+            <label class="settings-label" for="setting-device-name">Device Name</label>
+            <input type="text" id="setting-device-name" class="settings-input" placeholder="This device" />
+          </div>
           <div class="settings-field">
             <label class="settings-label" for="setting-font-size">Font Size</label>
             <select id="setting-font-size" class="settings-select">
@@ -164,12 +167,6 @@
             <label class="settings-label" for="setting-auto-open">Auto-open created sessions</label>
             <input type="checkbox" id="setting-auto-open" class="settings-checkbox" checked />
           </div>
-          <div class="settings-field settings-field--column">
-            <label class="settings-label">Hidden Sessions</label>
-            <div id="setting-hidden-sessions" class="settings-checkbox-list"></div>
-          </div>
-        </div>
-        <div class="settings-panel hidden" data-tab="notifications">
           <div class="settings-field">
             <label class="settings-label" for="setting-bell-sound">Bell Sound</label>
             <input type="checkbox" id="setting-bell-sound" class="settings-checkbox" />
@@ -181,6 +178,10 @@
               <button id="notification-request-btn" class="settings-action-btn">Request Permission</button>
             </div>
           </div>
+          <div class="settings-field settings-field--column">
+            <label class="settings-label">Hidden Sessions</label>
+            <div id="setting-hidden-sessions" class="settings-checkbox-list"></div>
+          </div>
         </div>
         <div class="settings-panel hidden" data-tab="new-session">
           <div class="settings-field settings-field--column">
@@ -197,10 +198,6 @@
           </div>
         </div>
         <div class="settings-panel hidden" data-tab="devices">
-          <div class="settings-field">
-            <label class="settings-label" for="setting-device-name">Device Name</label>
-            <input type="text" id="setting-device-name" class="settings-input" placeholder="This device" />
-          </div>
           <div class="settings-field">
             <label class="settings-label" for="setting-multi-device-enabled">Enable multi-device support</label>
             <input type="checkbox" id="setting-multi-device-enabled" class="settings-checkbox" />
@@ -214,13 +211,6 @@
                 <option value="filtered">Filtered</option>
               </select>
             </div>
-            <div class="settings-field">
-              <label class="settings-label" for="setting-view-scope">View Scope</label>
-              <select id="setting-view-scope" class="settings-select">
-                <option value="all">All Instances</option>
-                <option value="local">Local Only</option>
-              </select>
-            </div>
             <div class="settings-field settings-field--column">
               <label class="settings-label">Federation Key</label>
               <div class="settings-federation-key">