diff --git a/settings.php b/settings.php
index 51df6e0a..f6f41dbc 100644
--- a/settings.php
+++ b/settings.php
@@ -80,6 +80,41 @@ if (isset($_POST["submit"])) {
     </div>
 <?php } ?>
 
+
+<?php
+// Networking
+if (isset($setupVars["PIHOLE_INTERFACE"])) {
+    $piHoleInterface = $setupVars["PIHOLE_INTERFACE"];
+} else {
+    $piHoleInterface = "unknown";
+}
+if (isset($setupVars["IPV4_ADDRESS"])) {
+    $piHoleIPv4 = $setupVars["IPV4_ADDRESS"];
+} else {
+    $piHoleIPv4 = "unknown";
+}
+$IPv6connectivity = false;
+if (isset($setupVars["IPV6_ADDRESS"])) {
+    $piHoleIPv6 = $setupVars["IPV6_ADDRESS"];
+    sscanf($piHoleIPv6, "%2[0-9a-f]", $hexstr);
+    if (strlen($hexstr) == 2) {
+        // Convert HEX string to number
+        $hex = hexdec($hexstr);
+        // Global Unicast Address (2000::/3, RFC 4291)
+        $GUA = (($hex & 0x70) === 0x20);
+        // Unique Local Address   (fc00::/7, RFC 4193)
+        $ULA = (($hex & 0xfe) === 0xfc);
+        if ($GUA || $ULA) {
+            // Scope global address detected
+            $IPv6connectivity = true;
+        }
+    }
+} else {
+    $piHoleIPv6 = "unknown";
+}
+$hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
+?>
+
 <div class="row justify-content-md-center">
     <div class="col-md-12">
         <div class="nav-tabs-custom">
