diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 04303614..6f277b21 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,33 @@
-##### Expected Behaviour:
+**In raising this issue, I confirm the following (please check boxes, eg [X] - no spaces) Failure to fill the template will close your issue:**
+
+- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md).
+- [] The issue I am reporting can be *replicated*
+- [] The issue I'm reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/pi-hole/issues)).
+
+**How familiar are you with the codebase?:**
+
+_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
+
+---
+**[FEATURE REQUEST | QUESTION | OTHER]:**
+
+Please [submit your feature request here](https://discourse.pi-hole.net/c/feature-requests), so it is votable by the community.  It's also easier for us to track.
+
+**[BUG | ISSUE] Expected Behaviour:**
 
 
-##### Actual Behaviour:
+**[BUG | ISSUE] Actual Behaviour:**
 
 
-##### Steps to reproduce this issue:
+**[BUG | ISSUE] Steps to reproduce:**
+
+-
+-
+-
+-
+
+**(Optional) Debug token generated by `pihole -d`:**
+
+`<token>`
+
+_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 047c8b05..2c391428 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,19 @@
-Fixes #[issue number] .
+**By submitting this pull request, I confirm the following (please check boxes, eg [X] - no spaces) _Failure to fill the template will close your PR_:**
 
-Changes proposed in this pull request:
+***Please submit all pull requests against the `development` branch. Failure to do so will delay or deny your request***
 
-- 
+- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md).
+- [] I have checked that [another pull request](https://github.com/pi-hole/pi-hole/pulls) for this purpose does not exist.
+- [] I have considered, and confirmed that this submission will be valuable to others.
+- [] I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
+- [] I give this submission freely, and claim no ownership to its content.
 
-- 
+**How familiar are you with the codebase?:**
 
-- 
+_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
 
-@pi-hole/dashboard
+---
+_{replace this line with your pull request content}_
+
+
+_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._
diff --git a/api.php b/api.php
index 6259590d..70dbc110 100644
--- a/api.php
+++ b/api.php
@@ -70,26 +70,39 @@
     }
     elseif (isset($_GET['disable'], $_GET['token']) && $auth) {
         check_csrf($_GET['token']);
-        exec('sudo pihole disable');
+        $disable = intval($_GET['disable']);
+        // intval returns the integer value on success, or 0 on failure
+        if($disable > 0)
+        {
+            exec("sudo pihole disable ".$disable."s");
+        }
+        else
+        {
+            exec('sudo pihole disable');
+        }
         $data = array_merge($data, Array(
             "status" => "disabled"
         ));
     }
 
     if (isset($_GET['getGravityDomains'])) {
-        $data = array_merge($data, getGravityDomains($gravity));
+        $data = array_merge($data, getGravity());
     }
 
