diff --git a/scripts/js/footer.js b/scripts/js/footer.js
index b392ae96..b195fc21 100644
--- a/scripts/js/footer.js
+++ b/scripts/js/footer.js
@@ -684,7 +684,7 @@ function applyExpertSettings() {
   if (localStorage.getItem("expert_settings") === "true") {
     for (const element of expertSettingsNodes) element.classList.remove("d-none");
   } else {
-    for (const element of expertSettingsNodes) element.classList.add("d-none");
+    for (const element of expertSettingsNodes) element.classList.toggle("d-none", true);
 
     // If we left with an empty page (no visible boxes) after switching from
     // Expert to Basic settings, redirect to admin/settings/system instead
diff --git a/scripts/lua/sidebar.lp b/scripts/lua/sidebar.lp
index 312b9669..2820c6cf 100644
--- a/scripts/lua/sidebar.lp
+++ b/scripts/lua/sidebar.lp
@@ -175,7 +175,7 @@
                                 <i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
                             </a>
                         </li>
-                        <li class="settings-level-expert<? if scriptname == 'settings/all' then ?> active<? end ?>">
+                        <li class="settings-level-expert d-none<? if scriptname == 'settings/all' then ?> active<? end ?>">
                             <a href="<?=webhome?>settings/all">
                                 <i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>All settings</span>
                             </a>
diff --git a/settings-all.lp b/settings-all.lp
index f758b761..d8c8482f 100644
--- a/settings-all.lp
+++ b/settings-all.lp
@@ -13,7 +13,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 PageTitle = "All Settings"
 mg.include('scripts/lua/settings_header.lp','r')
 ?>
-<div class="row settings-level-expert" id="advanced-content">
+<div class="row settings-level-expert d-none" id="advanced-content">
     <div class="overlay" id="advanced-overlay">
         <i class="fa fa-sync fa-spin"></i>
     </div>
@@ -28,7 +28,7 @@ mg.include('scripts/lua/settings_header.lp','r')
         <!-- dynamically filled with content -->
     </div>
 
-    <div class="col-sm-12 settings-level-expert save-button-container">
+    <div class="col-sm-12 settings-level-expert d-none save-button-container">
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
diff --git a/settings-api.lp b/settings-api.lp
index 1f67a938..1c8af31b 100644
--- a/settings-api.lp
+++ b/settings-api.lp
@@ -49,7 +49,7 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>
 
-    <div class="col-md-6 settings-level-expert">
+    <div class="col-md-6 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="webserver.api.prettyJSON webserver.api.allow_destructive">Advanced Settings</h3>
@@ -82,7 +82,7 @@ mg.include('scripts/lua/settings_header.lp','r')
 </div>
 
 <div class="row">
-        <div class="col-md-12 settings-level-expert">
+    <div class="col-md-12 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="webserver.api.excludeDomains webserver.api.excludeClients">Exclusions</h3>
@@ -134,7 +134,7 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>-->
 
-    <div class="col-md-12 settings-level-expert">
+    <div class="col-md-12 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title">Currently active sessions</h3>
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 470e24ea..4bfa083c 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -86,7 +86,7 @@ mg.include('scripts/lua/settings_header.lp','r')
             </div>
         </div>
     </div>
-    <div class="col-md-6 settings-level-expert">
+    <div class="col-md-6 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="dhcp.leaseTime dhcp.rapidCommit dhcp.multiDNS">Advanced DHCP Settings</h3>
@@ -165,7 +165,7 @@ mg.include('scripts/lua/settings_header.lp','r')
             </div>
         </div>
     </div>
-    <div class="col-md-12 settings-level-expert">
+    <div class="col-md-12 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="dhcp.hosts">Static DHCP configuration</h3>
diff --git a/settings-dns.lp b/settings-dns.lp
index ad3cc7f5..bd3f8b44 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -57,7 +57,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                 </div>
             </div>
         </div>
-        <div class="box box-warning settings-level-expert">
+        <div class="box box-warning settings-level-expert d-none">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="dns.domain dns.expandHosts">DNS domain settings</h3>
             </div>
@@ -81,7 +81,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                 </div>
             </div>
         </div>
-        <div class="box box-warning settings-level-expert">
+        <div class="box box-warning settings-level-expert d-none">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="dns.rateLimit.count dns.rateLimit.interval">Rate-limiting</h3>
             </div>
@@ -106,7 +106,7 @@ mg.include('scripts/lua/settings_header.lp','r')
             </div>
         </div>
     </div>
-    <div class="col-lg-6 settings-level-expert">
+    <div class="col-lg-6 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h1 class="box-title" data-configkeys="dns.listeningMode">Interface settings</h1>
@@ -197,7 +197,7 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>
     <div class="col-lg-12">
-        <div class="box box-warning settings-level-expert">
+        <div class="box box-warning settings-level-expert d-none">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="dns.revServers">Conditional forwarding</h3>
             </div>
diff --git a/settings-privacy.lp b/settings-privacy.lp
index d59d6d17..2f905c52 100644
--- a/settings-privacy.lp
+++ b/settings-privacy.lp
@@ -34,7 +34,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                     </div>
                 </div>
             </div>
-            <div class="col-md-12 settings-level-expert">
+            <div class="col-md-12 settings-level-expert d-none">
                 <div class="box box-warning">
                     <div class="box-header with-border">
                         <h3 class="box-title" data-configkeys="database.DBimport database.maxDBdays database.network.expire">Privacy-related database settings</h3>
@@ -64,7 +64,7 @@ mg.include('scripts/lua/settings_header.lp','r')
             </div>
         </div>
     </div>
-    <div class="col-md-6 settings-level-expert">
+    <div class="col-md-6 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title" data-configkeys="misc.privacylevel">Query Anonymization ("Privacy Level")</h3>
diff --git a/settings-system.lp b/settings-system.lp
index 1e6eb27f..a2733e81 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -74,7 +74,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                 <i class="fa fa-sync fa-spin"></i>
             </div>
         </div>
-        <div class="box settings-level-expert">
+        <div class="box settings-level-expert d-none">
             <div class="box-header with-border">
                 <h3 class="box-title">DHCP server metrics</h3>
             </div>
@@ -150,7 +150,7 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>
     <div class="col-md-6">
-        <div class="box settings-level-expert" id="cache-metrics">
+        <div class="box settings-level-expert d-none" id="cache-metrics">
             <div class="box-header with-border">
                 <h3 class="box-title">DNS cache metrics</h3>
             </div>
@@ -185,7 +185,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                                 </tr>
                             </tbody>
                         </table>
-<!--                    <table class="table table-striped table-bordered nowrap settings-level-expert">
+<!--                    <table class="table table-striped table-bordered nowrap settings-level-expert d-none">
                             <tbody id="dns-cache-table">
                             </tbody>
                         </table> -->
@@ -230,7 +230,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                                     <th scope="row">Unanswered queries:</th>
                                     <td id="sysinfo-dns-replies-unanswered">&nbsp;</td>
                                 </tr>
-                                <tr class="settings-level-expert">
+                                <tr class="settings-level-expert d-none">
                                     <th scope="row">Authoritative replies:</th>
                                     <td id="sysinfo-dns-replies-auth">&nbsp;</td>
                                 </tr>
@@ -244,7 +244,7 @@ mg.include('scripts/lua/settings_header.lp','r')
             </div>
         </div>
     </div>
-    <div class="col-md-12 settings-level-expert">
+    <div class="col-md-12 settings-level-expert d-none">
         <div class="box box-warning">
             <div class="box-header with-border">
                 <h3 class="box-title">Actions</h3>
@@ -260,7 +260,7 @@ mg.include('scripts/lua/settings_header.lp','r')
                     <div class="col-xs-12 col-md-6 col-lg-3">
                         <button type="button" class="btn btn-danger confirm-flusharp btn-block button-pad destructive_action" disabled>Flush network table</button>
                     </div>
-                    <div class="col-xs-12 col-md-6 col-lg-3 settings-level-expert">
+                    <div class="col-xs-12 col-md-6 col-lg-3 settings-level-expert d-none">
                         <button type="button" class="btn btn-danger confirm-flushlogs btn-block button-pad destructive_action" disabled>Flush logs (last 24 hours)</button>
                     </div>
                 </div>