@@ -172,7 +207,7 @@ if (isset($_POST["submit"])) {
                                         </div>
                                         <div class="row">
                                             <div class="col-xs-12">
-                                            <label>Range of IP addresses to hand out</label>
+                                                <label>Range of IP addresses to hand out</label>
                                             </div>
                                             <div class="col-xs-6">
                                                 <div class="form-group">
@@ -493,184 +528,204 @@ if (isset($_POST["submit"])) {
                         $DNSinterface = "single";
                     }
                     ?>
+                    <form role="form" method="post">
                     <div class="row">
-                        <form role="form" method="post">
-                            <div class="col-lg-6">
-                                <label>Upstream DNS Servers</label>
-                                <table class="table table-bordered">
-                                    <tr>
-                                        <th colspan="2">IPv4</th>
-                                        <th colspan="2">IPv6</th>
-                                        <th>Name</th>
-                                    </tr>
-                                    <?php foreach ($DNSserverslist as $key => $value) { ?>
-                                        <tr>
-                                            <?php if (isset($value["v4_1"])) { ?>
-                                            <td title="<?php echo $value["v4_1"]; ?>"><input type="checkbox"
-                                                                                             name="DNSserver<?php echo $value["v4_1"]; ?>"
-                                                                                             value="true"
-                                                                                             <?php if (in_array($value["v4_1"], $DNSactive)){ ?>checked<?php } ?> >
-                                                </td><?php } else { ?>
-                                                <td></td><?php } ?>
-                                            <?php if (isset($value["v4_2"])) { ?>
-                                            <td title="<?php echo $value["v4_2"]; ?>"><input type="checkbox"
-                                                                                             name="DNSserver<?php echo $value["v4_2"]; ?>"
-                                                                                             value="true"
-                                                                                             <?php if (in_array($value["v4_2"], $DNSactive)){ ?>checked<?php } ?> >
-                                                </td><?php } else { ?>
-                                                <td></td><?php } ?>
-                                            <?php if (isset($value["v6_1"])) { ?>
-                                            <td title="<?php echo $value["v6_1"]; ?>"><input type="checkbox"
-                                                                                             name="DNSserver<?php echo $value["v6_1"]; ?>"
-                                                                                             value="true"
-                                                                                             <?php if (in_array($value["v6_1"], $DNSactive) && $IPv6connectivity){ ?>checked<?php }
-                                                if (!$IPv6connectivity) { ?> disabled <?php } ?> >
-                                                </td><?php } else { ?>
-                                                <td></td><?php } ?>
-                                            <?php if (isset($value["v6_2"])) { ?>
-                                            <td title="<?php echo $value["v6_2"]; ?>"><input type="checkbox"
-                                                                                             name="DNSserver<?php echo $value["v6_2"]; ?>"
-                                                                                             value="true"
-                                                                                             <?php if (in_array($value["v6_2"], $DNSactive) && $IPv6connectivity){ ?>checked<?php }
-                                                if (!$IPv6connectivity) { ?> disabled <?php } ?> >
-                                                </td><?php } else { ?>
-                                                <td></td><?php } ?>
-                                            <td><?php echo $key; ?></td>
-                                        </tr>
-                                    <?php } ?>
-                                </table>
-                            </div>
-                            <div class="col-lg-6">
-                                <label>&nbsp;</label>
-                                <div class="form-group">
-                                    <label>Custom 1 (IPv4)</label>
-                                    <div class="input-group">
-                                        <div class="input-group-addon"><input type="checkbox" name="custom1"
-                                                                              value="Customv4"
-                                                                              <?php if (isset($custom1)){ ?>checked<?php } ?>>
-                                        </div>
-                                        <input type="text" name="custom1val" class="form-control"
-                                               data-inputmask="'alias': 'ip'" data-mask
-                                               <?php if (isset($custom1)){ ?>value="<?php echo $custom1; ?>"<?php } ?>>
-                                    </div>
-                                    <label>Custom 2 (IPv4)</label>
-                                    <div class="input-group">
-                                        <div class="input-group-addon"><input type="checkbox" name="custom2"
-                                                                              value="Customv4"
-                                                                              <?php if (isset($custom2)){ ?>checked<?php } ?>>
-                                        </div>
-                                        <input type="text" name="custom2val" class="form-control"
-                                               data-inputmask="'alias': 'ip'" data-mask
-                                               <?php if (isset($custom2)){ ?>value="<?php echo $custom2; ?>"<?php } ?>>
-                                    </div>
-                                    <label>Custom 3 (IPv6)</label>
-                                    <div class="input-group">
-                                        <div class="input-group-addon"><input type="checkbox" name="custom3"
-                                                                              value="Customv6"
-                                                                              <?php if (isset($custom3)){ ?>checked<?php } ?>>
-                                        </div>
-                                        <input type="text" name="custom3val" class="form-control"
-                                               data-inputmask="'alias': 'ipv6'" data-mask
-                                               <?php if (isset($custom3)){ ?>value="<?php echo $custom3; ?>"<?php } ?>>
-                                    </div>
-                                    <label>Custom 4 (IPv6)</label>
-                                    <div class="input-group">
-                                        <div class="input-group-addon"><input type="checkbox" name="custom4"
-                                                                              value="Customv6"
-                                                                              <?php if (isset($custom4)){ ?>checked<?php } ?>>
-                                        </div>
-                                        <input type="text" name="custom4val" class="form-control"
-                                               data-inputmask="'alias': 'ipv6'" data-mask
-                                               <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-12">
-                                <div class="box box-warning collapsed-box">
-                                    <div class="box-header with-border">
-                                        <h3 class="box-title">Advanced DNS settings</h3>
-                                        <div class="box-tools pull-right">
-                                            <button type="button" class="btn btn-box-tool"
-                                                    data-widget="collapse"><i
-                                                        class="fa fa-plus"></i></button>
-                                        </div>
+
+
+                            <div class="col-md-6">
+                                <div class="box">
+                                    <div class="box-header">
+                                        <h1 class="box-title">Upstream DNS Servers</h1>
                                     </div>
                                     <div class="box-body">
-                                        <div class="col-lg-12">
-                                            <div class="form-group">
-                                                <div class="checkbox"><label><input type="checkbox"
-                                                                                    name="DNSrequiresFQDN"
-                                                                                    <?php if ($DNSrequiresFQDN){ ?>checked<?php } ?>
-                                                                                    title="domain-needed"> never
-                                                        forward
-                                                        non-FQDNs</label></div>
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <table class="table table-bordered">
+                                                    <tr>
+                                                        <th colspan="2">IPv4</th>
+                                                        <th colspan="2">IPv6</th>
+                                                        <th>Name</th>
+                                                    </tr>
+                                                    <?php foreach ($DNSserverslist as $key => $value) { ?>
+                                                        <tr>
+                                                            <?php if (isset($value["v4_1"])) { ?>
+                                                            <td title="<?php echo $value["v4_1"]; ?>"><input
+                                                                        type="checkbox"
+                                                                        name="DNSserver<?php echo $value["v4_1"]; ?>"
+                                                                        value="true"
+                                                                        <?php if (in_array($value["v4_1"], $DNSactive)){ ?>checked<?php } ?> >
+                                                                </td><?php } else { ?>
+                                                                <td></td><?php } ?>
+                                                            <?php if (isset($value["v4_2"])) { ?>
+                                                            <td title="<?php echo $value["v4_2"]; ?>"><input
+                                                                        type="checkbox"
+                                                                        name="DNSserver<?php echo $value["v4_2"]; ?>"
+                                                                        value="true"
+                                                                        <?php if (in_array($value["v4_2"], $DNSactive)){ ?>checked<?php } ?> >
+                                                                </td><?php } else { ?>
+                                                                <td></td><?php } ?>
+                                                            <?php if (isset($value["v6_1"])) { ?>
+                                                            <td title="<?php echo $value["v6_1"]; ?>"><input
+                                                                        type="checkbox"
+                                                                        name="DNSserver<?php echo $value["v6_1"]; ?>"
+                                                                        value="true"
+                                                                        <?php if (in_array($value["v6_1"], $DNSactive) && $IPv6connectivity){ ?>checked<?php }
+                                                                if (!$IPv6connectivity) { ?> disabled <?php } ?> >
+                                                                </td><?php } else { ?>
+                                                                <td></td><?php } ?>
+                                                            <?php if (isset($value["v6_2"])) { ?>
+                                                            <td title="<?php echo $value["v6_2"]; ?>"><input
+                                                                        type="checkbox"
+                                                                        name="DNSserver<?php echo $value["v6_2"]; ?>"
+                                                                        value="true"
+                                                                        <?php if (in_array($value["v6_2"], $DNSactive) && $IPv6connectivity){ ?>checked<?php }
+                                                                if (!$IPv6connectivity) { ?> disabled <?php } ?> >
+                                                                </td><?php } else { ?>
+                                                                <td></td><?php } ?>
+                                                            <td><?php echo $key; ?></td>
+                                                        </tr>
+                                                    <?php } ?>
+                                                </table>
                                             </div>
-                                            <div class="form-group">
-                                                <div class="checkbox"><label><input type="checkbox"
-                                                                                    name="DNSbogusPriv"
-                                                                                    <?php if ($DNSbogusPriv){ ?>checked<?php } ?>
-                                                                                    title="bogus-priv"> never
-                                                        forward
-                                                        reverse lookups for private IP ranges</label></div>
-                                            </div>
-                                            <p>Note that enabling these two options may increase your privacy
-                                                slightly, but
-                                                may also prevent you from being able to access local hostnames
-                                                if the
-                                                Pi-hole is not used as DHCP server</p>
-                                            <div class="form-group">
-                                                <div class="checkbox"><label><input type="checkbox"
-                                                                                    name="DNSSEC"
-                                                                                    <?php if ($DNSSEC){ ?>checked<?php } ?>>
-                                                        Use DNSSEC</label></div>
-                                            </div>
-                                            <p>Validate DNS replies and cache DNSSEC data. When forwarding DNS
-                                                queries,
-                                                Pi-hole requests the DNSSEC records needed to validate the
-                                                replies. Use
-                                                Google or Norton DNS servers when activating DNSSEC. Note that
-                                                the size of
-                                                your log might increase significantly when enabling DNSSEC. A
-                                                DNSSEC
-                                                resolver test can be found <a
-                                                        href="http://dnssec.vs.uni-due.de/"
-                                                        target="_blank">here</a>.</p>
-
-                                            <div class="form-group">
-                                                <label>Interface listening behavior</label>
-                                                <div class="radio">
-                                                    <label><input type="radio" name="DNSinterface" value="local"
-                                                                  <?php if ($DNSinterface == "local"){ ?>checked<?php } ?> >Listen
-                                                        on all interfaces, but allow only queries from devices
-                                                        that are at
-                                                        most one hop away (local devices)</label>
-                                                </div>
-                                                <div class="radio">
-                                                    <label><input type="radio" name="DNSinterface"
-                                                                  value="single"
-                                                                  <?php if ($DNSinterface == "single"){ ?>checked<?php } ?> >Listen
-                                                        only on interface <?php echo $piHoleInterface; ?>
-                                                    </label>
-                                                </div>
-                                                <div class="radio">
-                                                    <label><input type="radio" name="DNSinterface" value="all"
-                                                                  <?php if ($DNSinterface == "all"){ ?>checked<?php } ?> >Listen
-                                                        on all interfaces, permit all origins (make sure your
-                                                        Pi-hole is
-                                                        firewalled!)</label>
+                                            <div class="col-lg-6">
+                                                <label>&nbsp;</label>
+                                                <div class="form-group">
+                                                    <label>Custom 1 (IPv4)</label>
+                                                    <div class="input-group">
+                                                        <div class="input-group-addon"><input type="checkbox"
+                                                                                              name="custom1"
+                                                                                              value="Customv4"
+                                                                                              <?php if (isset($custom1)){ ?>checked<?php } ?>>
+                                                        </div>
+                                                        <input type="text" name="custom1val" class="form-control"
+                                                               data-inputmask="'alias': 'ip'" data-mask
+                                                               <?php if (isset($custom1)){ ?>value="<?php echo $custom1; ?>"<?php } ?>>
+                                                    </div>
+                                                    <label>Custom 2 (IPv4)</label>
+                                                    <div class="input-group">
+                                                        <div class="input-group-addon"><input type="checkbox"
+                                                                                              name="custom2"
+                                                                                              value="Customv4"
+                                                                                              <?php if (isset($custom2)){ ?>checked<?php } ?>>
+                                                        </div>
+                                                        <input type="text" name="custom2val" class="form-control"
+                                                               data-inputmask="'alias': 'ip'" data-mask
+                                                               <?php if (isset($custom2)){ ?>value="<?php echo $custom2; ?>"<?php } ?>>
+                                                    </div>
+                                                    <label>Custom 3 (IPv6)</label>
+                                                    <div class="input-group">
+                                                        <div class="input-group-addon"><input type="checkbox"
+                                                                                              name="custom3"
+                                                                                              value="Customv6"
+                                                                                              <?php if (isset($custom3)){ ?>checked<?php } ?>>
+                                                        </div>
+                                                        <input type="text" name="custom3val" class="form-control"
+                                                               data-inputmask="'alias': 'ipv6'" data-mask
+                                                               <?php if (isset($custom3)){ ?>value="<?php echo $custom3; ?>"<?php } ?>>
+                                                    </div>
+                                                    <label>Custom 4 (IPv6)</label>
+                                                    <div class="input-group">
+                                                        <div class="input-group-addon"><input type="checkbox"
+                                                                                              name="custom4"
+                                                                                              value="Customv6"
+                                                                                              <?php if (isset($custom4)){ ?>checked<?php } ?>>
+                                                        </div>
+                                                        <input type="text" name="custom4val" class="form-control"
+                                                               data-inputmask="'alias': 'ipv6'" data-mask
+                                                               <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
+                                                    </div>
                                                 </div>
                                             </div>
-
                                         </div>
                                     </div>
                                 </div>
-                                <input type="hidden" name="field" value="DNS">
-                                <input type="hidden" name="token" value="<?php echo $token ?>">
-                                <button type="submit" class="btn btn-primary pull-right">Save</button>
                             </div>
                         </form>
+
                     </div>
+                    <div class="row">
+                        <div class="col-lg-12">
+                            <div class="box box-warning">
+                                <div class="box-header with-border">
+                                    <h3 class="box-title">Advanced DNS settings</h3>
+                                </div>
+                                <div class="box-body">
+                                    <div class="col-lg-12">
+                                        <div class="form-group">
+                                            <div class="checkbox"><label><input type="checkbox"
+                                                                                name="DNSrequiresFQDN"
+                                                                                <?php if ($DNSrequiresFQDN){ ?>checked<?php } ?>
+                                                                                title="domain-needed"> never
+                                                    forward
+                                                    non-FQDNs</label></div>
+                                        </div>
+                                        <div class="form-group">
+                                            <div class="checkbox"><label><input type="checkbox"
+                                                                                name="DNSbogusPriv"
+                                                                                <?php if ($DNSbogusPriv){ ?>checked<?php } ?>
+                                                                                title="bogus-priv"> never
+                                                    forward
+                                                    reverse lookups for private IP ranges</label></div>
+                                        </div>
+                                        <p>Note that enabling these two options may increase your privacy
+                                            slightly, but
+                                            may also prevent you from being able to access local hostnames
+                                            if the
+                                            Pi-hole is not used as DHCP server</p>
+                                        <div class="form-group">
+                                            <div class="checkbox"><label><input type="checkbox"
+                                                                                name="DNSSEC"
+                                                                                <?php if ($DNSSEC){ ?>checked<?php } ?>>
+                                                    Use DNSSEC</label></div>
+                                        </div>
+                                        <p>Validate DNS replies and cache DNSSEC data. When forwarding DNS
+                                            queries,
+                                            Pi-hole requests the DNSSEC records needed to validate the
+                                            replies. Use
+                                            Google or Norton DNS servers when activating DNSSEC. Note that
+                                            the size of
+                                            your log might increase significantly when enabling DNSSEC. A
+                                            DNSSEC
+                                            resolver test can be found <a
+                                                    href="http://dnssec.vs.uni-due.de/"
+                                                    target="_blank">here</a>.</p>
+
+                                        <div class="form-group">
+                                            <label>Interface listening behavior</label>
+                                            <div class="radio">
+                                                <label><input type="radio" name="DNSinterface" value="local"
+                                                              <?php if ($DNSinterface == "local"){ ?>checked<?php } ?> >Listen
+                                                    on all interfaces, but allow only queries from devices
+                                                    that are at
+                                                    most one hop away (local devices)</label>
+                                            </div>
+                                            <div class="radio">
+                                                <label><input type="radio" name="DNSinterface"
+                                                              value="single"
+                                                              <?php if ($DNSinterface == "single"){ ?>checked<?php } ?> >Listen
+                                                    only on interface <?php echo $piHoleInterface; ?>
+                                                </label>
+                                            </div>
+                                            <div class="radio">
+                                                <label><input type="radio" name="DNSinterface" value="all"
+                                                              <?php if ($DNSinterface == "all"){ ?>checked<?php } ?> >Listen
+                                                    on all interfaces, permit all origins (make sure your
+                                                    Pi-hole is
+                                                    firewalled!)</label>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                            <input type="hidden" name="field" value="DNS">
+                            <input type="hidden" name="token" value="<?php echo $token ?>">
+                            <button type="submit" class="btn btn-primary pull-right">Save</button>
+                        </div>
+                    </div>
+                    </form>
                 </div>
+
                 <div id="querylogging" class="tab-pane fade">
                     <?php
                     // Query logging
@@ -977,39 +1032,6 @@ Memory utilization: <?php print_r(get_FTL_data("%mem")); ?>%
                     </div>
                 </div>
                 <div id="sysadmin" class="tab-pane fade">
-                    <?php
-                    // Networking
-                    if (isset($setupVars["PIHOLE_INTERFACE"])) {
-                        $piHoleInterface = $setupVars["PIHOLE_INTERFACE"];
-                    } else {
-                        $piHoleInterface = "unknown";
-                    }
-                    if (isset($setupVars["IPV4_ADDRESS"])) {
-                        $piHoleIPv4 = $setupVars["IPV4_ADDRESS"];
-                    } else {
-                        $piHoleIPv4 = "unknown";
-                    }
-                    $IPv6connectivity = false;
-                    if (isset($setupVars["IPV6_ADDRESS"])) {
-                        $piHoleIPv6 = $setupVars["IPV6_ADDRESS"];
-                        sscanf($piHoleIPv6, "%2[0-9a-f]", $hexstr);
-                        if (strlen($hexstr) == 2) {
-                            // Convert HEX string to number
-                            $hex = hexdec($hexstr);
-                            // Global Unicast Address (2000::/3, RFC 4291)
-                            $GUA = (($hex & 0x70) === 0x20);
-                            // Unique Local Address   (fc00::/7, RFC 4193)
-                            $ULA = (($hex & 0xfe) === 0xfc);
-                            if ($GUA || $ULA) {
-                                // Scope global address detected
-                                $IPv6connectivity = true;
-                            }
-                        }
-                    } else {
-                        $piHoleIPv6 = "unknown";
-                    }
-                    $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
-                    ?>
 
                     <div class="row">
                         <div class="col-md-6">