diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/pi-hole/js/settings-advanced.js
index b110c972..44e0a31a 100644
--- a/scripts/pi-hole/js/settings-advanced.js
+++ b/scripts/pi-hole/js/settings-advanced.js
@@ -104,6 +104,7 @@ function valueDetails(key, value) {
 
     case "boolean": {
       content +=
+        '<div class="col-sm-12">' +
         '<div><input type="checkbox" ' +
         (value.value ? " checked" : "") +
         ' id="' +
@@ -116,7 +117,7 @@ function valueDetails(key, value) {
         key +
         '-checkbox">Enabled ' +
         defaultValueHint +
-        "</label>" +
+        "</label></div>" +
         " </div>";
 
       break;
@@ -262,7 +263,7 @@ function valueDetails(key, value) {
     }
   }
 
-  return content;
+  return '<div class="form-group row">' + content + "</div>";
 }
 
 function generateRow(topic, key, value) {
@@ -292,9 +293,8 @@ function generateRow(topic, key, value) {
     "</p>" +
     "</div>" +
     '<div class="box-body">' +
-    '<div class="form-group">' +
     valueDetails(key, value) +
-    "</div></div></div> ";
+    "</div></div> ";
 
   var topKey = key.split(".")[0];
   var elem = $("#advanced-content-" + topKey + "-flex");