diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/pi-hole/js/settings-advanced.js
index 04970aed..7e062f27 100644
--- a/scripts/pi-hole/js/settings-advanced.js
+++ b/scripts/pi-hole/js/settings-advanced.js
@@ -272,7 +272,7 @@ function generateRow(topic, key, value) {
   // else: we have a setting we can display
   var box =
     '<div class="box settings-box">' +
-    '<div class="box-header">' +
+    '<div class="box-header with-border">' +
     '<h3 class="box-title" data-key="' +
     key +
     '" data-modified="' +
@@ -299,41 +299,38 @@ function createDynamicConfigTabs() {
     url: "/api/config?detailed=true",
   })
     .done(function (data) {
-      // Create the content for the advanced dynamic config topics
+      // Create the tabs for the advanced dynamic config topics
       Object.keys(data.topics).forEach(function (n) {
         var topic = data.topics[n];
-        $("#advanced-content").append(
-          '<div class="col-lg-12" id="advanced-content-' +
-            topic.name +
-            '">' +
-            '<div class="box box-success">' +
-            '<div class="box-header with-border no-user-select">' +
-            '<h3 class="box-title">' +
-            topic.description +
-            " (<code>" +
-            topic.name +
-            "</code>)" +
-            "</h3>" +
-            "</div>" +
-            '<div class="box-body">' +
-            '<div class="row" id="advanced-content-' +
-            topic.name +
-            '-body">' +
-            '<div class="col-xs-12 settings-container" id="advanced-content-' +
-            topic.name +
-            '-flex"></div>' +
-            "</div>" +
-            "</div>" +
-            "</div>" +
-            "</div>"
-        );
+
+        $("#advanced-settings-tabs").append(`
+          <div id="advanced-content-${topic.name}" role="tabpanel" class="tab-pane fade">
+            <h3 class="page-header">${topic.description} (<code>${topic.name}</code>)</h3>
+            <div class="row" id="advanced-content-${topic.name}-body">
+              <div class="col-xs-12 settings-container" id="advanced-content-${topic.name}-flex"></div>
+            </div>
+          </div>
+        `);
+
+        // Dynamically create the settings menu
+        $("#advanced-settings-menu ul").append(`
+          <li role="presentation">
+            <a href="#advanced-content-${topic.name}" aria-controls="advanced-content-${topic.name}" role="pill" data-toggle="pill">${topic.description}</a>
+          </li>
+        `);
       });
+
+      // Dynamically fill the tabs with config topics
       Object.keys(data.config).forEach(function (topic) {
         var value = data.config[topic];
         generateRow(topic, topic, value, data);
       });
       $("#advanced-overlay").hide();
 
+      // Select the first tab and show the content
+      $("#advanced-settings-menu ul li:first-child").addClass("active");
+      $("#advanced-settings-tabs > div:first-child").addClass("active in");
+
       $("button[id='save']").on("click", function () {
         saveSettings();
       });
diff --git a/settings-all.lp b/settings-all.lp
index f7253619..40c49f6b 100644
--- a/settings-all.lp
+++ b/settings-all.lp
@@ -14,11 +14,21 @@ PageTitle = "All Settings"
 mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row settings-level-expert" id="advanced-content">
-    <!-- dynamically filled with content -->
     <div class="overlay" id="advanced-overlay">
         <i class="fa fa-sync fa-spin"></i>
     </div>
-    <div class="col-lg-12 settings-level-expert save-button-container">
+
+    <div class="col-sm-12" id="advanced-settings-menu">
+        <ul class="nav nav-pills" role="tablist">
+            <!-- dynamically filled with content -->
+        </ul>
+    </div>
+
+    <div class="col-sm-12 tab-content" id="advanced-settings-tabs">
+        <!-- dynamically filled with content -->
+    </div>
+
+    <div class="col-sm-12 settings-level-expert 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/style/pi-hole.css b/style/pi-hole.css
index 748375d6..2b4bdb08 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -1150,6 +1150,8 @@ table.dataTable tbody > tr > .selected {
 .settings-container > .box {
   margin: 0;
   width: calc((100% - (var(--gap) * (var(--columns) - 1))) / var(--columns));
+  border: none;
+  box-shadow: 0 0 1px rgba(0, 0, 0, 0.1);
 }
 .settings-box .control-label small {
   font-weight: normal;