diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 91513299..5e5b0605 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -71,21 +71,11 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     <div class="col-md-6 settings-level-1">
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h3 class="box-title" data-configkeys="dhcp.domain dhcp.leaseTime dhcp.rapidCommit dhcp.multiDNS">Advanced DHCP Settings</h3>
+                <h3 class="box-title" data-configkeys="dhcp.leaseTime dhcp.rapidCommit dhcp.multiDNS">Advanced DHCP Settings</h3>
             </div>
             <div class="box-body">
                 <div class="row">
-                    <div class="col-md-6">
-                        <label>Pi-hole domain name</label>
-                        <div class="form-group">
-                            <div class="input-group">
-                                <div class="input-group-addon">Domain</div>
-                                <input type="text" class="form-control DHCPgroup" id="dhcp.domain" data-key="dhcp.domain" value="">
-                            </div>
-                        </div>
-                        <p>The DNS domains for the DHCP server. If no domain is specified, then any DHCP hostname with a domain part (i.e., with a period) will be disallowed. If a domain is specified, then hostnames with a domain parts matching the domain here are allowed. In addition, when a suffix is set then hostnames without a domain part have the suffix added as an optional domain part.</p>
-                    </div>
-                    <div class="col-md-6">
+                    <div class="col-md-12">
                         <label>DHCP lease time</label>
                         <div class="form-group">
                             <div class="input-group">
diff --git a/settings-dns.lp b/settings-dns.lp
index a56f04da..85c9d84b 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -166,10 +166,20 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         </div>
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h3 class="box-title" data-configkeys="dns.domainNeeded dns.bogusPriv dns.dnssec">Advanced DNS settings</h3>
+                <h3 class="box-title" data-configkeys="dns.domain dns.domainNeeded dns.bogusPriv dns.dnssec">Advanced DNS settings</h3>
             </div>
             <div class="box-body">
                 <div class="row">
+                    <div class="col-md-12">
+                        <label>Pi-hole domain name</label>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon">Domain</div>
+                                <input type="text" class="form-control DHCPgroup" id="dns.domain" data-key="dns.domain" value="">
+                            </div>
+                        </div>
+                        <p>The DNS domains for your Pi-hole. If no domain is specified and you are using Pi-hole's DHCP server, then any hostnames with a domain part (i.e., with a period) will be disallowed. If a domain is specified, then hostnames with a domain parts matching the domain here are allowed. In addition, when a suffix is set then hostnames without a domain part have the suffix added as an optional domain part.</p>
+                    </div>
                     <div class="col-lg-12">
                         <div>
                             <input type="checkbox" id="dns.domainNeeded" data-key="dns.domainNeeded" title="domain-needed">
@@ -190,8 +200,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
                                 with "no such domain" rather than being forwarded upstream. The set
                                 of prefixes affected is the list given in <a href="https://tools.ietf.org/html/rfc6303">RFC6303</a>.</p>
                                 <p><strong>Important</strong>: Enabling these two options may increase your privacy,
-                                but may also prevent you from being able to access
-                                local hostnames if the Pi-hole is not used as DHCP server.</p>
+                                but may also prevent you from being able to access. Make sure you have set up conditional forwarding in this case.</p>
                         </div>
                         <br>
                         <div>