From 5ffd9038b507d7296524042968165a4499301c51 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Mon, 18 Jul 2022 18:05:41 -0300
Subject: [PATCH 1/3] Fix LCARS menu (add grouping headers)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/header.php | 10 ++++++++++
 style/themes/lcars.css         | 20 ++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 7a835455..1db7200b 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -422,6 +422,8 @@ if($auth) {
                 <?php } ?>
                 <?php if($auth){ ?>
 
+            </ul>
+            <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">Analysis</li>
                 <!-- Query Log -->
                 <li<?php if($scriptname === "queries.php"){ ?> class="active"<?php } ?>>
@@ -455,6 +457,8 @@ if($auth) {
                     </li>
                   </ul>
                 </li>
+            </ul>
+            <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">Group Management</li>
                 <!-- Group Management -->
                 <li<?php if($scriptname === "groups.php"){ ?> class="active"<?php } ?>>
@@ -477,6 +481,8 @@ if($auth) {
                         <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists</span>
                     </a>
                 </li>
+            </ul>
+            <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">DNS Control</li>
                 <!-- Enable/Disable Blocking -->
                 <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden<?php } ?>>
@@ -544,6 +550,8 @@ if($auth) {
                     </li>
                   </ul>
                 </li>
+            </ul>
+            <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">System</li>
                 <!-- Tools -->
                 <li class="treeview<?php if (in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
@@ -633,6 +641,8 @@ if($auth) {
                     </a>
                 </li>
                 <?php } ?>
+            </ul>
+            <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">Support</li>
                  <!-- Docs -->
                  <li>
diff --git a/style/themes/lcars.css b/style/themes/lcars.css
index 2515c6cd..7847a09b 100644
--- a/style/themes/lcars.css
+++ b/style/themes/lcars.css
@@ -749,12 +749,16 @@ p.login-box-msg,
 }
 
 .sidebar-menu > li.header {
-  display: none;
+  padding: 0.5em;
+  text-align: left;
+  color: #000;
+  background: #CCE6FF;
+  margin: 4px 0 0;
 }
 
 .sidebar-menu > li > a {
   margin: 4px 0 0;
-  padding: 38px 15px 5px;
+  padding: 30px 15px 5px;
   background: #8bf;
   border-left: none;
 }
@@ -763,16 +767,8 @@ p.login-box-msg,
   background-color: #48f;
 }
 
-.sidebar-menu > li:last-child > a {
-  background-color: #cce6ff;
-}
-
-.sidebar-menu > li:nth-last-child(2) > a {
-  background-color: #cb7;
-}
-
-.sidebar-menu > li:nth-last-child(3) > a {
-  background-color: #04f;
+.sidebar-menu:last-child > li > a {
+  background-color: #26f;
 }
 
 .sidebar-menu > li:hover > a,

From e79a1d15357d062fa95dc1c22c4e9865d04570c4 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Mon, 18 Jul 2022 18:11:55 -0300
Subject: [PATCH 2/3] Move `require "footer.php"` to loginpage.php

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/header.php    | 27 +++++++++++++--------------
 scripts/pi-hole/php/loginpage.php |  6 +++++-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 1db7200b..93e6e082 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -671,18 +671,17 @@ if($auth) {
         <!-- Main content -->
         <section class="content">
 <?php
-    // If password is not equal to the password set
-    // in the setupVars.conf file, then we skip any
-    // content and just complete the page. If no
-    // password is set at all, we keep the current
-    // behavior: everything is always authorized
-    // and will be displayed
-    //
-    // 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']))){
-        require "scripts/pi-hole/php/loginpage.php";
-        require "footer.php";
-        exit();
-    }
+// If password is not equal to the password set
+// in the setupVars.conf file, then we skip any
+// content and just complete the page. If no
+// password is set at all, we keep the current
+// behavior: everything is always authorized
+// and will be displayed
+//
+// 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']))) {
+    require "scripts/pi-hole/php/loginpage.php";
+    exit();
+}
 ?>
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 6a2339c0..06843e4d 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -4,7 +4,8 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */ ?>
+*  Please see LICENSE file for your rights under this license. */
+?>
 
 <div class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2" style="float:none">
   <div class="panel panel-default">
@@ -69,3 +70,6 @@
     </div>
   </div>
 </div>
+<?php
+require "scripts/pi-hole/php/footer.php";
+?>

From 79187b1258800af3613cb22fb7c45325eb6b3003 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Mon, 18 Jul 2022 18:29:21 -0300
Subject: [PATCH 3/3] Simplify `header.php`

- move some functions to `func.php`
- move sidebar to its own file `sidebar.php`
- fix indentation
- LCARS CSS: hide menu headers when logged off
- LCARS CSS: invert hover and active menu colors

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/func.php    |  24 ++
 scripts/pi-hole/php/header.php  | 562 ++++++--------------------------
 scripts/pi-hole/php/sidebar.php | 339 +++++++++++++++++++
 settings.php                    |  33 +-
 style/themes/lcars.css          |  21 +-
 5 files changed, 485 insertions(+), 494 deletions(-)
 create mode 100644 scripts/pi-hole/php/sidebar.php

diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index 7aac976a..2017657b 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -595,4 +595,28 @@ function convertUnicodeToIDNA($IDNA) {
 
     return $IDNA;
 }
+
+// Return PID of FTL (used in settings.php)
+function pidofFTL() {
+    return shell_exec("pidof pihole-FTL");
+}
+
+// Get FTL process information (used in settings.php)
+function get_FTL_data($FTLpid, $arg) {
+    return trim(exec("ps -p " . $FTLpid . " -o " . $arg));
+}
+
+// Convert seconds into readable time (used in settings.php)
+function convertseconds($argument) {
+    $seconds = round($argument);
+    if ($seconds < 60) {
+        return sprintf('%ds', $seconds);
+    } elseif ($seconds < 3600) {
+        return sprintf('%dm %ds', ($seconds / 60), ($seconds % 60));
+    } elseif ($seconds < 86400) {
+        return sprintf('%dh %dm %ds', ($seconds / 3600 % 24), ($seconds / 60 % 60), ($seconds % 60));
+    } else {
+        return sprintf('%dd %dh %dm %ds', ($seconds / 86400), ($seconds / 3600 % 24), ($seconds / 60 % 60), ($seconds % 60));
+    }
+}
 ?>
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 93e6e082..3b06edae 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -6,156 +6,138 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-    require "scripts/pi-hole/php/auth.php";
-    require "scripts/pi-hole/php/password.php";
-    require_once "scripts/pi-hole/php/FTL.php";
-    require_once "scripts/pi-hole/php/func.php";
-    require "scripts/pi-hole/php/theme.php";
-    $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
-    $hostname = gethostname() ? gethostname() : "";
+require "scripts/pi-hole/php/auth.php";
+require "scripts/pi-hole/php/password.php";
+require_once "scripts/pi-hole/php/FTL.php";
+require_once "scripts/pi-hole/php/func.php";
+require "scripts/pi-hole/php/theme.php";
+$scriptname = basename($_SERVER['SCRIPT_FILENAME']);
+$hostname = gethostname() ? gethostname() : "";
 
-    check_cors();
-
-    // Create cache busting version
-    $cacheVer = filemtime(__FILE__);
-
-    // Generate CSRF token
-    if(empty($_SESSION['token'])) {
-        $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
+// Return memory usage to show on status block
+function getMemUsage() {
+    $data = explode("\n", file_get_contents("/proc/meminfo"));
+    $meminfo = array();
+    if (count($data) > 0) {
+        foreach ($data as $line) {
+            $expl = explode(":", $line);
+            if (count($expl) == 2) {
+                // remove " kB" from the end of the string and make it an integer
+                $meminfo[$expl[0]] = intval(trim(substr($expl[1],0, -3)));
+            }
+        }
+        $memused = $meminfo["MemTotal"] - $meminfo["MemFree"] - $meminfo["Buffers"] - $meminfo["Cached"];
+        $memusage = $memused / $meminfo["MemTotal"];
+    } else {
+        $memusage = -1;
     }
-    $token = $_SESSION['token'];
 
-    // Try to get temperature value from different places (OS dependent)
-    if(file_exists("/sys/class/thermal/thermal_zone0/temp"))
-    {
+    return $memusage;
+}
+
+// Try to get temperature value from different places (OS dependent)
+// - return an array, containing the temperature and limit.
+function getTemperature() {
+    global $setupVars;
+
+    if (file_exists("/sys/class/thermal/thermal_zone0/temp")) {
         $output = rtrim(file_get_contents("/sys/class/thermal/thermal_zone0/temp"));
-    }
-    elseif (file_exists("/sys/class/hwmon/hwmon0/temp1_input"))
-    {
+    } elseif (file_exists("/sys/class/hwmon/hwmon0/temp1_input")) {
         $output = rtrim(file_get_contents("/sys/class/hwmon/hwmon0/temp1_input"));
-    }
-    else
-    {
+    } else {
         $output = "";
     }
 
     // Test if we succeeded in getting the temperature
-    if(is_numeric($output))
-    {
+    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) {
+        if ($celsius > 1000) {
             // Use multiplication to get around the division-by-zero error
             $celsius *= 1e-3;
         }
 
         // Get user-defined temperature limit if set
-        if(isset($setupVars['TEMPERATURE_LIMIT']))
-        {
-            $temperaturelimit = intval($setupVars['TEMPERATURE_LIMIT']);
+        if (isset($setupVars['TEMPERATURE_LIMIT'])) {
+            $limit = intval($setupVars['TEMPERATURE_LIMIT']);
+        } else {
+            $limit = 60;
         }
-        else
-        {
-            $temperaturelimit = 60;
-        }
-    }
-    else
-    {
+
+    } else {
         // Nothing can be colder than -273.15 degree Celsius (= 0 Kelvin)
         // This is the minimum temperature possible (AKA absolute zero)
         $celsius = -273.16;
         // Set templimit to null if no tempsensor was found
-        $temperaturelimit = null;
+        $limit = null;
     }
 
-    // Get load
-    $loaddata = sys_getloadavg();
-    foreach ($loaddata as $key => $value) {
-        $loaddata[$key] = round($value, 2);
-    }
-    // Get number of processing units available to PHP
-    // (may be less than the number of online processors)
-    $nproc = shell_exec('nproc');
-    if(!is_numeric($nproc))
-    {
-        $cpuinfo = file_get_contents('/proc/cpuinfo');
-        preg_match_all('/^processor/m', $cpuinfo, $matches);
-        $nproc = count($matches[0]);
-    }
+    return [$celsius, $limit];
+}
 
-    // Get memory usage
-    $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;
-    }
+check_cors();
 
-    if($auth) {
-        // For session timer
-        $maxlifetime = ini_get("session.gc_maxlifetime");
+// Create cache busting version
+$cacheVer = filemtime(__FILE__);
 
-        // Generate CSRF token
-        if(empty($_SESSION['token'])) {
-            $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
-        }
-        $token = $_SESSION['token'];
-    }
+// Generate CSRF token
+if (empty($_SESSION['token'])) {
+    $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
+}
+$token = $_SESSION['token'];
 
-    if(isset($setupVars['WEBUIBOXEDLAYOUT']))
-    {
-        if($setupVars['WEBUIBOXEDLAYOUT'] === "boxed")
-        {
-            $boxedlayout = true;
-        }
-        else
-        {
-            $boxedlayout = false;
-        }
+if ($auth) {
+    // For session timer
+    $maxlifetime = ini_get("session.gc_maxlifetime");
+
+    // Generate CSRF token
+    if (empty($_SESSION['token'])) {
+        $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
     }
-    else
-    {
+    $token = $_SESSION['token'];
+}
+
+// Get temperature
+list($celsius, $temperaturelimit) = getTemperature();
+
+// Get CPU load
+$loaddata = sys_getloadavg();
+foreach ($loaddata as $key => $value) {
+    $loaddata[$key] = round($value, 2);
+}
+
+// Get number of processing units available to PHP
+// (may be less than the number of online processors)
+$nproc = shell_exec('nproc');
+if (!is_numeric($nproc)) {
+    $cpuinfo = file_get_contents('/proc/cpuinfo');
+    preg_match_all('/^processor/m', $cpuinfo, $matches);
+    $nproc = count($matches[0]);
+}
+
+// Get memory usage
+$memory_usage = getMemUsage();
+
+// Retrieve layout setting from setupVars
+if (isset($setupVars['WEBUIBOXEDLAYOUT']) && !($setupVars['WEBUIBOXEDLAYOUT'] === "boxed")) {
+    $boxedlayout = false;
+} else {
+    $boxedlayout = true;
+}
+
+// Override layout setting if layout is changed via Settings page
+if (isset($_POST["field"])) {
+    if ($_POST["field"] === "webUI" && isset($_POST["boxedlayout"])) {
         $boxedlayout = true;
+    } elseif ($_POST["field"] === "webUI" && !isset($_POST["boxedlayout"])) {
+        $boxedlayout = false;
     }
+}
 
-    // Override layout setting if layout is changed via Settings page
-    if(isset($_POST["field"]))
-    {
-        if($_POST["field"] === "webUI" && isset($_POST["boxedlayout"]))
-        {
-            $boxedlayout = true;
-        }
-        elseif($_POST["field"] === "webUI" && !isset($_POST["boxedlayout"]))
-        {
-            $boxedlayout = false;
-        }
-    }
-
-    function pidofFTL()
-    {
-        return shell_exec("pidof pihole-FTL");
-    }
-    $FTLpid = intval(pidofFTL());
-    $FTL = ($FTLpid !== 0 ? true : false);
-
-    $piholeFTLConf = piholeFTLConfig();
+$piholeFTLConf = piholeFTLConfig();
 ?>
 <!doctype html>
 <!-- Pi-hole: A black hole for Internet advertisements
@@ -321,351 +303,9 @@ if($auth) {
             </div>
         </nav>
     </header>
-    <!-- Left side column. contains the logo and sidebar -->
-    <aside class="main-sidebar">
-        <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar">
-            <!-- Sidebar user panel -->
-            <div class="user-panel">
-                <div class="pull-left image">
-                    <img src="img/logo.svg" alt="Pi-hole logo">
-                </div>
-                <div class="pull-left info">
-                    <p>Status</p>
-                    <?php
-                    $pistatus = piholeStatus();
-                    if ($pistatus == 53) {
-                        echo '<span id="status"><i class="fa fa-w fa-circle text-green-light"></i> Active</span>';
-                    } elseif ($pistatus == 0) {
-                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Blocking disabled</span>';
-                    } elseif ($pistatus == -1) {
-                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> DNS service not running</span>';
-                    } elseif ($pistatus == -2) {
-                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Unknown</span>';
-                    } else {
-                        echo '<span id="status"><i class="fa fa-w fa-circle text-orange"></i> DNS service on port '.$pistatus.'</span>';
-                    }
-                    ?>
-                    <br/>
-                    <?php
-                    echo '<span title="Detected '.$nproc.' cores"><i class="fa fa-w fa-circle ';
-                    if ($loaddata[0] > $nproc) {
-                        echo "text-red";
-                    } else {
-                        echo "text-green-light";
-                    }
-                    echo '"></i> Load:&nbsp;&nbsp;' . $loaddata[0] . "&nbsp;&nbsp;" . $loaddata[1] . "&nbsp;&nbsp;". $loaddata[2] . "</span>";
-                    ?>
-                    <br/>
-                    <?php
-                    echo '<span><i class="fa fa-w fa-circle ';
-                    if ($memory_usage > 0.75 || $memory_usage < 0.0) {
-                        echo "text-red";
-                    } else {
-                        echo "text-green-light";
-                    }
-                    if($memory_usage > 0.0) {
-                        echo '"></i> Memory usage:&nbsp;&nbsp;' . sprintf("%.1f",100.0*$memory_usage) . "&thinsp;%</span>";
-                    } else {
-                        echo '"></i> Memory usage:&nbsp;&nbsp; N/A</span>';
-                    }
-                    ?>
-                    <br/>
-                    <?php
-                      if ($celsius >= -273.15) {
-                        // Only show temp info if any data is available -->
-                        $tempcolor = "text-vivid-blue";
-                        if (isset($temperaturelimit) && $celsius > $temperaturelimit) {
-                          $tempcolor = "text-red";
-                        }
-                        echo '<span id="temperature"><i class="fa fa-w fa-fire '.$tempcolor.'" style="width: 1em !important"></i> ';
-                        echo 'Temp:&nbsp;<span id="rawtemp" hidden>' .$celsius. '</span>';
-                        echo '<span id="tempdisplay"></span></span>';
-                      }
-                    ?>
-                </div>
-            </div>
-            <!-- sidebar menu: : style can be found in sidebar.less -->
-            <?php
-            if(!$auth && (!isset($indexpage) || isset($_GET['login'])))
-            {
-                $scriptname = "login";
-            }
-            ?>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">Main</li>
-                <!-- Home Page -->
-                <li<?php if($scriptname === "index.php"){ ?> class="active"<?php } ?>>
-                    <a href="index.php">
-                        <i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span>
-                    </a>
-                </li>
-                <!-- Logout -->
-                <?php
-                // Show Logout button if $auth is set and authorization is required
-                if(strlen($pwhash) > 0 && $auth) { ?>
-                <li>
-                    <a href="?logout">
-                        <i class="fa fa-fw menu-icon fa-sign-out-alt"></i> <span>Logout</span>
-                    </a>
-                </li>
-                <?php } ?>
-                <!-- Login -->
-                <?php
-                // Show Login button if $auth is *not* set and authorization is required
-                if(strlen($pwhash) > 0 && !$auth) { ?>
-                <li<?php if($scriptname === "login"){ ?> class="active"<?php } ?>>
-                    <a href="index.php?login">
-                        <i class="fa fa-fw menu-icon fa-user"></i> <span>Login</span>
-                    </a>
-                </li>
-                <?php } ?>
-                <?php if($auth){ ?>
-
-            </ul>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">Analysis</li>
-                <!-- Query Log -->
-                <li<?php if($scriptname === "queries.php"){ ?> class="active"<?php } ?>>
-                    <a href="queries.php">
-                        <i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span>
-                    </a>
-                </li>
-                <!-- Long-term database -->
-                <li class="treeview<?php if($scriptname === "db_queries.php" || $scriptname === "db_lists.php" || $scriptname === "db_graph.php"){ ?> active<?php } ?>">
-                  <a href="#">
-                    <i class="fa fa-fw menu-icon fa-history"></i> <span>Long-term Data</span>
-                    <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                  </a>
-                  <ul class="treeview-menu">
-                    <li<?php if($scriptname === "db_graph.php"){ ?> class="active"<?php } ?>>
-                        <a href="db_graph.php">
-                            <i class="fa fa-fw menu-icon fa-chart-bar"></i> Graphics
-                        </a>
-                    </li>
-                    <li<?php if($scriptname === "db_queries.php"){ ?> class="active"<?php } ?>>
-                        <a href="db_queries.php">
-                            <i class="fa fa-fw menu-icon fa-file-alt"></i> Query Log
-                        </a>
-                    </li>
-                    <li<?php if($scriptname === "db_lists.php"){ ?> class="active"<?php } ?>>
-                        <a href="db_lists.php">
-                            <i class="fa fa-fw menu-icon fa-list"></i> Top Lists
-                        </a>
-                    </li>
-                  </ul>
-                </li>
-            </ul>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">Group Management</li>
-                <!-- Group Management -->
-                <li<?php if($scriptname === "groups.php"){ ?> class="active"<?php } ?>>
-                    <a href="groups.php">
-                        <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups</span>
-                    </a>
-                </li>
-                <li<?php if($scriptname === "groups-clients.php"){ ?> class="active"<?php } ?>>
-                    <a href="groups-clients.php">
-                        <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients</span>
-                    </a>
-                </li>
-                <li<?php if($scriptname === "groups-domains.php"){ ?> class="active"<?php } ?>>
-                    <a href="groups-domains.php">
-                        <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains</span>
-                    </a>
-                </li>
-                <li<?php if($scriptname === "groups-adlists.php"){ ?> class="active"<?php } ?>>
-                    <a href="groups-adlists.php">
-                        <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists</span>
-                    </a>
-                </li>
-            </ul>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">DNS Control</li>
-                <!-- Enable/Disable Blocking -->
-                <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden<?php } ?>>
-                  <a href="#">
-                    <i class="fa fa-fw menu-icon fa-stop"></i> <span>Disable Blocking&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
-                    <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                  </a>
-                  <ul class="treeview-menu">
-                    <li>
-                        <a href="#" id="pihole-disable-indefinitely">
-                            <i class="fa fa-fw menu-icon fa-infinity"></i> Indefinitely
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" id="pihole-disable-10s">
-                            <i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" id="pihole-disable-30s">
-                            <i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" id="pihole-disable-5m">
-                            <i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes
-                        </a>
-                    </li>
-                    <li>
-                      <a href="#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
-                            <i class="fa fa-fw menu-icon fa-user-clock"></i> Custom time
-                      </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 (!in_array($pistatus,["0","-1","-2"])) { ?> hidden<?php } ?>>
-                    <a href="#">
-                      <i class="fa fa-fw menu-icon fa-play"></i>
-                      <span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp;
-                        <span id="flip-status-enable"></span>
-                      </span>
-                    </a>
-                </li>
-                <!-- Local DNS Records -->
-                <li class="treeview <?php if(in_array($scriptname, array("dns_records.php", "cname_records.php"))){ ?>active<?php } ?>">
-                  <a href="#">
-                    <i class="fa fa-fw menu-icon fa-address-book"></i> <span>Local DNS</span>
-                    <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                  </a>
-                  <ul class="treeview-menu">
-                    <li<?php if($scriptname === "dns_records.php"){ ?> class="active"<?php } ?>>
-                        <a href="dns_records.php">
-                            <i class="fa fa-fw menu-icon fa-address-book"></i> DNS Records
-                        </a>
-                    </li>
-                    <li<?php if($scriptname === "cname_records.php"){ ?> class="active"<?php } ?>>
-                        <a href="cname_records.php">
-                            <i class="fa fa-fw menu-icon fa-address-book"></i> CNAME Records
-                        </a>
-                    </li>
-                  </ul>
-                </li>
-            </ul>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">System</li>
-                <!-- Tools -->
-                <li class="treeview<?php if (in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
-                  <a href="#">
-                    <i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span>
-                    <span class="warning-count hidden"></span>
-                    <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                  </a>
-                  <ul class="treeview-menu">
-                    <!-- Pi-hole diagnosis -->
-                    <li<?php if($scriptname === "messages.php"){ ?> class="active"<?php } ?>>
-                        <a href="messages.php">
-                            <i class="fa fa-fw menu-icon fa-file-medical-alt"></i> Pi-hole diagnosis
-                            <span class="pull-right-container warning-count hidden"></span>
-                        </a>
-                    </li>
-                    <!-- Run gravity.sh -->
-                    <li<?php if($scriptname === "gravity.php"){ ?> class="active"<?php } ?>>
-                        <a href="gravity.php">
-                            <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> Update Gravity
-                        </a>
-                    </li>
-                    <!-- Query Lists -->
-                    <li<?php if($scriptname === "queryads.php"){ ?> class="active"<?php } ?>>
-                        <a href="queryads.php">
-                            <i class="fa fa-fw menu-icon fa-search"></i> Search Adlists
-                        </a>
-                    </li>
-                    <!-- Audit log -->
-                    <li<?php if($scriptname === "auditlog.php"){ ?> class="active"<?php } ?>>
-                        <a href="auditlog.php">
-                            <i class="fa fa-fw menu-icon fa-balance-scale"></i> Audit log
-                        </a>
-                    </li>
-                    <!-- Tail pihole.log -->
-                    <li<?php if($scriptname === "taillog.php"){ ?> class="active"<?php } ?>>
-                        <a href="taillog.php">
-                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" preserveAspectRatio="xMidYMid meet" height="14" viewBox="0 0 200 200" class="svg-inline--fa custom-menu-icon fa-w-20 fa-fw menu-icon">
-                                <g>
-                                    <linearGradient id="svg_1_1_" gradientUnits="userSpaceOnUse" x1="-317.0903" y1="393.5137" x2="-316.0898" y2="393.5137" gradientTransform="matrix(94.8803 0 0 -56.7359 30129.9492 22362.8691)">
-                                        <stop offset="0.051" style="stop-color:currentColor;stop-opacity:0.6"/>
-                                        <stop offset="0.95" style="stop-color:currentColor"/>
-                                    </linearGradient>
-                                    <path id="svg_1" fill="url(#svg_1_1_)" d="M89.247,64.579C66.298,62.131,43.179,44.785,41.354,8.083 c35.612,0,54.656,21.082,56.496,54.486c6.734-40.069,38.301-35.372,38.301-35.372c1.499,22.708-17.148,36.475-38.301,37.621 c-5.942-12.521-41.541-43.238-41.541-43.238c-0.042-0.036-0.104-0.03-0.14,0.011c-0.024,0.028-0.03,0.067-0.016,0.102 C56.153,21.694,90.506,51.619,89.247,64.579"/>
-                                    <path id="svg_2" opacity="0.6" fill="currentColor" d="M100,191.916c-2.221-0.127-22.949-0.92-24.208-24.208 c-1.019-14.148,10.159-24.576,10.159-38.314c-2.533-34.253-48.431-30.009-48.431,0c-0.019,7.5,2.949,14.699,8.249,20.007 l34.197,34.211c5.307,5.299,12.506,8.268,20.006,8.248"/>
-                                    <path id="svg_3" fill="currentColor" d="M162.48,129.408c-0.127,2.221-0.92,22.949-24.209,24.208 c-14.148,1.019-24.59-10.159-38.314-10.159c-34.254,2.533-30.009,48.417,0,48.417c7.5,0.019,14.699-2.949,20.006-8.249 l34.226-34.197c5.299-5.307,8.268-12.506,8.248-20.006"/>
-                                    <path id="svg_4" opacity="0.6" fill="currentColor" d="M100,66.928c2.221,0.127,22.949,0.919,24.209,24.208 c1.018,14.149-10.159,24.576-10.159,38.314c2.532,34.254,48.417,30.009,48.417,0c0.019-7.5-2.949-14.698-8.25-20.006 l-34.211-34.226c-5.307-5.3-12.506-8.268-20.006-8.249"/>
-                                    <path id="svg_5" fill="currentColor" d="M37.633,129.408c0.127-2.222,0.92-22.949,24.208-24.209 c14.148-1.019,24.59,10.159,38.314,10.159c34.254-2.575,30.009-48.417,0-48.417c-7.5-0.019-14.699,2.949-20.006,8.249 l-34.226,34.212c-5.299,5.307-8.268,12.506-8.249,20.006"/>
-                                </g>
-                            </svg>
-                            Tail pihole.log
-                        </a>
-                    </li>
-                    <!-- Tail FTL.log -->
-                    <li<?php if($scriptname === "taillog-FTL.php"){ ?> class="active"<?php } ?>>
-                        <a href="taillog-FTL.php">
-                            <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" preserveAspectRatio="xMidYMid meet" height="14" viewBox="0 0 400 340" class="svg-inline--fa custom-menu-icon fa-w-20 fa-fw menu-icon">
-                                <g fill="currentColor">
-                                    <path opacity=".6" d="M42.315 11h111.078l-7.381 31.378H34.898L42.315 11z"/>
-                                    <path d="M237.368 42.207q-13.098 62.242-26.23 124.486h-37.354q13.135-62.244 26.23-124.486h-39.652l7.381-31.174h132.055l-7.639 31.174h-54.791zm87.03 94.016L351.124 11h-37.18q-16.584 77.846-33.199 155.693h103.356v-30.47h-59.703zM32.428 67.509l-22.316 99.184h31.807l16.068-67.908h59.41l7.381-31.326-92.35.05z"/>
-                                    <path opacity=".6" d="M10 186.2a283.868 283.868 0 0 1 42.976-2.992c26.697 0 44.014 4.806 57.58 15.023 14.604 10.853 23.782 28.17 23.782 52.991 0 26.914-9.798 45.487-23.364 56.96-14.806 12.31-37.348 18.154-64.882 18.154A276.442 276.442 0 0 1 10 324.29V186.2zm31.922 114.726a57.564 57.564 0 0 0 11.054.636c28.79.201 47.564-15.659 47.564-49.24.217-29.208-16.899-44.65-44.231-44.65a66.665 66.665 0 0 0-14.387 1.241v92.013zm113.283 24.015V184.325h37.209l29.146 51.595a408.098 408.098 0 0 1 22.945 48.06h.62a523.847 523.847 0 0 1-2.697-58.618v-41.037h29.208V324.94h-33.394l-30.046-54.262a523.459 523.459 0 0 1-24.402-49.611l-.62.201c.821 18.605 1.24 38.402 1.24 61.348v42.355l-29.209-.03zm145.004-32.759a81.099 81.099 0 0 0 35.27 8.76c14.605 0 22.326-6.047 22.326-15.225 0-8.76-6.682-13.767-23.581-19.829-23.364-8.123-38.604-21.069-38.604-41.518 0-23.984 20.03-42.355 53.208-42.355a86.246 86.246 0 0 1 35.89 7.1l-7.1 25.658a66.804 66.804 0 0 0-29.456-6.666c-13.783 0-20.45 6.201-20.45 13.55 0 8.976 7.923 12.945 26.077 19.829 24.806 9.178 36.511 22.108 36.511 41.937 0 23.58-18.155 43.611-56.743 43.611-16.077 0-31.921-4.186-39.86-8.558l6.512-26.294z"/>
-                                </g>
-                            </svg>
-                            Tail FTL.log
-                        </a>
-                    </li>
-                    <!-- Generate debug log -->
-                    <li<?php if($scriptname === "debug.php"){ ?> class="active"<?php } ?>>
-                        <a href="debug.php">
-                            <i class="fa fa-fw menu-icon fa-ambulance"></i> Generate debug log
-                        </a>
-                    </li>
-                    <!-- Network -->
-                    <li<?php if($scriptname === "network.php"){ ?> class="active"<?php } ?>>
-                        <a href="network.php">
-                            <i class="fa fa-fw menu-icon fa-network-wired"></i> Network
-                        </a>
-                    </li>
-                  </ul>
-                </li>
-                <!-- Settings -->
-                <li<?php if($scriptname === "settings.php"){ ?> class="active"<?php } ?>>
-                    <a href="settings.php">
-                        <i class="fa fa-fw menu-icon fa-cog"></i> <span>Settings</span>
-                    </a>
-                </li>
-                <?php } ?>
-            </ul>
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header text-uppercase">Support</li>
-                 <!-- Docs -->
-                 <li>
-                    <a href="https://docs.pi-hole.net/" rel="noopener" target="_blank">
-                        <i class="fa fa-fw menu-icon fa-question-circle"></i> <span>Documentation</span>
-                    </a>
-                </li>
-                <!-- Discourse -->
-                <li>
-                    <a href="https://discourse.pi-hole.net/" rel="noopener" target="_blank">
-                        <i class="fa fa-fw menu-icon fab fa-discourse"></i> <span>Pi-hole Forum</span>
-                    </a>
-                </li>
-                <!-- Donate -->
-                <li>
-                    <a href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
-                        <i class="fas fa-fw menu-icon fa-donate"></i> <span>Donate</span>
-                    </a>
-                </li>
-            </ul>
-        </section>
-        <!-- /.sidebar -->
-    </aside>
+<?php
+require "scripts/pi-hole/php/sidebar.php";
+?>
     <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
         <!-- Main content -->
diff --git a/scripts/pi-hole/php/sidebar.php b/scripts/pi-hole/php/sidebar.php
new file mode 100644
index 00000000..28ca3a52
--- /dev/null
+++ b/scripts/pi-hole/php/sidebar.php
@@ -0,0 +1,339 @@
+    <!-- Left side column. contains the logo and sidebar -->
+    <aside class="main-sidebar">
+        <!-- sidebar: style can be found in sidebar.less -->
+        <section class="sidebar">
+            <!-- Sidebar user panel -->
+            <div class="user-panel">
+                <div class="pull-left image">
+                    <img src="img/logo.svg" alt="Pi-hole logo">
+                </div>
+                <div class="pull-left info">
+                    <p>Status</p>
+                    <?php
+                    $pistatus = piholeStatus();
+                    if ($pistatus == 53) {
+                        echo '<span id="status"><i class="fa fa-w fa-circle text-green-light"></i> Active</span>';
+                    } elseif ($pistatus == 0) {
+                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Blocking disabled</span>';
+                    } elseif ($pistatus == -1) {
+                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> DNS service not running</span>';
+                    } elseif ($pistatus == -2) {
+                        echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Unknown</span>';
+                    } else {
+                        echo '<span id="status"><i class="fa fa-w fa-circle text-orange"></i> DNS service on port '.$pistatus.'</span>';
+                    }
+                    ?>
+                    <br/>
+                    <?php
+                    echo '<span title="Detected '.$nproc.' cores"><i class="fa fa-w fa-circle ';
+                    if ($loaddata[0] > $nproc) {
+                        echo "text-red";
+                    } else {
+                        echo "text-green-light";
+                    }
+                    echo '"></i> Load:&nbsp;&nbsp;' . $loaddata[0] . "&nbsp;&nbsp;" . $loaddata[1] . "&nbsp;&nbsp;". $loaddata[2] . "</span>";
+                    ?>
+                    <br/>
+                    <?php
+                    echo '<span><i class="fa fa-w fa-circle ';
+                    if ($memory_usage > 0.75 || $memory_usage < 0.0) {
+                        echo "text-red";
+                    } else {
+                        echo "text-green-light";
+                    }
+                    if($memory_usage > 0.0) {
+                        echo '"></i> Memory usage:&nbsp;&nbsp;' . sprintf("%.1f",100.0*$memory_usage) . "&thinsp;%</span>";
+                    } else {
+                        echo '"></i> Memory usage:&nbsp;&nbsp; N/A</span>';
+                    }
+                    ?>
+                    <br/>
+                    <?php
+                      if ($celsius >= -273.15) {
+                        // Only show temp info if any data is available -->
+                        $tempcolor = "text-vivid-blue";
+                        if (isset($temperaturelimit) && $celsius > $temperaturelimit) {
+                          $tempcolor = "text-red";
+                        }
+                        echo '<span id="temperature"><i class="fa fa-w fa-fire '.$tempcolor.'" style="width: 1em !important"></i> ';
+                        echo 'Temp:&nbsp;<span id="rawtemp" hidden>' .$celsius. '</span>';
+                        echo '<span id="tempdisplay"></span></span>';
+                      }
+                    ?>
+                </div>
+            </div>
+            <!-- sidebar menu: : style can be found in sidebar.less -->
+            <?php
+            if(!$auth && (!isset($indexpage) || isset($_GET['login'])))
+            {
+                $scriptname = "login";
+            }
+            ?>
+            <ul class="sidebar-menu" data-widget="tree">
+                <li class="header text-uppercase">Main</li>
+                <!-- Home Page -->
+                <li<?php if($scriptname === "index.php"){ ?> class="active"<?php } ?>>
+                    <a href="index.php">
+                        <i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span>
+                    </a>
+                </li>
+                <!-- Logout -->
+                <?php
+                // Show Logout button if $auth is set and authorization is required
+                if(strlen($pwhash) > 0 && $auth) { ?>
+                <li>
+                    <a href="?logout">
+                        <i class="fa fa-fw menu-icon fa-sign-out-alt"></i> <span>Logout</span>
+                    </a>
+                </li>
+                <?php } ?>
+                <!-- Login -->
+                <?php
+                // Show Login button if $auth is *not* set and authorization is required
+                if(strlen($pwhash) > 0 && !$auth) { ?>
+                <li<?php if($scriptname === "login"){ ?> class="active"<?php } ?>>
+                    <a href="index.php?login">
+                        <i class="fa fa-fw menu-icon fa-user"></i> <span>Login</span>
+                    </a>
+                </li>
+                <?php } ?>
+                <?php if($auth){ ?>
+
+                <li class="header text-uppercase">Analysis</li>
+                <!-- Query Log -->
+                <li<?php if($scriptname === "queries.php"){ ?> class="active"<?php } ?>>
+                    <a href="queries.php">
+                        <i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span>
+                    </a>
+                </li>
+                <!-- Long-term database -->
+                <li class="treeview<?php if($scriptname === "db_queries.php" || $scriptname === "db_lists.php" || $scriptname === "db_graph.php"){ ?> active<?php } ?>">
+                  <a href="#">
+                    <i class="fa fa-fw menu-icon fa-history"></i> <span>Long-term Data</span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-left pull-right"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <li<?php if($scriptname === "db_graph.php"){ ?> class="active"<?php } ?>>
+                        <a href="db_graph.php">
+                            <i class="fa fa-fw menu-icon fa-chart-bar"></i> Graphics
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "db_queries.php"){ ?> class="active"<?php } ?>>
+                        <a href="db_queries.php">
+                            <i class="fa fa-fw menu-icon fa-file-alt"></i> Query Log
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "db_lists.php"){ ?> class="active"<?php } ?>>
+                        <a href="db_lists.php">
+                            <i class="fa fa-fw menu-icon fa-list"></i> Top Lists
+                        </a>
+                    </li>
+                  </ul>
+                </li>
+
+                <li class="header text-uppercase">Group Management</li>
+                <!-- Group Management -->
+                <li<?php if($scriptname === "groups.php"){ ?> class="active"<?php } ?>>
+                    <a href="groups.php">
+                        <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups</span>
+                    </a>
+                </li>
+                <li<?php if($scriptname === "groups-clients.php"){ ?> class="active"<?php } ?>>
+                    <a href="groups-clients.php">
+                        <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients</span>
+                    </a>
+                </li>
+                <li<?php if($scriptname === "groups-domains.php"){ ?> class="active"<?php } ?>>
+                    <a href="groups-domains.php">
+                        <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains</span>
+                    </a>
+                </li>
+                <li<?php if($scriptname === "groups-adlists.php"){ ?> class="active"<?php } ?>>
+                    <a href="groups-adlists.php">
+                        <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists</span>
+                    </a>
+                </li>
+
+                <li class="header text-uppercase">DNS Control</li>
+                <!-- Enable/Disable Blocking -->
+                <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden<?php } ?>>
+                  <a href="#">
+                    <i class="fa fa-fw menu-icon fa-stop"></i> <span>Disable Blocking&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-left pull-right"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <li>
+                        <a href="#" id="pihole-disable-indefinitely">
+                            <i class="fa fa-fw menu-icon fa-infinity"></i> Indefinitely
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-10s">
+                            <i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-30s">
+                            <i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#" id="pihole-disable-5m">
+                            <i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes
+                        </a>
+                    </li>
+                    <li>
+                      <a href="#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
+                            <i class="fa fa-fw menu-icon fa-user-clock"></i> Custom time
+                      </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 (!in_array($pistatus,["0","-1","-2"])) { ?> hidden<?php } ?>>
+                    <a href="#">
+                      <i class="fa fa-fw menu-icon fa-play"></i>
+                      <span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp;
+                        <span id="flip-status-enable"></span>
+                      </span>
+                    </a>
+                </li>
+                <!-- Local DNS Records -->
+                <li class="treeview <?php if(in_array($scriptname, array("dns_records.php", "cname_records.php"))){ ?>active<?php } ?>">
+                  <a href="#">
+                    <i class="fa fa-fw menu-icon fa-address-book"></i> <span>Local DNS</span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-left pull-right"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <li<?php if($scriptname === "dns_records.php"){ ?> class="active"<?php } ?>>
+                        <a href="dns_records.php">
+                            <i class="fa fa-fw menu-icon fa-address-book"></i> DNS Records
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "cname_records.php"){ ?> class="active"<?php } ?>>
+                        <a href="cname_records.php">
+                            <i class="fa fa-fw menu-icon fa-address-book"></i> CNAME Records
+                        </a>
+                    </li>
+                  </ul>
+                </li>
+
+                <li class="header text-uppercase">System</li>
+                <!-- Tools -->
+                <li class="treeview<?php if (in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
+                  <a href="#">
+                    <i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span>
+                    <span class="warning-count hidden"></span>
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-left pull-right"></i>
+                    </span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <!-- Pi-hole diagnosis -->
+                    <li<?php if($scriptname === "messages.php"){ ?> class="active"<?php } ?>>
+                        <a href="messages.php">
+                            <i class="fa fa-fw menu-icon fa-file-medical-alt"></i> Pi-hole diagnosis
+                            <span class="pull-right-container warning-count hidden"></span>
+                        </a>
+                    </li>
+                    <!-- Run gravity.sh -->
+                    <li<?php if($scriptname === "gravity.php"){ ?> class="active"<?php } ?>>
+                        <a href="gravity.php">
+                            <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> Update Gravity
+                        </a>
+                    </li>
+                    <!-- Query Lists -->
+                    <li<?php if($scriptname === "queryads.php"){ ?> class="active"<?php } ?>>
+                        <a href="queryads.php">
+                            <i class="fa fa-fw menu-icon fa-search"></i> Search Adlists
+                        </a>
+                    </li>
+                    <!-- Audit log -->
+                    <li<?php if($scriptname === "auditlog.php"){ ?> class="active"<?php } ?>>
+                        <a href="auditlog.php">
+                            <i class="fa fa-fw menu-icon fa-balance-scale"></i> Audit log
+                        </a>
+                    </li>
+                    <!-- Tail pihole.log -->
+                    <li<?php if($scriptname === "taillog.php"){ ?> class="active"<?php } ?>>
+                        <a href="taillog.php">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" preserveAspectRatio="xMidYMid meet" height="14" viewBox="0 0 200 200" class="svg-inline--fa custom-menu-icon fa-w-20 fa-fw menu-icon">
+                                <g>
+                                    <linearGradient id="svg_1_1_" gradientUnits="userSpaceOnUse" x1="-317.0903" y1="393.5137" x2="-316.0898" y2="393.5137" gradientTransform="matrix(94.8803 0 0 -56.7359 30129.9492 22362.8691)">
+                                        <stop offset="0.051" style="stop-color:currentColor;stop-opacity:0.6"/>
+                                        <stop offset="0.95" style="stop-color:currentColor"/>
+                                    </linearGradient>
+                                    <path id="svg_1" fill="url(#svg_1_1_)" d="M89.247,64.579C66.298,62.131,43.179,44.785,41.354,8.083 c35.612,0,54.656,21.082,56.496,54.486c6.734-40.069,38.301-35.372,38.301-35.372c1.499,22.708-17.148,36.475-38.301,37.621 c-5.942-12.521-41.541-43.238-41.541-43.238c-0.042-0.036-0.104-0.03-0.14,0.011c-0.024,0.028-0.03,0.067-0.016,0.102 C56.153,21.694,90.506,51.619,89.247,64.579"/>
+                                    <path id="svg_2" opacity="0.6" fill="currentColor" d="M100,191.916c-2.221-0.127-22.949-0.92-24.208-24.208 c-1.019-14.148,10.159-24.576,10.159-38.314c-2.533-34.253-48.431-30.009-48.431,0c-0.019,7.5,2.949,14.699,8.249,20.007 l34.197,34.211c5.307,5.299,12.506,8.268,20.006,8.248"/>
+                                    <path id="svg_3" fill="currentColor" d="M162.48,129.408c-0.127,2.221-0.92,22.949-24.209,24.208 c-14.148,1.019-24.59-10.159-38.314-10.159c-34.254,2.533-30.009,48.417,0,48.417c7.5,0.019,14.699-2.949,20.006-8.249 l34.226-34.197c5.299-5.307,8.268-12.506,8.248-20.006"/>
+                                    <path id="svg_4" opacity="0.6" fill="currentColor" d="M100,66.928c2.221,0.127,22.949,0.919,24.209,24.208 c1.018,14.149-10.159,24.576-10.159,38.314c2.532,34.254,48.417,30.009,48.417,0c0.019-7.5-2.949-14.698-8.25-20.006 l-34.211-34.226c-5.307-5.3-12.506-8.268-20.006-8.249"/>
+                                    <path id="svg_5" fill="currentColor" d="M37.633,129.408c0.127-2.222,0.92-22.949,24.208-24.209 c14.148-1.019,24.59,10.159,38.314,10.159c34.254-2.575,30.009-48.417,0-48.417c-7.5-0.019-14.699,2.949-20.006,8.249 l-34.226,34.212c-5.299,5.307-8.268,12.506-8.249,20.006"/>
+                                </g>
+                            </svg>
+                            Tail pihole.log
+                        </a>
+                    </li>
+                    <!-- Tail FTL.log -->
+                    <li<?php if($scriptname === "taillog-FTL.php"){ ?> class="active"<?php } ?>>
+                        <a href="taillog-FTL.php">
+                            <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" preserveAspectRatio="xMidYMid meet" height="14" viewBox="0 0 400 340" class="svg-inline--fa custom-menu-icon fa-w-20 fa-fw menu-icon">
+                                <g fill="currentColor">
+                                    <path opacity=".6" d="M42.315 11h111.078l-7.381 31.378H34.898L42.315 11z"/>
+                                    <path d="M237.368 42.207q-13.098 62.242-26.23 124.486h-37.354q13.135-62.244 26.23-124.486h-39.652l7.381-31.174h132.055l-7.639 31.174h-54.791zm87.03 94.016L351.124 11h-37.18q-16.584 77.846-33.199 155.693h103.356v-30.47h-59.703zM32.428 67.509l-22.316 99.184h31.807l16.068-67.908h59.41l7.381-31.326-92.35.05z"/>
+                                    <path opacity=".6" d="M10 186.2a283.868 283.868 0 0 1 42.976-2.992c26.697 0 44.014 4.806 57.58 15.023 14.604 10.853 23.782 28.17 23.782 52.991 0 26.914-9.798 45.487-23.364 56.96-14.806 12.31-37.348 18.154-64.882 18.154A276.442 276.442 0 0 1 10 324.29V186.2zm31.922 114.726a57.564 57.564 0 0 0 11.054.636c28.79.201 47.564-15.659 47.564-49.24.217-29.208-16.899-44.65-44.231-44.65a66.665 66.665 0 0 0-14.387 1.241v92.013zm113.283 24.015V184.325h37.209l29.146 51.595a408.098 408.098 0 0 1 22.945 48.06h.62a523.847 523.847 0 0 1-2.697-58.618v-41.037h29.208V324.94h-33.394l-30.046-54.262a523.459 523.459 0 0 1-24.402-49.611l-.62.201c.821 18.605 1.24 38.402 1.24 61.348v42.355l-29.209-.03zm145.004-32.759a81.099 81.099 0 0 0 35.27 8.76c14.605 0 22.326-6.047 22.326-15.225 0-8.76-6.682-13.767-23.581-19.829-23.364-8.123-38.604-21.069-38.604-41.518 0-23.984 20.03-42.355 53.208-42.355a86.246 86.246 0 0 1 35.89 7.1l-7.1 25.658a66.804 66.804 0 0 0-29.456-6.666c-13.783 0-20.45 6.201-20.45 13.55 0 8.976 7.923 12.945 26.077 19.829 24.806 9.178 36.511 22.108 36.511 41.937 0 23.58-18.155 43.611-56.743 43.611-16.077 0-31.921-4.186-39.86-8.558l6.512-26.294z"/>
+                                </g>
+                            </svg>
+                            Tail FTL.log
+                        </a>
+                    </li>
+                    <!-- Generate debug log -->
+                    <li<?php if($scriptname === "debug.php"){ ?> class="active"<?php } ?>>
+                        <a href="debug.php">
+                            <i class="fa fa-fw menu-icon fa-ambulance"></i> Generate debug log
+                        </a>
+                    </li>
+                    <!-- Network -->
+                    <li<?php if($scriptname === "network.php"){ ?> class="active"<?php } ?>>
+                        <a href="network.php">
+                            <i class="fa fa-fw menu-icon fa-network-wired"></i> Network
+                        </a>
+                    </li>
+                  </ul>
+                </li>
+                <!-- Settings -->
+                <li<?php if($scriptname === "settings.php"){ ?> class="active"<?php } ?>>
+                    <a href="settings.php">
+                        <i class="fa fa-fw menu-icon fa-cog"></i> <span>Settings</span>
+                    </a>
+                </li>
+                <?php } ?>
+
+                <li class="header text-uppercase">Support</li>
+                 <!-- Docs -->
+                 <li>
+                    <a href="https://docs.pi-hole.net/" rel="noopener" target="_blank" class="menu-support">
+                        <i class="fa fa-fw menu-icon fa-question-circle"></i> <span>Documentation</span>
+                    </a>
+                </li>
+                <!-- Discourse -->
+                <li>
+                    <a href="https://discourse.pi-hole.net/" rel="noopener" target="_blank" class="menu-support">
+                        <i class="fa fa-fw menu-icon fab fa-discourse"></i> <span>Pi-hole Forum</span>
+                    </a>
+                </li>
+                <!-- Donate -->
+                <li>
+                    <a href="https://pi-hole.net/donate/" rel="noopener" target="_blank" class="menu-support">
+                        <i class="fas fa-fw menu-icon fa-donate"></i> <span>Donate</span>
+                    </a>
+                </li>
+            </ul>
+        </section>
+        <!-- /.sidebar -->
+    </aside>
diff --git a/settings.php b/settings.php
index 4c55087e..431016ae 100644
--- a/settings.php
+++ b/settings.php
@@ -233,13 +233,8 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                                     <div class="row">
                                         <div class="col-lg-12">
                                             <?php
-                                            if ($FTL) {
-                                                function get_FTL_data($arg)
-                                                {
-                                                    global $FTLpid;
-                                                    return trim(exec("ps -p " . $FTLpid . " -o " . $arg));
-                                                }
-
+                                            $FTLpid = intval(pidofFTL());
+                                            if ($FTLpid !== 0) {
                                                 $FTLversion = exec("/usr/bin/pihole-FTL version");
                                             ?>
                                             <table class="table table-striped table-bordered nowrap">
@@ -254,25 +249,25 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">Time FTL started:</th>
-                                                        <td><?php print_r(get_FTL_data("lstart")); echo " ".$timezone; ?></td>
+                                                        <td><?php print_r(get_FTL_data($FTLpid, "lstart")); echo " ".$timezone; ?></td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">User / Group:</th>
-                                                        <td><?php print_r(get_FTL_data("euser")); ?> / <?php print_r(get_FTL_data("egroup")); ?></td>
+                                                        <td><?php print_r(get_FTL_data($FTLpid, "euser")); ?> / <?php print_r(get_FTL_data($FTLpid, "egroup")); ?></td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">Total CPU utilization:</th>
-                                                        <td><?php print_r(get_FTL_data("%cpu")); ?>%</td>
+                                                        <td><?php print_r(get_FTL_data($FTLpid, "%cpu")); ?>%</td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">Memory utilization:</th>
-                                                        <td><?php print_r(get_FTL_data("%mem")); ?>%</td>
+                                                        <td><?php print_r(get_FTL_data($FTLpid, "%mem")); ?>%</td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">
                                                             <span title="Resident memory is the portion of memory occupied by a process that is held in main memory (RAM). The rest of the occupied memory exists in the swap space or file system.">Used memory:</span>
                                                         </th>
-                                                        <td><?php echo formatSizeUnits(1e3 * floatval(get_FTL_data("rss"))); ?></td>
+                                                        <td><?php echo formatSizeUnits(1e3 * floatval(get_FTL_data($FTLpid, "rss"))); ?></td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">
@@ -559,20 +554,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                                 if (!is_resource($dhcpleases))
                                     $leasesfile = false;
 
-                                function convertseconds($argument)
-                                {
-                                    $seconds = round($argument);
-                                    if ($seconds < 60) {
-                                        return sprintf('%ds', $seconds);
-                                    } elseif ($seconds < 3600) {
-                                        return sprintf('%dm %ds', ($seconds / 60), ($seconds % 60));
-                                    } elseif ($seconds < 86400) {
-                                        return sprintf('%dh %dm %ds', ($seconds / 3600 % 24), ($seconds / 60 % 60), ($seconds % 60));
-                                    } else {
-                                        return sprintf('%dd %dh %dm %ds', ($seconds / 86400), ($seconds / 3600 % 24), ($seconds / 60 % 60), ($seconds % 60));
-                                    }
-                                }
-
                                 while (!feof($dhcpleases) && $leasesfile) {
                                     $line = explode(" ", trim(fgets($dhcpleases)));
                                     if (count($line) == 5) {
diff --git a/style/themes/lcars.css b/style/themes/lcars.css
index 7847a09b..b44691fd 100644
--- a/style/themes/lcars.css
+++ b/style/themes/lcars.css
@@ -749,11 +749,17 @@ p.login-box-msg,
 }
 
 .sidebar-menu > li.header {
-  padding: 0.5em;
+  margin: 4px 0 0;
+  padding: 0.5em 1em;
   text-align: left;
   color: #000;
-  background: #CCE6FF;
-  margin: 4px 0 0;
+  background: #cce6ff;
+  font-size: 11px;
+}
+
+/* Hide menu headers if not logged in */
+body:not(.logged-in) .sidebar-menu > li.header {
+  display: none;
 }
 
 .sidebar-menu > li > a {
@@ -764,17 +770,18 @@ p.login-box-msg,
 }
 
 .sidebar-menu > li.active > a {
-  background-color: #48f;
+  background-color: #eda;
+  box-shadow: inset 0 0 18px #ba7;
 }
 
-.sidebar-menu:last-child > li > a {
+.sidebar-menu > li > a.menu-support {
   background-color: #26f;
 }
 
 .sidebar-menu > li:hover > a,
 .sidebar-menu > li > a:focus {
-  background-color: #eda;
-  box-shadow: inset 0 0 18px #ba7;
+  background-color: #48f;
+  box-shadow: none;
 }
 
 .sidebar-menu > li > .treeview-menu {