diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index e7e613eac..27620f5a7 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -55,6 +55,7 @@ $(".confirm-flushlogs").confirm({
 
 $("#DHCPchk").click(function() {
 	$("input.DHCPgroup").prop("disabled", !this.checked);
+	$("#dhcpnotice").prop("hidden", !this.checked).addClass("lookatme");
 });
 
 var leasetable;
diff --git a/settings.php b/settings.php
index 21e89fc16..175af9f16 100644
--- a/settings.php
+++ b/settings.php
@@ -9,6 +9,16 @@
 		max-width: none;
 		white-space: nowrap;
 	}
+	@-webkit-keyframes Pulse{
+		from {color:#630030;-webkit-text-shadow:0 0 9px #333;}
+		50% {color:#e33100;-webkit-text-shadow:0 0 18px #e33100;}
+		to {color:#630030;-webkit-text-shadow:0 0 9px #333;}
+	}
+	p.lookatme {
+		-webkit-animation-name: Pulse;
+		-webkit-animation-duration: 2s;
+		-webkit-animation-iteration-count: infinite;
+	}
 </style>
 
 <?php if(isset($debug)){ ?>
@@ -81,6 +91,7 @@
 						<div class="input-group-addon"><i class="fa fa-plug"></i></div>
 						<input type="text" class="form-control" disabled value="<?php echo $piHoleIPv6; ?>">
 					</div>
+					<?php if (!defined('AF_INET6')){ ?><p style="color: #F00;">Warning: PHP has been compiled without IPv6 support.</p><?php } ?>
 				</div>
 				<div class="form-group">
 					<label>Pi-Hole hostname</label>
@@ -107,10 +118,18 @@
 		$DHCPstart = $setupVars["DHCP_START"];
 		$DHCPend = $setupVars["DHCP_END"];
 		$DHCProuter = $setupVars["DHCP_ROUTER"];
-		$DHCPleasetime = $setupVars["DHCP_LEASETIME"];
-		if(strlen($DHCPleasetime) < 1)
+		// This setting has been added later, we have to check if it exists
+		if(isset($setupVars["DHCP_LEASETIME"]))
+		{
+			$DHCPleasetime = $setupVars["DHCP_LEASETIME"];
+			if(strlen($DHCPleasetime) < 1)
+			{
+				// Fallback if empty string
+				$DHCPleasetime = 24;
+			}
+		}
+		else
 		{
-			// Fallback if it was not set before
 			$DHCPleasetime = 24;
 		}
 	}
@@ -143,8 +162,13 @@
 			</div>
 			<div class="box-body">
 				<form role="form" method="post">
-				<div class="form-group">
-					<div class="checkbox"><label><input type="checkbox" name="active" <?php if($DHCP){ ?>checked<?php } ?> id="DHCPchk"> DHCP server enabled</label></div>
+				<div class="col-md-6">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="active" <?php if($DHCP){ ?>checked<?php } ?> id="DHCPchk"> DHCP server enabled</label></div>
+					</div>
+				</div>
+				<div class="col-md-6">
+					<p id="dhcpnotice" <?php if(!$DHCP){ ?>hidden<?php } ?>>Make sure your router's DHCP server is disabled when using the Pi-hole DHCP server!</p>
 				</div>
 					<div class="col-md-12">
 						<label>Range of IP addresses to hand out</label>
@@ -403,10 +427,10 @@ function convertseconds($argument) {
 					<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 } ?>> never forward non-FQDNs</label></div>
+								<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 } ?>> never forward reverse lookups for private IP ranges</label></div>
+								<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>
@@ -455,6 +479,7 @@ function convertseconds($argument) {
 			</div>
 			<div class="box-footer">
 				<form role="form" method="post">
+				<button type="button" class="btn btn-default confirm-flushlogs">Flush logs</button>
 				<input type="hidden" name="field" value="Logging">
 				<?php if($piHoleLogging) { ?>
 					<input type="hidden" name="action" value="Disable">
@@ -562,8 +587,10 @@ function convertseconds($argument) {
 					</div>
 				</div>
 				<h4>Privacy mode</h4>
-				<div class="form-group">
-					<div class="checkbox"><label><input type="checkbox" name="privacyMode" <?php if($privacyMode){ ?>checked<?php } ?>> Don't show query results for permitted requests</label></div>
+				<div class="col-lg-12">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="privacyMode" <?php if($privacyMode){ ?>checked<?php } ?>> Don't show query results for permitted requests</label></div>
+					</div>
 				</div>
 			</div>
 			<div class="box-footer">