-    function filterArray(&$a) {
-	    $sanArray = array();
-	    foreach ($a as $k=>$v) {
-	        if (is_array($v)) {
-	            $sanArray[htmlspecialchars($k)] = filterArray($v);
+    if (isset($_GET['tailLog'])) {
+        $data = array_merge($data, tailPiholeLog($_GET['tailLog']));
+    }
+
+    function filterArray(&$inArray) {
+	    $outArray = array();
+	    foreach ($inArray as $key=>$value) {
+	        if (is_array($value)) {
+	            $outArray[htmlspecialchars($key)] = filterArray($value);
             } else {
-	            $sanArray[htmlspecialchars($k)] = htmlspecialchars($v);
+	            $outArray[htmlspecialchars($key)] = htmlspecialchars($value);
             }
 	    }
-	    return $sanArray;
+	    return $outArray;
     }
 
     $data = filterArray($data);
diff --git a/data.php b/data.php
index 333907c0..2e7ec397 100644
--- a/data.php
+++ b/data.php
@@ -1,9 +1,24 @@
 <?php
     $log = array();
     $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
+
     $hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
-    $log = new \SplFileObject('/var/log/pihole.log');
-    $gravity = new \SplFileObject('/etc/pihole/list.preEventHorizon');
+
+    // Check if pihole.log exists and is readable
+    $logListName = checkfile("/var/log/pihole.log");
+    $log = new \SplFileObject($logListName);
+
+    // Check if preEventHorizon exists and is readable
+    $gravityListName = checkfile("/etc/pihole/list.preEventHorizon");
+    $gravity = new \SplFileObject($gravityListName);
+
+    // whitelist.txt is optional and might not be there
+    $whiteListFile = checkfile("/etc/pihole/whitelist.txt");
+    $whitelist = new \SplFileObject($whiteListFile);
+
+    // blacklist.txt is optional and might not be there
+    $blackListFile = checkfile("/etc/pihole/blacklist.txt");
+    $blacklist = new \SplFileObject($blackListFile);
 
     /*******   Public Members ********/
     function getSummaryData() {
@@ -92,13 +107,36 @@
         return $queryTypes;
     }
 
+    function resolveIPs(&$array) {
+        $hostarray = [];
+        foreach ($array as $key => $value)
+        {
+            $hostname = gethostbyaddr($key);
+            // If we found a hostname for the IP, replace it
+            if($hostname)
+            {
+                // Generate HOST entry
+                $hostarray[$hostname] = $value;
+            }
+            else
+            {
+                // Generate IP entry
+                $hostarray[$key] = $value;
+            }
+        }
+        $array = $hostarray;
+
+        // Sort new array
+        arsort($array);
+    }
+
     function getForwardDestinations() {
-        global $log;
+        global $log, $setupVars;
         $forwards = getForwards($log);
         $destinations = array();
         foreach ($forwards as $forward) {
             $exploded = explode(" ", trim($forward));
-            $dest = hasHostName($exploded[count($exploded) - 1]);
+            $dest = $exploded[count($exploded) - 1];
             if (isset($destinations[$dest])) {
                 $destinations[$dest]++;
             }
@@ -107,17 +145,36 @@
             }
         }
 
+        if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"]))
+        {
+            resolveIPs($destinations);
+        }
+
         return $destinations;
 
     }
 
+    // Check for existance of variable
+    // and test it only if it exists
+    function istrue(&$argument) {
+        $ret = false;
+        if(isset($argument))
+        {
+            if($argument)
+            {
+                $ret = true;
+            }
+        }
+        return $ret;
+    }
+
     function getQuerySources() {
-        global $log;
+        global $log, $setupVars;
         $dns_queries = getDnsQueries($log);
         $sources = array();
         foreach($dns_queries as $query) {
             $exploded = explode(" ", $query);
-            $ip = hasHostName(trim($exploded[count($exploded)-1]));
+            $ip = trim($exploded[count($exploded)-1]);
             if (isset($sources[$ip])) {
                 $sources[$ip]++;
             }
@@ -134,6 +191,12 @@
 
         arsort($sources);
         $sources = array_slice($sources, 0, 10);
+
+        if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"]))
+        {
+            resolveIPs($sources);
+        }
+
         return Array(
             'top_sources' => $sources
         );
@@ -144,7 +207,7 @@
 
     function setShowBlockedPermitted()
     {
-        global $showBlocked, $showPermitted;
+        global $showBlocked, $showPermitted, $setupVars;
         if(isset($setupVars["API_QUERY_LOG_SHOW"]))
         {
             if($setupVars["API_QUERY_LOG_SHOW"] === "all")
@@ -162,7 +225,7 @@
                 $showBlocked = true;
                 $showPermitted = false;
             }
-            elseif($setupVars["API_QUERY_LOG_SHOW"] === "none")
+            elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing")
             {
                 $showBlocked = false;
                 $showPermitted = false;
@@ -182,10 +245,12 @@
     }
 
     function getAllQueries($orderBy) {
-        global $log,$gravity,$showBlocked,$showPermitted;
+        global $log,$showBlocked,$showPermitted;
         $allQueries = array("data" => array());
-        $dns_queries = getDnsQueriesAll($log);
-        $gravity_domains = getGravityDomains($gravity);
+        $dns_queries = getDnsQueries($log);
+
+        // Create empty array for gravity
+        $gravity_domains = getGravity();
 
         foreach ($dns_queries as $query) {
             $time = date_create(substr($query, 0, 16));
@@ -195,46 +260,71 @@
 
             setShowBlockedPermitted();
 
-            if (substr($tmp, 0, 5) == "query")
+            $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK";
+            if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted))
             {
-                $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK";
-                if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted))
-                {
-                    $type = substr($exploded[count($exploded)-4], 6, -1);
-                    $client = $exploded[count($exploded)-1];
+                $type = substr($exploded[count($exploded)-4], 6, -1);
+                $client = $exploded[count($exploded)-1];
 
-                    if($orderBy == "orderByClientDomainTime"){
-                      $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status;
-                    }elseif ($orderBy == "orderByClientTimeDomain"){
-                      $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status;
-                    }elseif ($orderBy == "orderByTimeClientDomain"){
-                      $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status;
-                    }elseif ($orderBy == "orderByTimeDomainClient"){
-                      $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status;
-                    }elseif ($orderBy == "orderByDomainClientTime"){
-                      $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status;
-                    }elseif ($orderBy == "orderByDomainTimeClient"){
-                      $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status;
-                    }else{
-                      array_push($allQueries['data'], array(
-                        $time->format('Y-m-d\TH:i:s'),
-                        $type,
-                        $domain,
-                        hasHostName($client),
-                        $status,
-                        ""
-                      ));
-                    }
+                if($orderBy == "orderByClientDomainTime"){
+                  $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status;
+                }elseif ($orderBy == "orderByClientTimeDomain"){
+                  $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status;
+                }elseif ($orderBy == "orderByTimeClientDomain"){
+                  $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status;
+                }elseif ($orderBy == "orderByTimeDomainClient"){
+                  $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status;
+                }elseif ($orderBy == "orderByDomainClientTime"){
+                  $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status;
+                }elseif ($orderBy == "orderByDomainTimeClient"){
+                  $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status;
+                }else{
+                  array_push($allQueries['data'], array(
+                    $time->format('Y-m-d\TH:i:s'),
+                    $type,
+                    $domain,
+                    hasHostName($client),
+                    $status,
+                    ""
+                  ));
                 }
             }
         }
         return $allQueries;
     }
 
+    function tailPiholeLog($param) {
+        // Not using SplFileObject here, since direct
+        // usage of f-streams will be much faster for
+        // files as large as the pihole.log
+        global $logListName;
+        $file = fopen($logListName,"r");
+        $offset = intval($param);
+        if($offset > 0)
+        {
+            // Seeks on the file pointer where we want to continue reading is known
+            fseek($file, $offset);
+            $lines = [];
+            while (!feof($file)) {
+                array_push($lines,fgets($file));
+            }
+            return ["offset" => ftell($file), "lines" => $lines];
+        }
+        else
+        {
+            // Locate the current position of the file read/write pointer
+            fseek($file, -1, SEEK_END);
+            // Add one to skip the very last "\n" in the log file
+            return ["offset" => ftell($file)+1];
+        }
+        fclose($file);
+    }
+
     /******** Private Members ********/
     function gravityCount() {
-        $preEventHorizon = exec("grep -c ^ /etc/pihole/list.preEventHorizon");
-        $blacklist = exec("grep -c ^ /etc/pihole/blacklist.txt");
+        global $gravityListName,$blackListFile;
+        $preEventHorizon = exec("grep -c ^ $gravityListName");
+        $blacklist = exec("grep -c ^ $blackListFile");
         return ($preEventHorizon + $blacklist);
     }
 
@@ -242,7 +332,7 @@
         $log->rewind();
         $lines = [];
         foreach ($log as $line) {
-            if(strpos($line, ": query[") !== false) {
+            if(strpos($line, ": query[A") !== false) {
                 $lines[] = $line;
             }
         }
@@ -250,45 +340,94 @@
     }
 
     function countDnsQueries() {
-        return exec("grep -c \": query\\[\" /var/log/pihole.log");
+        global $logListName;
+        return exec("grep -c \": query\\[A\" $logListName");
     }
 
     function getDnsQueriesAll(\SplFileObject $log) {
         $log->rewind();
         $lines = [];
         foreach ($log as $line) {
-            if(strpos($line, ": query[") || strpos($line, "gravity.list") || strpos($line, ": forwarded") !== false) {
+            if(strpos($line, ": query[A") || strpos($line, "gravity.list") || strpos($line, ": forwarded") !== false) {
                 $lines[] = $line;
             }
         }
         return $lines;
     }
 
-    function getGravityDomains($gravity){
-        $gravity->rewind();
-        $lines=[];
-        foreach ($gravity as $line) {
-            // Strip newline (and possibly carriage return) from end of string
-            // using rtrim()
-            $lines[rtrim($line)] = true;
+    function getDomains($file, &$array, $action){
+        $file->rewind();
+        foreach ($file as $line) {
+            // Strip newline (and possibly carriage return) from end of key
+            $key = rtrim($line);
+            // if $action = true -> we want that domain to be ADDED to the list
+            // doesn't harm to do this if it has already been set before
+            // (e.g. once in gravity list, once in blacklist)
+            if($action && strlen($key) > 0)
+            {
+                // $action is true (we want to add) *and* key is not empty
+                $array[$key] = true;
+            }
+            elseif(!$action && isset($array[$key]))
+            {
+                // $action is false (we want to remove) *and* key is set
+                unset($array[$key]);
+            }
         }
+    }
 
-        return $lines;
+    function getGravity() {
+        global $gravity,$whitelist,$blacklist;
+        $domains = [];
+
+        // ADD (true) preEventHorizon domains
+        getDomains($gravity, $domains, true);
+
+        // ADD (true) blacklist domains
+        getDomains($blacklist, $domains, true);
+
+        // REMOVE (false) whitelist domains
+        getDomains($whitelist, $domains, false);
+
+        return $domains;
     }
 
     function getBlockedQueries(\SplFileObject $log) {
         $log->rewind();
         $lines = [];
-        $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
         foreach ($log as $line) {
-            $line = preg_replace('/ {2,}/', ' ', $line);
             $exploded = explode(" ", $line);
-            if(count($exploded) == 8) {
-                $tmp = $exploded[count($exploded) - 4];
-                $tmp2 = $exploded[count($exploded) - 5];
-                $tmp3 = $exploded[count($exploded) - 3];
-                //filter out bad names and host file reloads:
-                if(substr($tmp, strlen($tmp) - 12, 12) == "gravity.list" && $tmp2 != "read" && $tmp3 != "pi.hole" && $tmp3 != $hostname) {
+            if(count($exploded) == 8 || count($exploded) == 10) {
+                // Structure of data is currently like:
+                // Array
+                // (
+                //     [0] => Dec
+                //     [1] => 19
+                //     [2] => 11:21:51
+                //     [3] => dnsmasq[2584]:
+                //     [4] => /etc/pihole/gravity.list
+                //     [5] => doubleclick.com
+                //     [6] => is
+                //     [7] => ip.of.pi.hole
+                // )
+                // with extra logging enabled
+                // Array
+                // (
+                //     [0] => Dec
+                //     [1] => 19
+                //     [2] => 11:21:51
+                //     [3] => dnsmasq[2584]:
+                //     [4] => 1 (identifier)
+                //     [5] => 1.2.3.4/12345
+                //     [6] => /etc/pihole/gravity.list
+                //     [7] => doubleclick.com
+                //     [8] => is
+                //     [9] => ip.of.pi.hole
+                // )
+                $list = $exploded[count($exploded)-4];
+                $is = $exploded[count($exploded)-2];
+                // Consider only gravity.list as DNS source (not e.g. hostname.list)
+                if(substr($list, strlen($list) - 12, 12) === "gravity.list" && $is === "is") {
                     $lines[] = $line;
                 };
             }
@@ -297,8 +436,8 @@
     }
 
     function countBlockedQueries() {
-        $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
-        return exec("grep \"gravity.list\" /var/log/pihole.log | grep -v \"pi.hole\" | grep -v \" read \" | grep -v -c \"".$hostname."\"");
+        global $logListName;
+        return exec("grep \"gravity.list\" $logListName | grep -c \" is \"");
     }
 
     function getForwards(\SplFileObject $log) {
diff --git a/footer.php b/footer.php
index 3d010e03..90cb764b 100644
--- a/footer.php
+++ b/footer.php
@@ -2,9 +2,7 @@
         <!-- /.content -->
     </div>
     <!-- /.content-wrapper -->
-    <footer class="main-footer row">
-        <i class="fa fa-github"></i> <strong><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY">Donate</a></strong> if you found this useful.
-        <div class="pull-right hidden-xs">
+    <footer class="main-footer">
             <?php
             // Check if on a dev branch
             $piholeBranch = exec("cd /etc/.pihole/ && git rev-parse --abbrev-ref HEAD");
@@ -27,10 +25,11 @@
                 $webVersion = exec("git describe --tags --abbrev=0");
             }
             ?>
+        <div class="pull-right hidden-xs <?php if(isset($piholeCommit) || isset($webCommit)) { ?>hidden-md<?php } ?>">
             <b>Pi-hole Version </b> <span id="piholeVersion"><?php echo $piholeVersion; ?></span><?php if(isset($piholeCommit)) { echo " (".$piholeBranch.", ".$piholeCommit.")"; } ?>
-            <?php if($piholeBranch !== "master" || $webBranch !== "master") { ?><br/><?php } ?>
             <b>Web Interface Version </b> <span id="webVersion"><?php echo $webVersion; ?></span><?php if(isset($webCommit)) { echo " (".$webBranch.", ".$webCommit.")"; } ?>
         </div>
+        <div><i class="fa fa-github"></i> <strong><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY">Donate</a></strong> if you found this useful.</div>
     </footer>
 </div>
 <!-- ./wrapper -->
diff --git a/header.php b/header.php
index ae924741..3f76da9b 100644
--- a/header.php
+++ b/header.php
@@ -4,18 +4,55 @@
 
     check_cors();
 
-    $cmd = "echo $((`cat /sys/class/thermal/thermal_zone0/temp | cut -c1-2`))";
-    $output = shell_exec($cmd);
-    $celsius = str_replace(array("\r\n","\r","\n"),"", $output);
-    $fahrenheit = round(str_replace(["\r\n","\r","\n"],"", $output*9./5)+32);
-
-    if(isset($setupVars['TEMPERATUREUNIT']))
+    // Try to get temperature value from different places (OS dependent)
+    if(file_exists("/sys/class/thermal/thermal_zone0/temp"))
     {
-        $temperatureunit = $setupVars['TEMPERATUREUNIT'];
+        $output = rtrim(file_get_contents("/sys/class/thermal/thermal_zone0/temp"));
+    }
+    elseif (file_exists("/sys/class/hwmon/hwmon0/temp1_input"))
+    {
+        $output = rtrim(file_get_contents("/sys/class/hwmon/hwmon0/temp1_input"));
     }
     else
     {
-        $temperatureunit = "C";
+        $output = "";
+    }
+
+    // Test if we succeeded in getting the temperature
+    if(is_numeric($output))
+    {
+        // $output could be either 4-5 digits or 2-3, and we only divide by 1000 if it's 4-5
+        // ex. 39007 vs 39
+        $celsius = intVal($output);
+        
+        // If celsius is greater than 1 degree and is in the 4-5 digit format
+        if($celsius > 1000) {
+            // Use multiplication to get around the division-by-zero error
+            $celsius *= 1e-3;
+        }
+        
+        $kelvin = $celsius + 273.15;
+        $fahrenheit = ($celsius*9./5)+32.0;
+
+        if(isset($setupVars['TEMPERATUREUNIT']))
+        {
+            $temperatureunit = $setupVars['TEMPERATUREUNIT'];
+        }
+        else
+        {
+            $temperatureunit = "C";
+        }
+        // Override temperature unit setting if it is changed via Settings page
+        if(isset($_POST["tempunit"]))
+        {
+            $temperatureunit = $_POST["tempunit"];
+        }
+    }
+    else
+    {
+        // Nothing can be colder than -273.15 degree Celsius (= 0 Kelvin)
+        // This is the minimum temperature possible (AKA absolute zero)
+        $celsius = -273.16;
     }
 
     // Get load
@@ -25,15 +62,27 @@
     $nproc = shell_exec('nproc');
 
     // Get memory usage
-    $free = shell_exec('free');
-    $free = (string)trim($free);
-    $free_arr = explode("\n", $free);
-    $mem = explode(" ", $free_arr[1]);
-    $mem = array_filter($mem);
-    $mem = array_merge($mem);
-    $used = $mem[2] - $mem[5] - $mem[6];
-    $total = $mem[1];
-    $memory_usage = $used/$total*100;
+    $data = explode("\n", file_get_contents("/proc/meminfo"));
+    $meminfo = array();
+    if(count($data) > 0)
+    {
+        foreach ($data as $line) {
+            $expl = explode(":", trim($line));
+            if(count($expl) == 2)
+            {
+                // remove " kB" from the end of the string and make it an integer
+                $meminfo[$expl[0]] = intVal(substr($expl[1],0, -3));
+            }
+        }
+        $memory_used = $meminfo["MemTotal"]-$meminfo["MemFree"]-$meminfo["Buffers"]-$meminfo["Cached"];
+        $memory_total = $meminfo["MemTotal"];
+        $memory_usage = $memory_used/$memory_total;
+    }
+    else
+    {
+        $memory_usage = -1;
+    }
+
 
     // For session timer
     $maxlifetime = ini_get("session.gc_maxlifetime");
@@ -60,7 +109,7 @@
         $boxedlayout = true;
     }
 
-    // Override layout setting if layout is changed via Settings page3
+    // Override layout setting if layout is changed via Settings page
     if(isset($_POST["field"]))
     {
         if($_POST["field"] === "webUI" && isset($_POST["boxedlayout"]))
@@ -80,6 +129,8 @@
     <meta charset="UTF-8">
     <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://api.github.com; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'">
     <title>Pi-hole Admin Console</title>
+    <!-- Usually browsers proactively perform domain name resolution on links that the user may choose to follow. We disable DNS prefetching here -->
+    <meta http-equiv="x-dns-prefetch-control" content="off">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <link rel="shortcut icon" href="img/favicon.png" type="image/x-icon" />
@@ -213,20 +264,30 @@
                         }
 
                         // CPU Temp
-                        echo '<a href="#" id="temperature"><i class="fa fa-fire" style="color:';
-                        if ($celsius > "45") {
-                            echo '#FF0000';
+                        if ($celsius >= -273.15) {
+                            echo "<a href=\"#\" id=\"temperature\"><i class=\"fa fa-fire\" style=\"color:";
+                            if ($celsius > 60) {
+                                echo "#FF0000";
+                            }
+                            else
+                            {
+                                echo "#3366FF";
+                            }
+                            echo "\"></i> Temp:&nbsp;";
+                            if($temperatureunit === "F")
+                            {
+                                echo round($fahrenheit,1) . "&deg;F";
+                            }
+                            elseif($temperatureunit === "K")
+                            {
+                                echo round($kelvin,1) . "K";
+                            }
+                            else
+                            {
+                                echo round($celsius,1) . "&deg;C";
+                            }
+                            echo "</a>";
                         }
-                        else
-                        {
-                            echo '#3366FF';
-                        }
-                        echo '"></i> Temp:&nbsp;';
-                        if($temperatureunit != "F")
-                            echo $celsius . '&deg;C';
-                        else
-                            echo $fahrenheit . '&deg;F';
-                        echo '</a>';
                     ?>
                     <br/>
                     <?php
@@ -243,67 +304,133 @@
                     <br/>
                     <?php
                     echo '<a href="#"><i class="fa fa-circle" style="color:';
-                        if ($memory_usage > 75) {
+                        if ($memory_usage > 0.75 || $memory_usage < 0.0) {
                             echo '#FF0000';
                         }
                         else
                         {
                             echo '#7FFF00';
                         }
-                        echo '""></i> Memory usage:&nbsp;&nbsp;' . sprintf("%.1f",$memory_usage) . '%</a>';
+                        if($memory_usage > 0.0)
+                        {
+                            echo '""></i> Memory usage:&nbsp;&nbsp;' . sprintf("%.1f",100.0*$memory_usage) . '%</a>';
+                        }
+                        else
+                        {
+                            echo '""></i> Memory usage:&nbsp;&nbsp; N/A</a>';
+                        }
                     ?>
                 </div>
             </div>
             <!-- sidebar menu: : style can be found in sidebar.less -->
+            <?php
+            $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
+            if($scriptname === "list.php")
+            {
+                if($_GET["l"] === "white")
+                {
+                    $scriptname = "whitelist";
+                }
+                elseif($_GET["l"] === "black")
+                {
+                    $scriptname = "blacklist";
+                }
+            }
+            ?>
             <ul class="sidebar-menu">
                 <li class="header">MAIN NAVIGATION</li>
                 <!-- Home Page -->
-                <li>
+                <li<?php if($scriptname === "index.php"){ ?> class="active"<?php } ?>>
                     <a href="index.php">
                         <i class="fa fa-home"></i> <span>Main Page</span>
                     </a>
                 </li>
                 <?php if($auth){ ?>
                 <!-- Query Log -->
-                <li>
+                <li<?php if($scriptname === "queries.php"){ ?> class="active"<?php } ?>>
                     <a href="queries.php">
                         <i class="fa fa-file-text-o"></i> <span>Query Log</span>
                     </a>
                 </li>
                 <!-- Whitelist -->
-                <li>
+                <li<?php if($scriptname === "whitelist"){ ?> class="active"<?php } ?>>
                     <a href="list.php?l=white">
                         <i class="fa fa-pencil-square-o"></i> <span>Whitelist</span>
                     </a>
                 </li>
                 <!-- Blacklist -->
-                <li>
+                <li<?php if($scriptname === "blacklist"){ ?> class="active"<?php } ?>>
                     <a href="list.php?l=black">
                         <i class="fa fa-ban"></i> <span>Blacklist</span>
                     </a>
                 </li>
-                <!-- Run gravity.sh -->
-                <li>
-                    <a href="gravity.php">
-                        <i class="fa fa-arrow-circle-down"></i> <span>Update Lists</span>
-                    </a>
-                </li>
-                <!-- Query adlists -->
-                <li>
-                    <a href="queryads.php">
-                        <i class="fa fa-search"></i> <span>Query adlists</span>
-                    </a>
-                </li>
                 <!-- Toggle -->
-                <?php
-                if ($pistatus == "1") {
-                  echo '                <li><a href="#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a></li>';
-                } else {
-                  echo '                <li><a href="#" id="flip-status"><i class="fa fa-play"></i> <span>Enable</span></a></li>';
-                }
-                ?>
+
+                <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden="true"<?php } ?>>
+                  <a href="#">
+                    <i class="fa fa-stop"></i> <span>Disable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <li>
+                        <a href="#" id="pihole-disable-permanently">
+                            <i class="fa fa-stop"></i> <span>Permanently</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-10s">
+                            <i class="fa fa-clock-o"></i> <span>For 10 seconds</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-30s">
+                            <i class="fa fa-clock-o"></i> <span>For 30 seconds</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-5m">
+                            <i class="fa fa-clock-o"></i> <span>For 5 minutes</span>
+                        </a>
+                    </li>
+                  </ul>
+                    <!-- <a href="#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
+                </li>
+                <li id="pihole-enable" class="treeview"<?php if ($pistatus == "1") { ?> hidden="true"<?php } ?>>
+                    <a href="#"><i class="fa fa-play"></i> <span>Enable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-enable"></span></a>
+                </li>
+                <!-- Tools -->
+                <li class="treeview <?php if($scriptname === "gravity.php" || $scriptname === "queryads.php"){ ?>active<?php } ?>">
+                  <a href="#">
+                    <i class="fa fa-folder"></i> <span>Tools</span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <!-- Run gravity.sh -->
+                    <li<?php if($scriptname === "gravity.php"){ ?> class="active"<?php } ?>>
+                        <a href="gravity.php">
+                            <i class="fa fa-arrow-circle-down"></i> <span>Update Lists</span>
+                        </a>
+                    </li>
+                    <!-- Query adlists -->
+                    <li<?php if($scriptname === "queryads.php"){ ?> class="active"<?php } ?>>
+                        <a href="queryads.php">
+                            <i class="fa fa-search"></i> <span>Query adlists</span>
+                        </a>
+                    </li>
+                    <!-- Tail pihole.log -->
+                    <li<?php if($scriptname === "taillog.php"){ ?> class="active"<?php } ?>>
+                        <a href="taillog.php">
+                            <i class="fa fa-list-ul"></i> <span>Tail pihole.log</span>
+                        </a>
+                    </li>
+                  </ul>
+                </li>
                 <!-- Settings -->
-                <li>
+                <li<?php if($scriptname === "settings.php"){ ?> class="active"<?php } ?>>
                     <a href="settings.php">
                         <i class="fa fa-gears"></i> <span>Settings</span>
                     </a>
@@ -337,7 +464,7 @@
                 </li>
                 <?php if($auth){ ?>
                 <!-- Help -->
-                <li>
+                <li<?php if($scriptname === "help.php"){ ?> class="active"<?php } ?>>
                     <a href="help.php">
                         <i class="fa fa-question-circle"></i> <span>Help</span>
                     </a>
@@ -361,14 +488,8 @@
     //
     // If auth is required and not set, i.e. no successfully logged in,
     // we show the reduced version of the summary (index) page
-    if(!$auth && (!isset($indexpage) || isset($_GET['login']))){ ?>
-<div class="page-header">
-    <h1>Login required!</h1>
-</div>
-<form action="" method="POST">
-  Password: <input type="password" name="pw">&nbsp;<input type="submit" value="Login">
-</form>
-<?php
+    if(!$auth && (!isset($indexpage) || isset($_GET['login']))){
+        require "php/loginpage.php";
         require "footer.php";
         exit();
     }
diff --git a/help.php b/help.php
index cd24c0f2..8346351a 100644
--- a/help.php
+++ b/help.php
@@ -93,24 +93,23 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-    <h2>Setings</h2>
+    <h2>Settings</h2>
     Change settings for the Pi-Hole
     <h4>Networking</h4>
     Displays information about the interfaces of the Pi-Hole. No changes possible
     <h4>Pi-Hole DHCP Server</h4>
     Using this setting you can enable/disable the DHCP server of the Pi-Hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page.
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-    <h2>Donate</h2>
-    Keep in mind that Pi-hole is free. If you like Pi-hole, please consider a small donation to help support its development
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-    <h2>Help (this page)</h2>
-    Shows information about what is happening behind the scenes and what can be done with this web user interface (web UI). The Help center will show details concerning the authentication system only if it is enabled
+    <h4>Upstream DNS Servers</h4>
+    Customize used upstream DNS servers + advanced settings
+    <h4>Query Logging</h4>
+    Enabled/disable query logging on your Pi-hole
+    <h4>API</h4>
+    Change settings which apply to the API as well as the web UI<br>
+    Note that Top Clients have to be given as IP addresses
+    <h4>Web User Interface</h4>
+    Other settings whioch affect the webUI but not the API of Pi-hole
+    <h4>System Administration</h4>
+    Apply system-wide actions like restarting of the server
     </div>
 </div>
 <div class="row">
@@ -127,6 +126,18 @@
     </div>
 </div>
 <?php } ?>
+<div class="row">
+    <div class="col-md-12">
+    <h2>Donate</h2>
+    Keep in mind that Pi-hole is free. If you like Pi-hole, please consider a small donation to help support its development
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+    <h2>Help (this page)</h2>
+    Shows information about what is happening behind the scenes and what can be done with this web user interface (web UI). The Help center will show details concerning the authentication system only if it is enabled
+    </div>
+</div>
 <div class="row">
     <div class="col-md-12">
     <h2>Footer</h2>
diff --git a/index.php b/index.php
index aae56b72..f89ba834 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
 ?>
 <!-- Small boxes (Stat box) -->
 <div class="row">
-    <div class="col-lg-3 col-xs-6">
+    <div class="col-lg-3 col-xs-12">
         <!-- small box -->
         <div class="small-box bg-aqua">
             <div class="inner">
@@ -17,7 +17,7 @@
         </div>
     </div>
     <!-- ./col -->
-    <div class="col-lg-3 col-xs-6">
+    <div class="col-lg-3 col-xs-12">
         <!-- small box -->
         <div class="small-box bg-green">
             <div class="inner">
@@ -30,7 +30,7 @@
         </div>
     </div>
     <!-- ./col -->
-    <div class="col-lg-3 col-xs-6">
+    <div class="col-lg-3 col-xs-12">
         <!-- small box -->
         <div class="small-box bg-yellow">
             <div class="inner">
@@ -43,11 +43,11 @@
         </div>
     </div>
     <!-- ./col -->
-    <div class="col-lg-3 col-xs-6">
+    <div class="col-lg-3 col-xs-12">
         <!-- small box -->
         <div class="small-box bg-red">
             <div class="inner">
-                <h3 class="statistic" id="domains_being_blocked"><sup style="font-size: 30px">---</sup></h3>
+                <h3 class="statistic" id="domains_being_blocked">---</h3>
                 <p>Domains Being Blocked</p>
             </div>
             <div class="icon">
diff --git a/js/pihole/footer.js b/js/pihole/footer.js
index f1166433..b9029236 100644
--- a/js/pihole/footer.js
+++ b/js/pihole/footer.js
@@ -8,34 +8,82 @@ $("body").on("click", function(event) {
     }
 });
 
-// Enable/Disable
-$("#flip-status").on("click", (e) => {
-    e.preventDefault();
-    const btnStatus = $("#flip-status");
+function piholeChanged(action)
+{
     const status = $("#status");
-    const text = btnStatus.text().trim();
-    const token = encodeURIComponent($("#token").html());
+    const ena = $("#pihole-enable");
+    const dis = $("#pihole-disable");
 
-    switch(text) {
-        case "Enable":
-            btnStatus.html("<i class='fa fa-spinner'></i> <span>Enabling...</span>");
-            $.getJSON("api.php?enable&token=" + token, (data) => {
-                if(data.status === "enabled") {
-                    btnStatus.html("<i class='fa fa-stop'></i> <span>Disable</span>");
-                    status.html("<i class='fa fa-circle' style='color:#7FFF00'></i> Active");
-                }
-            });
-            break;
-        case "Disable":
-            btnStatus.html("<i class='fa fa-spinner'></i> <span>Disabling...</span>");
-            $.getJSON("api.php?disable&token=" + token, (data) => {
-                if(data.status === "disabled") {
-                    btnStatus.html("<i class='fa fa-play'></i> <span>Enable</span>");
-                    status.html("<i class='fa fa-circle' style='color:#FF0000'></i> Offline");
-                }
-            });
-            break;
+    switch(action) {
+        case "enabled":
+        status.html("<i class='fa fa-circle' style='color:#7FFF00'></i> Active");
+        ena.hide();
+        dis.show();
+        dis.removeClass("active");
+        break;
+
+        case "disabled":
+        status.html("<i class='fa fa-circle' style='color:#FF0000'></i> Offline");
+        ena.show();
+        dis.hide();
+        break;
     }
+
+}
+
+function piholeChange(action, duration)
+{
+    const token = encodeURIComponent($("#token").html());
+    var btnStatus;
+
+    switch(action) {
+        case "enable":
+        btnStatus = $("#flip-status-enable");
+        btnStatus.html("<i class='fa fa-spinner'> </i>");
+        $.getJSON("api.php?enable&token=" + token, (data) => {
+            if(data.status === "enabled") {
+                btnStatus.html("");
+                piholeChanged("enabled");
+            }
+        });
+        break;
+
+        case "disable":
+        btnStatus = $("#flip-status-disable");
+        btnStatus.html("<i class='fa fa-spinner'> </i>");
+        $.getJSON("api.php?disable=" + duration + "&token=" + token, (data) => {
+            if(data.status === "disabled") {
+                btnStatus.html("");
+                piholeChanged("disabled");
+            }
+        });
+        break;
+    }
+}
+
+// Handle Enable/Disable
+$("#pihole-enable").on("click", (e) => {
+    e.preventDefault();
+    piholeChange("enable","");
+});
+$("#pihole-disable-permanently").on("click", (e) => {
+    e.preventDefault();
+    piholeChange("disable","0");
+});
+$("#pihole-disable-10s").on("click", (e) => {
+    e.preventDefault();
+    piholeChange("disable","10");
+    setTimeout(function(){piholeChanged("enabled");},10000);
+});
+$("#pihole-disable-30s").on("click", (e) => {
+    e.preventDefault();
+    piholeChange("disable","30");
+    setTimeout(function(){piholeChanged("enabled");},30000);
+});
+$("#pihole-disable-5m").on("click", (e) => {
+    e.preventDefault();
+    piholeChange("disable","300");
+    setTimeout(function(){piholeChanged("enabled");},300000);
 });
 
 var piholeVersion = $("#piholeVersion").html();
@@ -79,14 +127,14 @@ function versionCompare(left, right) {
 $.getJSON("https://api.github.com/repos/pi-hole/pi-hole/releases/latest", function(json) {
     if(versionCompare(piholeVersion, json.tag_name.slice(1)) < 0) {
         // Alert user
-        $("#piholeVersion").html($("#piholeVersion").text() + '<a class="alert-link" href="https://github.com/pi-hole/pi-hole/releases">(Update available!)</a>');
+        $("#piholeVersion").html($("#piholeVersion").text() + "<a class=\"alert-link\" href=\"https://github.com/pi-hole/pi-hole/releases\">(Update available!)</a>");
         $("#alPiholeUpdate").show();
     }
 });
 $.getJSON("https://api.github.com/repos/pi-hole/AdminLTE/releases/latest", function(json) {
     if(versionCompare(webVersion, json.tag_name.slice(1)) < 0) {
         // Alert user
-        $("#webVersion").html($("#webVersion").text() + '<a class="alert-link" href="https://github.com/pi-hole/adminLTE/releases">(Update available!)</a>');
+        $("#webVersion").html($("#webVersion").text() + "<a class=\"alert-link\" href=\"https://github.com/pi-hole/adminLTE/releases\">(Update available!)</a>");
         $("#alWebUpdate").show();
     }
 });
diff --git a/js/pihole/index.js b/js/pihole/index.js
index ec53d861..7bdc39f1 100644
--- a/js/pihole/index.js
+++ b/js/pihole/index.js
@@ -42,7 +42,7 @@ function updateSummaryData(runOnce) {
                 var textData = idx === 3 ? data[header] + "%" : data[header];
                 $("h3#" + header).text(textData);
             });
-            $("h3.statistic.glow").removeClass("glow")
+            $("h3.statistic.glow").removeClass("glow");
         }, 500);
 
         updateSessionTimer();
@@ -76,7 +76,7 @@ function updateQueriesOverTime() {
                 timeLineChart.data.datasets[1].data.push(data.ads_over_time[1][hour]);
             }
         }
-        $('#queries-over-time .overlay').remove();
+        $("#queries-over-time .overlay").remove();
         timeLineChart.update();
     }).done(function() {
         // Reload graph after 10 minutes
@@ -109,7 +109,7 @@ function updateQueryTypes() {
         var dd = {data: v, backgroundColor: c};
         // and push it at once
         queryTypeChart.data.datasets.push(dd);
-        $('#query-types .overlay').remove();
+        $("#query-types .overlay").remove();
         queryTypeChart.update();
         queryTypeChart.chart.config.options.cutoutPercentage=30;
         queryTypeChart.update();
@@ -131,20 +131,24 @@ function escapeHtml(text) {
 
 function updateTopClientsChart() {
     $.getJSON("api.php?summaryRaw&getQuerySources", function(data) {
-        var clienttable =  $('#client-frequency').find('tbody:last');
+        var clienttable =  $("#client-frequency").find("tbody:last");
         var domain, percentage;
         for (domain in data.top_sources) {
-            // Sanitize domain
-            domain = escapeHtml(domain);
 
-            var url = "<a href=\"queries.php?client="+domain+"\">"+domain+"</a>";
-            percentage = data.top_sources[domain] / data.dns_queries_today * 100;
-            clienttable.append("<tr> <td>" + url +
-                "</td> <td>" + data.top_sources[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
-                percentage + "%\"></div> </div> </td> </tr> ");
+            if ({}.hasOwnProperty.call(data.top_sources, domain)){
+                // Sanitize domain
+                domain = escapeHtml(domain);
+
+                var url = "<a href=\"queries.php?client="+domain+"\">"+domain+"</a>";
+                percentage = data.top_sources[domain] / data.dns_queries_today * 100;
+                clienttable.append("<tr> <td>" + url +
+                    "</td> <td>" + data.top_sources[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
+                    percentage + "%\"></div> </div> </td> </tr> ");
+            }
+
         }
 
-        $('#client-frequency .overlay').remove();
+        $("#client-frequency .overlay").remove();
     });
 }
 
@@ -164,7 +168,7 @@ function updateForwardDestinations() {
         var dd = {data: v, backgroundColor: c};
         // and push it at once
         forwardDestinationChart.data.datasets.push(dd);
-        $('#forward-destinations .overlay').remove();
+        $("#forward-destinations .overlay").remove();
         forwardDestinationChart.update();
         forwardDestinationChart.chart.config.options.cutoutPercentage=30;
         forwardDestinationChart.update();
@@ -173,34 +177,39 @@ function updateForwardDestinations() {
 
 function updateTopLists() {
     $.getJSON("api.php?summaryRaw&topItems", function(data) {
-        var domaintable = $('#domain-frequency').find('tbody:last');
-        var adtable = $('#ad-frequency').find('tbody:last');
+        var domaintable = $("#domain-frequency").find("tbody:last");
+        var adtable = $("#ad-frequency").find("tbody:last");
         var url, domain, percentage;
 
         for (domain in data.top_queries) {
-            // Sanitize domain
-            domain = escapeHtml(domain);
-            if(domain !== "pi.hole")
-            {
-                url = "<a href=\"queries.php?domain="+domain+"\">"+domain+"</a>";
+            if ({}.hasOwnProperty.call(data.top_queries,domain)){
+                // Sanitize domain
+                domain = escapeHtml(domain);
+                if(domain !== "pi.hole")
+                {
+                    url = "<a href=\"queries.php?domain="+domain+"\">"+domain+"</a>";
+                }
+                else
+                {
+                    url = domain;
+                }
+                percentage = data.top_queries[domain] / data.dns_queries_today * 100;
+                domaintable.append("<tr> <td>" + url +
+                    "</td> <td>" + data.top_queries[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-green\" style=\"width: " +
+                    percentage + "%\"></div> </div> </td> </tr> ");
             }
-            else
-            {
-                url = domain;
-            }
-            percentage = data.top_queries[domain] / data.dns_queries_today * 100;
-            domaintable.append("<tr> <td>" + url +
-                "</td> <td>" + data.top_queries[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-green\" style=\"width: " +
-                percentage + "%\"></div> </div> </td> </tr> ");
+
         }
         for (domain in data.top_ads) {
-            // Sanitize domain
-            domain = escapeHtml(domain);
-            url = "<a href=\"queries.php?domain="+domain+"\">"+domain+"</a>";
-            percentage = data.top_ads[domain] / data.ads_blocked_today * 100;
-            adtable.append("<tr> <td>" + url +
-                "</td> <td>" + data.top_ads[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-yellow\" style=\"width: " +
-                 percentage + "%\"></div> </div> </td> </tr> ");
+            if ({}.hasOwnProperty.call(data.top_ads,domain)){
+                // Sanitize domain
+                domain = escapeHtml(domain);
+                url = "<a href=\"queries.php?domain="+domain+"\">"+domain+"</a>";
+                percentage = data.top_ads[domain] / data.ads_blocked_today * 100;
+                adtable.append("<tr> <td>" + url +
+                    "</td> <td>" + data.top_ads[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-yellow\" style=\"width: " +
+                    percentage + "%\"></div> </div> </td> </tr> ");
+            }
         }
 
         $("#domain-frequency .overlay").remove();
@@ -273,6 +282,23 @@ $(document).ready(function() {
                             var from = padNumber(h)+":"+padNumber(m)+":00";
                             var to = padNumber(h)+":"+padNumber(m+9)+":59";
                             return "Queries from "+from+" to "+to;
+                        },
+                        label(tooltipItems, data) {
+                            if(tooltipItems.datasetIndex === 1)
+                            {
+                                var percentage = 0.0;
+                                var total = parseInt(data.datasets[0].data[tooltipItems.index]);
+                                var blocked = parseInt(data.datasets[1].data[tooltipItems.index]);
+                                if(total > 0)
+                                {
+                                    percentage = 100.0*blocked/total;
+                                }
+                                return data.datasets[tooltipItems.datasetIndex].label + ": " + tooltipItems.yLabel + " (" + percentage.toFixed(1) + "%)";
+                            }
+                            else
+                            {
+                                return data.datasets[tooltipItems.datasetIndex].label + ": " + tooltipItems.yLabel;
+                            }
                         }
                     }
                 },
diff --git a/js/pihole/list.js b/js/pihole/list.js
index 3f2e2d74..ff24f94e 100644
--- a/js/pihole/list.js
+++ b/js/pihole/list.js
@@ -1,35 +1,29 @@
 // IE likes to cache too much :P
 $.ajaxSetup({cache: false});
 
-// Handle enter button for adding domains
-$(document).keypress(function(e) {
-    if(e.which === 13 && $("#domain").is(":focus")) {
-        // Enter was pressed, and the input has focus
-        add();
-    }
-});
-
-// Handle buttons
-$("#btnAdd").on("click", function() {
-    add();
-});
-$("#btnRefresh").on("click", function() {
-    refresh(true);
-});
-
-// Handle hiding of alerts
-$(function(){
-    $("[data-hide]").on("click", function(){
-        $(this).closest("." + $(this).attr("data-hide")).hide();
-    });
-});
-
 // Get PHP info
 var token = $("#token").html();
-var list_type = $("#list-type").html();
-var fullName = list_type === "white" ? "Whitelist" : "Blacklist";
+var listType = $("#list-type").html();
+var fullName = listType === "white" ? "Whitelist" : "Blacklist";
 
-window.onload = refresh(false);
+function sub(index, entry) {
+    var domain = $("#"+index);
+    domain.hide("highlight");
+    $.ajax({
+        url: "php/sub.php",
+        method: "post",
+        data: {"domain":entry, "list":listType, "token":token},
+        success: function(response) {
+            if(response.length !== 0){
+                return;
+            }
+            domain.remove();
+        },
+        error: function(jqXHR, exception) {
+            alert("Failed to remove the domain!");
+        }
+    });
+}
 
 function refresh(fade) {
     var list = $("#list");
@@ -39,25 +33,25 @@ function refresh(fade) {
     $.ajax({
         url: "php/get.php",
         method: "get",
-        data: {"list":list_type},
+        data: {"list":listType},
         success: function(response) {
             list.html("");
             var data = JSON.parse(response);
 
             if(data.length === 0) {
-                list.html('<div class="alert alert-info" role="alert">Your ' + fullName + ' is empty!</div>');
+                list.html("<div class=\"alert alert-info\" role=\"alert\">Your " + fullName + " is empty!</div>");
             }
             else {
                 data.forEach(function (entry, index) {
                     list.append(
-                        '<li id="' + index + '" class="list-group-item clearfix">' + entry +
-                        '<button class="btn btn-danger btn-xs pull-right" type="button">' +
-                        '<span class="glyphicon glyphicon-trash"></span></button></li>'
+                        "<li id=\"" + index + "\" class=\"list-group-item clearfix\">" + entry +
+                        "<button class=\"btn btn-danger btn-xs pull-right\" type=\"button\">" +
+                        "<span class=\"glyphicon glyphicon-trash\"></span></button></li>"
                     );
 
                     // Handle button
                     $("#list #"+index+"").on("click", "button", function() {
-                        sub(index, entry)
+                        sub(index, entry);
                     });
                 });
             }
@@ -69,10 +63,13 @@ function refresh(fade) {
     });
 }
 
+window.onload = refresh(false);
+
 function add() {
     var domain = $("#domain");
-    if(domain.val().length === 0)
+    if(domain.val().length === 0){
         return;
+    }
 
     var alInfo = $("#alInfo");
     var alSuccess = $("#alSuccess");
@@ -83,7 +80,7 @@ function add() {
     $.ajax({
         url: "php/add.php",
         method: "post",
-        data: {"domain":domain.val(), "list":list_type, "token":token},
+        data: {"domain":domain.val(), "list":listType, "token":token},
         success: function(response) {
           if (response.indexOf("not a valid argument") >= 0 ||
               response.indexOf("is not a valid domain") >= 0) {
@@ -118,20 +115,27 @@ function add() {
     });
 }
 
-function sub(index, entry) {
-    var domain = $("#"+index);
-    domain.hide("highlight");
-    $.ajax({
-        url: "php/sub.php",
-        method: "post",
-        data: {"domain":entry, "list":list_type, "token":token},
-        success: function(response) {
-            if(response.length !== 0)
-                return;
-            domain.remove();
-        },
-        error: function(jqXHR, exception) {
-            alert("Failed to remove the domain!");
-        }
+
+
+// Handle enter button for adding domains
+$(document).keypress(function(e) {
+    if(e.which === 13 && $("#domain").is(":focus")) {
+        // Enter was pressed, and the input has focus
+        add();
+    }
+});
+
+// Handle buttons
+$("#btnAdd").on("click", function() {
+    add();
+});
+$("#btnRefresh").on("click", function() {
+    refresh(true);
+});
+
+// Handle hiding of alerts
+$(function(){
+    $("[data-hide]").on("click", function(){
+        $(this).closest("." + $(this).attr("data-hide")).hide();
     });
-}
+});
diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index 4a52c990..0029ea3e 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -9,16 +9,77 @@ function escapeRegex(text) {
   return text.replace(/[().]/g, function(m) { return map[m]; });
 }
 
+function refreshData() {
+    tableApi.ajax.url("api.php?getAllQueries").load();
+//    updateSessionTimer();
+}
+
+function add(domain,list) {
+    var token = $("#token").html();
+    var alInfo = $("#alInfo");
+    var alList = $("#alList");
+    var alDomain = $("#alDomain");
+    alDomain.html(domain);
+    var alSuccess = $("#alSuccess");
+    var alFailure = $("#alFailure");
+
+    if(list === "white")
+    {
+        alList.html("Whitelist");
+    }
+    else
+    {
+        alList.html("Blacklist");
+    }
+
+    alInfo.show();
+    alSuccess.hide();
+    alFailure.hide();
+    $.ajax({
+        url: "php/add.php",
+        method: "post",
+        data: {"domain":domain, "list":list, "token":token},
+        success: function(response) {
+            if (response.indexOf("not a valid argument") >= 0 || response.indexOf("is not a valid domain") >= 0)
+            {
+                alFailure.show();
+                alFailure.delay(1000).fadeOut(2000, function() { alFailure.hide(); });
+            }
+            else
+            {
+                alSuccess.show();
+                alSuccess.delay(1000).fadeOut(2000, function() { alSuccess.hide(); });
+            }
+            alInfo.delay(1000).fadeOut(2000, function() {
+                alInfo.hide();
+                alList.html("");
+                alDomain.html("");
+            });
+        },
+        error: function(jqXHR, exception) {
+            alFailure.show();
+            alFailure.delay(1000).fadeOut(2000, function() {
+                alFailure.hide();
+            });
+            alInfo.delay(1000).fadeOut(2000, function() {
+                alInfo.hide();
+                alList.html("");
+                alDomain.html("");
+            });
+        }
+    });
+}
+
 $(document).ready(function() {
-    tableApi = $('#all-queries').DataTable( {
+    tableApi = $("#all-queries").DataTable( {
         "rowCallback": function( row, data, index ){
-            if (data[4] == "Pi-holed") {
-                $(row).css('color','red');
-                $('td:eq(5)', row).html( '<button style="color:green;"><i class="fa fa-pencil-square-o"></i> Whitelist</button>' );
+            if (data[4] === "Pi-holed") {
+                $(row).css("color","red");
+                $("td:eq(5)", row).html( "<button style=\"color:green;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else{
-                $(row).css('color','green');
-                $('td:eq(5)', row).html( '<button style="color:red;"><i class="fa fa-ban"></i> Blacklist</button>' );
+                $(row).css("color","green");
+                $("td:eq(5)", row).html( "<button style=\"color:red;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
 
         },
@@ -41,12 +102,12 @@ $(document).ready(function() {
         "columnDefs": [ {
             "targets": -1,
             "data": null,
-            "defaultContent": ''
+            "defaultContent": ""
         } ]
     });
-    $('#all-queries tbody').on( 'click', 'button', function () {
-        var data = tableApi.row( $(this).parents('tr') ).data();
-        if (data[4] == "Pi-holed")
+    $("#all-queries tbody").on( "click", "button", function () {
+        var data = tableApi.row( $(this).parents("tr") ).data();
+        if (data[4] === "Pi-holed")
         {
           add(data[2],"white");
         }
@@ -74,63 +135,4 @@ $(document).ready(function() {
     }
 } );
 
-function refreshData() {
-    tableApi.ajax.url("api.php?getAllQueries").load();
-//    updateSessionTimer();
-}
 
-function add(domain,list) {
-    var token = $("#token").html();
-    var alInfo = $("#alInfo");
-    var alList = $("#alList");
-    var alDomain = $("#alDomain");
-    alDomain.html(domain);
-    var alSuccess = $("#alSuccess");
-    var alFailure = $("#alFailure");
-
-    if(list == "white")
-    {
-        alList.html("Whitelist");
-    }
-    else
-    {
-        alList.html("Blacklist");
-    }
-
-    alInfo.show();
-    alSuccess.hide();
-    alFailure.hide();
-    $.ajax({
-        url: "php/add.php",
-        method: "post",
-        data: {"domain":domain, "list":list, "token":token},
-        success: function(response) {
-          if (response.indexOf("not a valid argument") >= 0 || response.indexOf("is not a valid domain") >= 0)
-          {
-              alFailure.show();
-              alFailure.delay(1000).fadeOut(2000, function() { alFailure.hide(); });
-          }
-          else
-          {
-              alSuccess.show();
-              alSuccess.delay(1000).fadeOut(2000, function() { alSuccess.hide(); });
-          }
-          alInfo.delay(1000).fadeOut(2000, function() {
-              alInfo.hide();
-              alList.html("");
-              alDomain.html("");
-          });
-        },
-        error: function(jqXHR, exception) {
-            alFailure.show();
-            alFailure.delay(1000).fadeOut(2000, function() {
-                alFailure.hide();
-            });
-            alInfo.delay(1000).fadeOut(2000, function() {
-                alInfo.hide();
-                alList.html("");
-                alDomain.html("");
-            });
-        }
-    });
-}
diff --git a/js/pihole/queryads.js b/js/pihole/queryads.js
index 86822e51..e8b91be4 100644
--- a/js/pihole/queryads.js
+++ b/js/pihole/queryads.js
@@ -16,7 +16,7 @@ function eventsource() {
     }
 
     var host = window.location.host;
-    var source = new EventSource("http://"+host+"/admin/php/queryads.php?domain="+domain.val()+"&"+exact);
+    var source = new EventSource("http://"+host+"/admin/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact);
 
     // Reset and show field
     ta.empty();
diff --git a/js/pihole/taillog.js b/js/pihole/taillog.js
new file mode 100644
index 00000000..00cbfb15
--- /dev/null
+++ b/js/pihole/taillog.js
@@ -0,0 +1,40 @@
+var offset, timer, pre, scrolling = true;
+
+// Check every 200msec for fresh data
+var interval = 200;
+
+// Function that asks the API for new data
+function reloadData(){
+    clearTimeout(timer);
+    $.getJSON("api.php?tailLog="+offset, function (data)
+    {
+        offset = data["offset"];
+        pre.append(data["lines"]);
+    });
+
+    if(scrolling)
+    {
+        window.scrollTo(0,document.body.scrollHeight);
+    }
+    timer = setTimeout(reloadData, interval);
+}
+
+$(function(){
+    // Get offset at first loading of page
+    $.getJSON("api.php?tailLog", function (data)
+    {
+        offset = data["offset"];
+    });
+    pre = $("#output");
+    // Trigger function that looks for new data
+    reloadData();
+});
+
+$("#chk1").click(function() {
+    $("#chk2").prop("checked",this.checked);
+    scrolling = this.checked;
+});
+$("#chk2").click(function() {
+    $("#chk1").prop("checked",this.checked);
+    scrolling = this.checked;
+});
diff --git a/php/auth.php b/php/auth.php
index d39f168e..d2345ca4 100644
--- a/php/auth.php
+++ b/php/auth.php
@@ -15,27 +15,47 @@ function log_and_die($message) {
 }
 
 function check_cors() {
+    $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
+    $ipv4 = isset($setupVars["IPV4_ADDRESS"]) ? explode("/", $setupVars["IPV4_ADDRESS"])[0] : $_SERVER['SERVER_ADDR'];
+
     // Check CORS
     $AUTHORIZED_HOSTNAMES = array(
-        'http://' . $_SERVER['SERVER_ADDR'],
-        'http://pi.hole',
-        'http://localhost'
+        $ipv4,
+        $_SERVER["SERVER_NAME"],
+        "pi.hole",
+        "localhost"
     );
 
     # Allow user set virtual hostnames
     $virtual_host = getenv('VIRTUAL_HOST');
     if (! empty($virtual_host))
-        array_push($AUTHORIZED_HOSTNAMES, 'http://' . $virtual_host);
+        array_push($AUTHORIZED_HOSTNAMES, $virtual_host);
 
     // Since the Host header is easily manipulated, we can only check if it's wrong and can't use it
     // to validate that the client is authorized, only unauthorized.
-    if(isset($_SERVER['HTTP_HOST']) && !in_array("http://".$_SERVER['HTTP_HOST'], $AUTHORIZED_HOSTNAMES)) {
-        log_and_die("Failed Host Check: " . $_SERVER['HTTP_HOST'] .' vs '. join(', ', $AUTHORIZED_HOSTNAMES));
+    $server_host = $_SERVER['HTTP_HOST'];
+
+    // If HTTP_HOST contains a non-standard port (!= 80) we have to strip the port
+    if(strpos($server_host, ":"))
+    {
+        $server_host = parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST);
+    }
+
+    if(isset($_SERVER['HTTP_HOST']) && !in_array($server_host, $AUTHORIZED_HOSTNAMES)) {
+        log_and_die("Failed Host Check: " . $server_host .' vs '. join(', ', $AUTHORIZED_HOSTNAMES));
     }
 
     if(isset($_SERVER['HTTP_ORIGIN'])) {
-        if(!in_array($_SERVER['HTTP_ORIGIN'], $AUTHORIZED_HOSTNAMES)) {
-            log_and_die("Failed CORS: " . $_SERVER['HTTP_ORIGIN'] .' vs '. join(', ', $AUTHORIZED_HOSTNAMES));
+        $server_origin = $_SERVER['HTTP_ORIGIN'];
+
+        // If HTTP_ORIGIN contains a non-standard port (!= 80) we have to strip the port
+        if(strpos($server_origin, ":"))
+        {
+            $server_origin = parse_url($_SERVER['HTTP_ORIGIN'], PHP_URL_HOST);
+        }
+
+        if(!in_array($server_origin, $AUTHORIZED_HOSTNAMES)) {
+            log_and_die("Failed CORS: " . $server_origin .' vs '. join(', ', $AUTHORIZED_HOSTNAMES));
         }
         header("Access-Control-Allow-Origin: ${_SERVER['HTTP_ORIGIN']}");
     }
diff --git a/php/func.php b/php/func.php
index 060b4f43..37ef790f 100644
--- a/php/func.php
+++ b/php/func.php
@@ -7,4 +7,16 @@ function is_valid_domain_name($domain_name)
         preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name)); //length of each label
 }
 
-?>
\ No newline at end of file
+function checkfile($filename) {
+    if(is_readable($filename))
+    {
+        return $filename;
+    }
+    else
+    {
+        // substitute dummy file
+        return "/dev/null";
+    }
+}
+
+?>
diff --git a/php/get.php b/php/get.php
index 12f0a321..fada75b9 100644
--- a/php/get.php
+++ b/php/get.php
@@ -7,7 +7,9 @@ $type = $_GET['list'];
 if($type !== "white" && $type !== "black")
     die("Invalid list parameter");
 
-$rawList = file_get_contents("/etc/pihole/${type}list.txt");
+require "func.php";
+
+$rawList = file_get_contents(checkfile("/etc/pihole/${type}list.txt"));
 $list = explode("\n", $rawList);
 
 // Get rid of empty lines
@@ -16,16 +18,16 @@ for($i = sizeof($list)-1; $i >= 0; $i--) {
         unset($list[$i]);
 }
 
-function filterArray(&$a) {
-    $sanArray = array();
-    foreach ($a as $k=>$v) {
-        if (is_array($v)) {
-            $sanArray[htmlspecialchars($k)] = filterArray($v);
+function filterArray(&$inArray) {
+    $outArray = array();
+    foreach ($inArray as $key=>$value) {
+        if (is_array($value)) {
+            $outArray[htmlspecialchars($key)] = filterArray($value);
         } else {
-            $sanArray[htmlspecialchars($k)] = htmlspecialchars($v);
+            $outArray[htmlspecialchars($key)] = htmlspecialchars($value);
         }
     }
-    return $sanArray;
+    return $outArray;
 }
 
 // Protect against XSS attacks
diff --git a/php/loginpage.php b/php/loginpage.php
new file mode 100644
index 00000000..a0366dfb
--- /dev/null
+++ b/php/loginpage.php
@@ -0,0 +1,54 @@
+<div class="mainbox col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <div style="text-align: center;"><img src="img/logo.svg" width="<?php if ($boxedlayout) { ?>50%<?php } else { ?>30%<?php } ?>"></div><br>
+
+      <div class="panel-title text-center"><span class="logo-lg" style="font-size: 25px;"><b>Pi</b>-hole</span></div>
+      <p class="login-box-msg">Sign in to start your session</p>
+      <?php if ($wrongpassword) { ?>
+        <div class="form-group has-error login-box-msg">
+          <label class="control-label"><i class="fa fa-times-circle-o"></i> Wrong password!</label>
+        </div>
+      <?php } ?>
+    </div>
+
+    <div class="panel-body">
+      <form action="" method="post">
+        <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
+          <input type="password" name="pw" class="form-control" placeholder="Password" autofocus>
+          <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+        </div>
+        <div class="row">
+          <div class="col-xs-4 col-xs-offset-8">
+            <button type="submit" href="#" class="btn btn-primary pull-right"><i class="glyphicon glyphicon-log-in"></i>&nbsp;&nbsp;&nbsp;Log in</button>
+          </div>
+        </div>
+        <br>
+        <div class="row">
+          <div class="col-xs-12">
+            <div class="box box-<?php if (!$wrongpassword) { ?>info<?php } else { ?>danger<?php }
+            if (!$wrongpassword) { ?> collapsed-box<?php } ?> box-solid">
+              <div class="box-header with-border">
+                <h3 class="box-title">Forgot password</h3>
+
+                <div class="box-tools pull-right">
+                  <button type="button" class="btn btn-box-tool" data-widget="collapse"><i
+                      class="fa <?php if ($wrongpassword) { ?>fa-minus<?php } else { ?>fa-plus<?php } ?>"></i>
+                  </button>
+                </div>
+              </div>
+              <div class="box-body">
+                After installing Pi-Hole for the first time, a password is generated and displayed to the user. The
+                password cannot be retrived later on, but it is possible to set a new password (or explicitly disable
+                the
+                password by setting an empty password) using the command
+                <pre>sudo pihole -a -p newpassword</pre>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>
diff --git a/php/password.php b/php/password.php
index 549771cd..1c1ce4c0 100644
--- a/php/password.php
+++ b/php/password.php
@@ -20,6 +20,8 @@
         session_unset();
     }
 
+    $wrongpassword = false;
+
     // Test if password is set
     if(strlen($pwhash) > 0)
     {
@@ -32,6 +34,10 @@
                 $_SESSION["hash"] = $pwhash;
                 $auth = true;
             }
+            else
+            {
+                $wrongpassword = true;
+            }
         }
         // Compare auth hash with saved hash
         else if (isset($_SESSION["hash"]))
diff --git a/php/savesettings.php b/php/savesettings.php
index 3eca95bb..ded7f3fd 100644
--- a/php/savesettings.php
+++ b/php/savesettings.php
@@ -9,10 +9,24 @@ function validIP($address){
 	return !filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false;
 }
 
+// Check for existance of variable
+// and test it only if it exists
+function istrue(&$argument) {
+	$ret = false;
+	if(isset($argument))
+	{
+		if($argument)
+		{
+			$ret = true;
+		}
+	}
+	return $ret;
+}
+
 // Credit: http://stackoverflow.com/a/4694816/2087442
 function validDomain($domain_name)
 {
-	$validChars = preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name);
+	$validChars = preg_match("/^([_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([a-z\d])*)+$/i", $domain_name);
 	$lengthCheck = preg_match("/^.{1,253}$/", $domain_name);
 	$labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name);
 	return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label
@@ -95,7 +109,14 @@ function readAdlists(&$list, $listname)
 				// Get secondary DNS server IP address
 				if($secondaryDNS === "Custom")
 				{
-					$secondaryIP = $_POST["DNS2IP"];
+					if(strlen($_POST["DNS2IP"]) > 0)
+					{
+						$secondaryIP = $_POST["DNS2IP"];
+					}
+					else
+					{
+						$secondaryIP = "none";
+					}
 				}
 				else
 				{
@@ -103,7 +124,7 @@ function readAdlists(&$list, $listname)
 				}
 
 				// Validate secondary IP
-				if (!validIP($secondaryIP) && strlen($secondaryIP) > 0)
+				if (!validIP($secondaryIP) && $secondaryIP != "none" && strlen($secondaryIP) > 0)
 				{
 					$error .= "Secondary IP (".$secondaryIP.") is invalid!<br>";
 				}
@@ -235,22 +256,42 @@ function readAdlists(&$list, $listname)
 				}
 				else
 				{
-					exec("sudo pihole -a setquerylog none");
+					exec("sudo pihole -a setquerylog nothing");
 					$success .= "No entries will be shown in Query Log";
 				}
 
+				if(isset($_POST["resolve-forward"]))
+				{
+					exec("sudo pihole -a resolve forward true");
+				}
+				else
+				{
+					exec("sudo pihole -a resolve forward false");
+				}
+
+				if(isset($_POST["resolve-clients"]))
+				{
+					exec("sudo pihole -a resolve clients true");
+				}
+				else
+				{
+					exec("sudo pihole -a resolve clients false");
+				}
+
 				break;
 
 			case "webUI":
 				if($_POST["tempunit"] == "F")
 				{
 					exec('sudo pihole -a -f');
-					$success .= "The webUI settings have been updated";
+				}
+				elseif($_POST["tempunit"] == "K")
+				{
+					exec('sudo pihole -a -k');
 				}
 				else
 				{
 					exec('sudo pihole -a -c');
-					$success .= "The webUI settings have been updated";
 				}
 				if(isset($_POST["boxedlayout"]))
 				{
@@ -260,6 +301,7 @@ function readAdlists(&$list, $listname)
 				{
 					exec('sudo pihole -a layout traditional');
 				}
+				$success .= "The webUI settings have been updated";
 				break;
 
 			case "reboot":
diff --git a/queries.php b/queries.php
index 153b5cbf..8907367f 100644
--- a/queries.php
+++ b/queries.php
@@ -23,6 +23,10 @@ if(isset($setupVars["API_QUERY_LOG_SHOW"]))
 	{
 		$showing = "(showing blocked queries only)";
 	}
+	elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing")
+	{
+		$showing = "(showing no queries at all)";
+	}
 }
 
 ?>
diff --git a/settings.php b/settings.php
index e76ebd50..45b00439 100644
--- a/settings.php
+++ b/settings.php
@@ -106,10 +106,17 @@
 	{
 		$DHCP = false;
 		// Try to guess initial settings
-		$DHCPdomain = explode(".",$piHoleIPv4);
-		$DHCPstart  = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".201";
-		$DHCPend    = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".251";
-		$DHCProuter = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".1";
+		if($piHoleIPv4 !== "unknown") {
+			$DHCPdomain = explode(".",$piHoleIPv4);
+			$DHCPstart  = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".201";
+			$DHCPend    = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".251";
+			$DHCProuter = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".1";
+		}
+		else {
+			$DHCPstart  = "";
+			$DHCPend    = "";
+			$DHCProuter = "";
+		}
 	}
 	if(isset($setupVars["PIHOLE_DOMAIN"])){
 		$piHoleDomain = $setupVars["PIHOLE_DOMAIN"];
@@ -140,7 +147,7 @@
 								<input type="text" class="form-control DHCPgroup" name="to" value="<?php echo $DHCPend; ?>" data-inputmask="'alias': 'ip'" data-mask <?php if(!$DHCP){ ?>disabled<?php } ?>>
 						</div>
 					</div>
-					<label>Router IP address</label>
+					<label>Router (gateway) IP address</label>
 					<div class="col-md-12">
 						<div class="input-group">
 							<div class="input-group-addon">Router</div>
@@ -361,7 +368,7 @@
 	{
 		$excludedDomains = explode(",", $setupVars["API_EXCLUDE_DOMAINS"]);
 	} else {
-		$excludedDomains = "";
+		$excludedDomains = [];
 	}
 
 	// Exluded clients in API Query Log call
@@ -369,7 +376,7 @@
 	{
 		$excludedClients = explode(",", $setupVars["API_EXCLUDE_CLIENTS"]);
 	} else {
-		$excludedClients = "";
+		$excludedClients = [];
 	}
 
 	// Exluded clients
@@ -379,6 +386,25 @@
 	} else {
 		$queryLog = "all";
 	}
+
+	if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"]))
+	{
+		$resolveForward = true;
+	}
+	else
+	{
+		$resolveForward = false;
+	}
+
+	if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"]))
+	{
+		$resolveClients = true;
+	}
+	else
+	{
+		$resolveClients = false;
+	}
+
 ?>
 		<div class="box box-success">
 			<div class="box-header with-border">
@@ -400,10 +426,28 @@
 					<textarea name="clients" class="form-control" rows="4" placeholder="Enter one IP address per line"><?php foreach ($excludedClients as $client) { echo $client."\n"; } ?></textarea>
 					</div>
 				</div>
+				<h4>Reverse DNS lookup</h4>
+				<p>Try to determine the domain name via querying the Pi-hole for</p>
+				<div class="col-lg-6">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="resolve-forward" <?php if($resolveForward){ ?>checked<?php } ?>> Forward Destinations</label></div>
+					</div>
+				</div>
+				<div class="col-lg-6">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="resolve-clients" <?php if($resolveClients){ ?>checked<?php } ?>> Top Clients</label></div>
+					</div>
+				</div>
 				<h4>Query Log</h4>
-				<div class="form-group">
-					<div class="checkbox"><label><input type="checkbox" name="querylog-permitted" <?php if($queryLog === "permittedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show permitted queries</label></div>
-					<div class="checkbox"><label><input type="checkbox" name="querylog-blocked" <?php if($queryLog === "blockedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show blocked queries</label></div>
+				<div class="col-lg-6">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="querylog-permitted" <?php if($queryLog === "permittedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show permitted queries</label></div>
+					</div>
+				</div>
+				<div class="col-lg-6">
+					<div class="form-group">
+						<div class="checkbox"><label><input type="checkbox" name="querylog-blocked" <?php if($queryLog === "blockedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show blocked queries</label></div>
+					</div>
 				</div>
 			</div>
 			<div class="box-footer">
@@ -452,6 +496,7 @@
 				<h4>CPU Temperature Unit</h4>
 				<div class="form-group">
 					<div class="radio"><label><input type="radio" name="tempunit" value="C" <?php if($temperatureunit === "C"){ ?>checked<?php } ?> >Celsius</label></div>
+					<div class="radio"><label><input type="radio" name="tempunit" value="K" <?php if($temperatureunit === "K"){ ?>checked<?php } ?> >Kelvin</label></div>
 					<div class="radio"><label><input type="radio" name="tempunit" value="F" <?php if($temperatureunit === "F"){ ?>checked<?php } ?> >Fahrenheit</label></div>
 				</div>
 			</div>
diff --git a/taillog.php b/taillog.php
new file mode 100644
index 00000000..16b46801
--- /dev/null
+++ b/taillog.php
@@ -0,0 +1,18 @@
+<?php
+    require "header.php";
+?>
+<!-- Title -->
+<div class="page-header">
+    <h1>Output the last lines of the pihole.log file (live)</h1>
+</div>
+
+<div class="checkbox"><label><input type="checkbox" name="active" checked id="chk1"> Automatic scrolling on update</label></div>
+<pre id="output" style="width: 100%; height: 100%;"></pre>
+<div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
+
+<?php
+    require "footer.php";
+?>
+
+
+<script src="js/pihole/taillog.js"></script>