diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
deleted file mode 100644
index adc09008..00000000
--- a/.github/workflows/phpstan.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: PHPStan
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3.3.0
-
-    - name: Install composer
-      uses: php-actions/composer@v6
-
-    - name: Run PHPStan
-      uses: php-actions/phpstan@v3
-      with:
-        configuration: phpstan.neon.dist
-        memory_limit: 256M
-
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
deleted file mode 100644
index 6f5fe642..00000000
--- a/phpstan.neon.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-parameters:
-    level: 0
-    excludePaths:
-        - vendor
-    scanDirectories:
-        - .
-    paths:
-        - .
diff --git a/queries.php b/queries.php
index bda2fa9b..30c45dfa 100644
--- a/queries.php
+++ b/queries.php
@@ -5,7 +5,7 @@
 *
 *    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/header_authenticated.php";
+require 'scripts/pi-hole/php/header_authenticated.php';
 ?>
 <!-- Alert Modal -->
 <div id="alertModal" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
@@ -194,48 +194,50 @@
 
 <div class="row">
     <div class="col-md-12">
-      <div class="box" id="recent-queries">
-        <div class="box-header with-border">
-          <h3 class="box-title">Recent Queries</h3>
-          <a id="refresh" href="#" class="btn btn-sm btn-info btn-flat pull-right">Refresh</a>
+        <div class="box" id="recent-queries">
+            <div class="box-header with-border">
+                <h3 class="box-title">Recent Queries</h3>
+                <a id="refresh" href="#" class="btn btn-sm btn-info btn-flat pull-right">Refresh</a>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+                <p>Click on a query log item to obtain additional information for this query.</p>
+                <table id="all-queries" class="table table-striped table-bordered" width="100%">
+                    <thead>
+                        <tr>
+                            <th>Time</th>
+                            <th></th>
+                            <th>Type</th>
+                            <th>Domain</th>
+                            <th>Client</th>
+                        </tr>
+                    </thead>
+                    <tfoot>
+                        <tr>
+                            <th>Time</th>
+                            <th></th>
+                            <th>Type</th>
+                            <th>Domain</th>
+                            <th>Client</th>
+                        </tr>
+                    </tfoot>
+                </table>
+                <p>Note: Queries for <code>pi.hole</code> and the hostname are never logged.</p>
+            </div>
+            <!-- /.box-body -->
         </div>
-        <!-- /.box-header -->
-        <div class="box-body">
-            <p>Click on a query log item to obtain additional information for this query.</p>
-            <table id="all-queries" class="table table-striped table-bordered" width="100%">
-                <thead>
-                    <tr>
-                        <th>Time</th>
-                        <th></th>
-                        <th>Type</th>
-                        <th>Domain</th>
-                        <th>Client</th>
-                    </tr>
-                </thead>
-                <tfoot>
-                    <tr>
-                        <th>Time</th>
-                        <th></th>
-                        <th>Type</th>
-                        <th>Domain</th>
-                        <th>Client</th>
-                    </tr>
-                </tfoot>
-            </table>
-            <p>Note: Queries for <code>pi.hole</code> and the hostname are never logged.</p>
-        </div>
-        <!-- /.box-body -->
+        <!-- /.box -->
     </div>
-    <!-- /.box -->
+    <!-- /.col -->
 </div>
 <!-- /.row -->
 
-<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js') ?>"></script>
-<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js') ?>"></script>
-<script src="<?php echo fileversion('scripts/vendor/daterangepicker.min.js') ?>"></script>
-<script src="<?php echo fileversion('scripts/pi-hole/js/utils.js') ?>"></script>
-<script src="<?php echo fileversion('scripts/pi-hole/js/queries.js') ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/daterangepicker.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/utils.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/queries.js'); ?>"></script>
 
 <?php
-    require "scripts/pi-hole/php/footer.php";
+    require 'scripts/pi-hole/php/footer.php';
 ?>
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index 2a38b3d1..31a2414d 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -163,6 +163,37 @@ function updateInfo() {
   updateSystemInfo();
   updateSensorsInfo();
   updateVersionInfo();
+  updateFtlInfo();
+}
+
+var ftlinfoTimer = null;
+function updateFtlInfo() {
+  $.ajax({
+    url: "/api/info/ftl",
+  })
+    .done(function (data) {
+      var ftl = data.ftl;
+      var database = ftl.database;
+      var intl = new Intl.NumberFormat();
+      $("#num_groups").text(intl.format(database.groups));
+      $("#num_clients").text(intl.format(database.clients));
+      $("#num_lists").text(intl.format(database.lists));
+      $("#num_gravity").text(intl.format(database.gravity));
+      $("#num_allowed").text(intl.format(database.domains.allowed));
+      $("#num_denied").text(intl.format(database.domains.denied));
+
+      $("#sysinfo-cpu-ftl").text("(" + ftl["%cpu"].toFixed(1) + "% used by FTL)");
+      $("#sysinfo-ram-ftl").text("(" + ftl["%mem"].toFixed(1) + "% used by FTL)");
+      $("#sysinfo-pid-ftl").text(ftl.pid);
+      $("#sysinfo-privacy_level").text(ftl.privacy_level);
+      $("#sysinfo-ftl-overlay").hide();
+      // Update every 120 seconds
+      clearTimeout(ftlinfoTimer);
+      ftlinfoTimer = setTimeout(updateFtlInfo, 120000);
+    })
+    .fail(function (data) {
+      apiFailure(data);
+    });
 }
 
 function updateSystemInfo() {
@@ -171,25 +202,37 @@ function updateSystemInfo() {
   })
     .done(function (data) {
       var system = data.system;
-      var memory = (100 * system.memory.ram.used) / system.memory.ram.total;
-      var totalGB = 1e-6 * system.memory.ram.total;
+      var percentRAM = system.memory.ram["%used"];
+      var percentSwap = system.memory.swap["%used"];
+      var totalRAMGB = system.memory.ram.total / 1024 / 1024;
+      var totalSwapGB = system.memory.swap.total / 1024 / 1024;
       var swap =
         system.memory.swap.total > 0
-          ? ((1e-6 * system.memory.swap.used) / system.memory.swap.total).toFixed(1) + " %"
+          ? ((1e2 * system.memory.swap.used) / system.memory.swap.total).toFixed(1) + " %"
           : "N/A";
       var color;
-      color = memory > 75 ? "text-red" : "text-green-light";
+      color = percentRAM > 75 ? "text-red" : "text-green-light";
       $("#memory").html(
         '<i class="fa fa-circle ' +
           color +
           '"></i>&nbsp;Memory usage:&nbsp;' +
-          memory.toFixed(1) +
+          percentRAM.toFixed(1) +
           "&thinsp;%"
       );
       $("#memory").prop(
         "title",
-        "Total memory: " + totalGB.toFixed(1) + " GB, Swap usage: " + swap
+        "Total memory: " + totalRAMGB.toFixed(1) + " GB, Swap usage: " + swap
       );
+      $("#sysinfo-memory-ram").text(
+        percentRAM.toFixed(1) + "% of " + totalRAMGB.toFixed(1) + " GB is used"
+      );
+      if (system.memory.swap.total > 0) {
+        $("#sysinfo-memory-swap").text(
+          percentSwap.toFixed(1) + "% of " + totalSwapGB.toFixed(1) + " GB is used"
+        );
+      } else {
+        $("#sysinfo-memory-swap").text("No swap space available");
+      }
 
       color = system.cpu.load.percent[0] > 100 ? "text-red" : "text-green-light";
       $("#cpu").html(
@@ -213,6 +256,20 @@ function updateSystemInfo() {
           system.procs +
           " processes"
       );
+      $("#sysinfo-cpu").text(
+        system.cpu.load.percent[0].toFixed(1) +
+          "% (load: " +
+          system.cpu.load.raw[0].toFixed(2) +
+          " " +
+          system.cpu.load.raw[1].toFixed(2) +
+          " " +
+          system.cpu.load.raw[2].toFixed(2) +
+          ") on " +
+          system.cpu.nprocs +
+          " cores running " +
+          system.procs +
+          " processes"
+      );
 
       var startdate = moment()
         .subtract(system.uptime, "seconds")
@@ -225,6 +282,10 @@ function updateSystemInfo() {
           startdate +
           ")"
       );
+      $("#sysinfo-uptime").text(
+        moment.duration(1000 * system.uptime).humanize() + " (running since " + startdate + ")"
+      );
+      $("#sysinfo-system-overlay").hide();
       // Update every 20 seconds
       clearTimeout(systemTimer);
       systemTimer = setTimeout(updateSystemInfo, 20000);
diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 1acf786d..ea76ea52 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -5,10 +5,76 @@
  *  This file is copyright under the latest version of the EUPL.
  *  Please see LICENSE file for your rights under this license. */
 
-/* global utils:false, checkMessages:false */
+/* global utils:false, checkMessages:false, apiFailure:false */
 var token = $("#token").text();
 
+var hostinfoTimer = null;
+function updateHostInfo() {
+  $.ajax({
+    url: "/api/info/host",
+  })
+    .done(function (data) {
+      var host = data.host;
+      var uname = host.uname;
+      if (uname.domainname !== "(none)") {
+        $("#sysinfo-hostname").text(uname.nodename + "." + uname.domainname);
+      } else {
+        $("#sysinfo-hostname").text(uname.nodename);
+      }
+
+      $("#sysinfo-kernel").text(
+        uname.sysname +
+          " " +
+          uname.nodename +
+          " " +
+          uname.release +
+          " " +
+          uname.version +
+          " " +
+          uname.machine
+      );
+      // Update every 120 seconds
+      clearTimeout(hostinfoTimer);
+      hostinfoTimer = setTimeout(updateHostInfo, 120000);
+    })
+    .fail(function (data) {
+      apiFailure(data);
+    });
+}
+
+var cacheinfoTimer = null;
+function updateCacheInfo() {
+  $.ajax({
+    url: "/api/info/cache",
+  })
+    .done(function (data) {
+      var cache = data.cache;
+      $("#sysinfo-cache-size").text(cache.size);
+      $("#sysinfo-cache-inserted").text(cache.inserted);
+      $("#sysinfo-cache-evicted").text(cache.evicted);
+      $("#sysinfo-cache-expired").text(cache.expired);
+      $("#sysinfo-cache-immortal").text(cache.immortal);
+      $("#sysinfo-cache-valid-a").text(cache.valid.a);
+      $("#sysinfo-cache-valid-aaaa").text(cache.valid.aaaa);
+      $("#sysinfo-cache-valid-cname").text(cache.valid.cname);
+      $("#sysinfo-cache-valid-srv").text(cache.valid.srv);
+      $("#sysinfo-cache-valid-ds").text(cache.valid.ds);
+      $("#sysinfo-cache-valid-dnskey").text(cache.valid.dnskey);
+      $("#sysinfo-cache-valid-other").text(cache.valid.other);
+      $("#sysinfo-cache-overlay").hide();
+      // Update every 10 seconds
+      clearTimeout(cacheinfoTimer);
+      cacheinfoTimer = setTimeout(updateCacheInfo, 10000);
+    })
+    .fail(function (data) {
+      apiFailure(data);
+    });
+}
+
 $(function () {
+  updateHostInfo();
+  updateCacheInfo();
+
   $("[data-static]").on("click", function () {
     var row = $(this).closest("tr");
     var mac = row.find("#MAC").text();
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index df128552..48297557 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -133,388 +133,6 @@ if (!function_exists('hash_equals')) {
     }
 }
 
-/**
- * More safely execute a command with pihole shell script.
- *
- * For example,
- *
- *   pihole_execute("-h");
- *
- * would execute command
- *
- *   sudo pihole -h
- *
- * and returns output of that command as a string.
- *
- * @param $argument_string String of arguments to run pihole with
- */
-function pihole_execute($argument_string)
-{
-    $escaped = escapeshellcmd($argument_string);
-    $output = null;
-    $return_status = -1;
-    $command = 'sudo pihole '.$escaped;
-    exec($command, $output, $return_status);
-    if ($return_status !== 0) {
-        trigger_error("Executing {$command} failed.", E_USER_WARNING);
-    }
-
-    return $output;
-}
-
-// Custom DNS
-$customDNSFile = '/etc/pihole/custom.list';
-
-function echoCustomDNSEntries()
-{
-    $entries = getCustomDNSEntries();
-
-    $data = array();
-    foreach ($entries as $entry) {
-        $data[] = array($entry->domain, $entry->ip);
-    }
-
-    return array('data' => $data);
-}
-
-function getCustomDNSEntries()
-{
-    global $customDNSFile;
-
-    $entries = array();
-
-    $handle = fopen($customDNSFile, 'r');
-    if ($handle) {
-        while (($line = fgets($handle)) !== false) {
-            $line = str_replace("\r", '', $line);
-            $line = str_replace("\n", '', $line);
-            $explodedLine = explode(' ', $line);
-
-            if (count($explodedLine) != 2) {
-                continue;
-            }
-
-            $data = array();
-            $data["ip"] = $explodedLine[0];
-            $data["domain"] = $explodedLine[1];
-            $data["domains"] = array_slice($explodedLine, 0, -1);
-            $entries[] = $data;
-        }
-
-        fclose($handle);
-    }
-
-    return $entries;
-}
-
-function addCustomDNSEntry($ip = '', $domain = '', $reload = '', $json = true)
-{
-    try {
-        if (isset($_REQUEST['ip'])) {
-            $ip = trim($_REQUEST['ip']);
-        }
-
-        if (isset($_REQUEST['domain'])) {
-            $domain = trim($_REQUEST['domain']);
-        }
-
-        if (isset($_REQUEST['reload'])) {
-            $reload = $_REQUEST['reload'];
-        }
-
-        if (empty($ip)) {
-            return returnError('IP must be set', $json);
-        }
-
-        $ipType = get_ip_type($ip);
-
-        if (!$ipType) {
-            return returnError('IP must be valid', $json);
-        }
-
-        if (empty($domain)) {
-            return returnError('Domain must be set', $json);
-        }
-
-        $num = 0;
-        // Check if each submitted domain is valid
-        $domains = array_map('trim', explode(',', $domain));
-        foreach ($domains as $d) {
-            if (!validDomain($d)) {
-                return returnError("Domain '{$d}' is not valid", $json);
-            }
-            ++$num;
-        }
-
-        // Only check for duplicates if adding new records from the web UI (not through Teleporter)
-        if (isset($_REQUEST['ip']) || isset($_REQUEST['domain'])) {
-            $existingEntries = getCustomDNSEntries();
-            foreach ($existingEntries as $entry) {
-                foreach ($domains as $d) {
-                    if ($entry->domain == $d && get_ip_type($entry->ip) == $ipType) {
-                        return returnError("The domain {$d} already has a custom DNS entry for an IPv".$ipType, $json);
-                    }
-                }
-            }
-        }
-
-        // if $reload is not set and more then one domain is supplied, restart FTL only once after all entries were added
-        if (($num > 0) && (empty($reload))) {
-            $reload = 'false';
-        }
-        // Add records
-        foreach ($domains as $domain) {
-            pihole_execute('-a addcustomdns '.$ip.' '.$domain.' '.$reload);
-        }
-        if ($num > 0) {
-            pihole_execute('restartdns');
-        }
-
-        return returnSuccess('', $json);
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage(), $json);
-    }
-}
-
-function deleteCustomDNSEntry()
-{
-    try {
-        $ip = !empty($_REQUEST['ip']) ? $_REQUEST['ip'] : '';
-        $domain = !empty($_REQUEST['domain']) ? $_REQUEST['domain'] : '';
-
-        if (empty($ip)) {
-            return returnError('IP must be set');
-        }
-
-        if (empty($domain)) {
-            return returnError('Domain must be set');
-        }
-
-        $existingEntries = getCustomDNSEntries();
-
-        $found = false;
-        foreach ($existingEntries as $entry) {
-            if ($entry->domain == $domain) {
-                if ($entry->ip == $ip) {
-                    $found = true;
-
-                    break;
-                }
-            }
-        }
-
-        if (!$found) {
-            return returnError('This domain/ip association does not exist');
-        }
-
-        pihole_execute('-a removecustomdns '.$ip.' '.$domain);
-
-        return returnSuccess();
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage());
-    }
-}
-
-function deleteAllCustomDNSEntries($reload = '')
-{
-    try {
-        if (isset($_REQUEST['reload'])) {
-            $reload = $_REQUEST['reload'];
-        }
-
-        $existingEntries = getCustomDNSEntries();
-        // passing false to pihole_execute stops pihole from reloading after each entry has been deleted
-        foreach ($existingEntries as $entry) {
-            pihole_execute('-a removecustomdns '.$entry->ip.' '.$entry->domain.' '.$reload);
-        }
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage());
-    }
-
-    return returnSuccess();
-}
-
-// CNAME
-$customCNAMEFile = '/etc/dnsmasq.d/05-pihole-custom-cname.conf';
-
-function echoCustomCNAMEEntries()
-{
-    $entries = getCustomCNAMEEntries();
-
-    $data = array();
-    foreach ($entries as $entry) {
-        $data[] = array($entry->domain, $entry->target);
-    }
-
-    return array('data' => $data);
-}
-
-function getCustomCNAMEEntries()
-{
-    global $customCNAMEFile;
-
-    $entries = array();
-
-    if (!file_exists($customCNAMEFile)) {
-        return $entries;
-    }
-
-    $handle = fopen($customCNAMEFile, 'r');
-    if ($handle) {
-        while (($line = fgets($handle)) !== false) {
-            $line = str_replace('cname=', '', $line);
-            $line = str_replace("\r", '', $line);
-            $line = str_replace("\n", '', $line);
-            $explodedLine = explode(',', $line);
-
-            if (count($explodedLine) <= 1) {
-                continue;
-            }
-
-            $data = array();
-            $data["domains"] = array_slice($explodedLine, 0, -1);
-            $data["domain"] = implode(',', $data["domains"]);
-            $data["target"] = $explodedLine[count($explodedLine) - 1];
-            $entries[] = $data;
-        }
-
-        fclose($handle);
-    }
-
-    return $entries;
-}
-
-function addCustomCNAMEEntry($domain = '', $target = '', $reload = '', $json = true)
-{
-    try {
-        if (isset($_REQUEST['domain'])) {
-            $domain = $_REQUEST['domain'];
-        }
-
-        if (isset($_REQUEST['target'])) {
-            $target = trim($_REQUEST['target']);
-        }
-
-        if (isset($_REQUEST['reload'])) {
-            $reload = $_REQUEST['reload'];
-        }
-
-        if (empty($domain)) {
-            return returnError('Domain must be set', $json);
-        }
-
-        if (empty($target)) {
-            return returnError('Target must be set', $json);
-        }
-
-        if (!validDomain($target)) {
-            return returnError('Target must be valid', $json);
-        }
-
-        $num = 0;
-        $domains = array_map('trim', explode(',', $domain));
-        foreach ($domains as $d) {
-            // Check if each submitted domain is valid
-            if (!validDomain($d)) {
-                return returnError("Domain '{$d}' is not valid", $json);
-            }
-
-            // Check if each submitted domain is different than the target to avoid loops
-            if (strtolower($d) === strtolower($target)) {
-                return returnError('Domain and target cannot be the same', $json);
-            }
-
-            ++$num;
-        }
-
-        $existingEntries = getCustomCNAMEEntries();
-
-        // Check if a record for one of the domains already exists
-        foreach ($existingEntries as $entry) {
-            foreach ($domains as $d) {
-                if (in_array($d, $entry->domains)) {
-                    return returnError("There is already a CNAME record for '{$d}'", $json);
-                }
-            }
-        }
-
-        // if $reload is not set and more then one domain is supplied, restart FTL only once after all entries were added
-        if (($num > 0) && (empty($reload))) {
-            $reload = 'false';
-        }
-        // add records
-        foreach ($domains as $d) {
-            pihole_execute('-a addcustomcname '.$d.' '.$target.' '.$reload);
-        }
-
-        if ($num > 0) {
-            pihole_execute('restartdns');
-        }
-
-        return returnSuccess('', $json);
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage(), $json);
-    }
-}
-
-function deleteCustomCNAMEEntry()
-{
-    try {
-        $target = !empty($_REQUEST['target']) ? $_REQUEST['target'] : '';
-        $domain = !empty($_REQUEST['domain']) ? $_REQUEST['domain'] : '';
-
-        if (empty($target)) {
-            return returnError('Target must be set');
-        }
-
-        if (empty($domain)) {
-            return returnError('Domain must be set');
-        }
-
-        $existingEntries = getCustomCNAMEEntries();
-
-        $found = false;
-        foreach ($existingEntries as $entry) {
-            if ($entry->domain == $domain) {
-                if ($entry->target == $target) {
-                    $found = true;
-
-                    break;
-                }
-            }
-        }
-
-        if (!$found) {
-            return returnError('This domain/ip association does not exist');
-        }
-
-        pihole_execute('-a removecustomcname '.$domain.' '.$target);
-
-        return returnSuccess();
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage());
-    }
-}
-
-function deleteAllCustomCNAMEEntries($reload = '')
-{
-    try {
-        if (isset($_REQUEST['reload'])) {
-            $reload = $_REQUEST['reload'];
-        }
-
-        $existingEntries = getCustomCNAMEEntries();
-        // passing false to pihole_execute stops pihole from reloading after each entry has been deleted
-        foreach ($existingEntries as $entry) {
-            pihole_execute('-a removecustomcname '.$entry->domain.' '.$entry->target.' '.$reload);
-        }
-    } catch (Exception $ex) {
-        return returnError($ex->getMessage());
-    }
-
-    return returnSuccess();
-}
-
 function returnSuccess($message = '', $json = true)
 {
     if ($json) {
diff --git a/scripts/pi-hole/php/sidebar.php b/scripts/pi-hole/php/sidebar.php
index 22508b99..6d43f9b2 100644
--- a/scripts/pi-hole/php/sidebar.php
+++ b/scripts/pi-hole/php/sidebar.php
@@ -59,22 +59,36 @@
                 <!-- Group Management -->
                 <li class="menu-group<?php if ($scriptname === 'groups.php') { ?> active<?php } ?>">
                     <a href="groups.php">
-                        <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups</span>
+                        <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
+                        <span class="pull-right-container">
+                            <span class="label label-primary pull-right" id="num_groups" title="Number of defined groups"></span>
+                        </span>
                     </a>
                 </li>
                 <li class="menu-group<?php if ($scriptname === 'groups-clients.php') { ?> active<?php } ?>">
                     <a href="groups-clients.php">
-                        <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients</span>
+                        <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients
+                        <span class="pull-right-container">
+                            <span class="label label-primary pull-right" id="num_clients" title="Number of defined clients"></span>
+                        </span>
                     </a>
                 </li>
                 <li class="menu-group<?php if ($scriptname === 'groups-domains.php') { ?> active<?php } ?>">
                     <a href="groups-domains.php">
-                        <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains</span>
+                        <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
+                        <span class="pull-right-container">
+                            <span class="label bg-red pull-right" id="num_denied" title="Number of deny rules (domains and regex)"></span>
+                            <span class="label bg-green pull-right" id="num_allowed" title="Number of allow rules (domains and regex)"></span>
+                        </span>
                     </a>
                 </li>
                 <li class="menu-group<?php if ($scriptname === 'groups-adlists.php') { ?> active<?php } ?>">
                     <a href="groups-adlists.php">
-                        <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists</span>
+                        <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adists
+                        <span class="pull-right-container">
+                            <span class="label bg-blue pull-right" id="num_gravity" title="Total number of domains blocked by your Pi-hole"></span>
+                            <span class="label bg-yellow pull-right" id="num_lists" title="Number of defined adlists"></span>
+                        </span>
                     </a>
                 </li>
 
diff --git a/settings.php b/settings.php
index 8ecf22b2..1560fc90 100644
--- a/settings.php
+++ b/settings.php
@@ -10,187 +10,6 @@
 
 require 'scripts/pi-hole/php/header_authenticated.php';
 
-$piholeFTLConf = array();
-
-// Handling of PHP internal errors
-$last_error = error_get_last();
-if (isset($last_error) && ($last_error['type'] === E_WARNING || $last_error['type'] === E_ERROR)) {
-    $error .= 'There was a problem applying your settings.<br>Debugging information:<br>PHP error ('.htmlspecialchars($last_error['type']).'): '.htmlspecialchars($last_error['message']).' in '.htmlspecialchars($last_error['file']).':'.htmlspecialchars($last_error['line']);
-}
-/*
-// Timezone is set in docker via ENV otherwise get it from commandline
-$timezone = htmlspecialchars(getenv('TZ'));
-if (empty($timezone)) {
-    $timezone = shell_exec("date +'%Z'");
-}
-*/
-?>
-<style>
-    .tooltip-inner {
-        max-width: none;
-        white-space: nowrap;
-    }
-</style>
-
-<?php // Check if ad lists should be updated after saving ...
-if (isset($_POST['submit'])) {
-    if ($_POST['submit'] == 'saveupdate') {
-        // If that is the case -> refresh to the gravity page and start updating immediately
-        ?>
-        <meta http-equiv="refresh" content="1;url=gravity.php?go">
-<?php
-    }
-}
-?>
-
-<?php if (strlen($success) > 0) { ?>
-    <div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert">
-        <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span>
-        </button>
-        <h4><i class="icon fa fa-info"></i> Info</h4>
-        <?php echo $success; ?>
-    </div>
-<?php } ?>
-
-<?php if (strlen($error) > 0) { ?>
-    <div id="alError" class="alert alert-danger alert-dismissible fade in" role="alert">
-        <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span>
-        </button>
-        <h4><i class="icon fa fa-ban"></i> Error</h4>
-        <?php echo $error; ?>
-    </div>
-<?php } ?>
-
-<?php
-if (isset($setupVars['PIHOLE_INTERFACE'])) {
-    $piHoleInterface = $setupVars['PIHOLE_INTERFACE'];
-} else {
-    $piHoleInterface = 'unknown';
-}
-
-// get the gateway IP
-//$IPv4GW = getGateway()['ip'];
-
-// if the default gateway address is unknown or FTL is not running
-if ($IPv4GW == '0.0.0.0' || $IPv4GW == -1) {
-    $IPv4GW = 'unknown';
-}
-
-// DNS settings
-$DNSservers = array();
-$DNSactive = array();
-/*
-$i = 1;
-while (isset($setupVars['PIHOLE_DNS_'.$i])) {
-    if (isinserverlist($setupVars['PIHOLE_DNS_'.$i])) {
-        array_push($DNSactive, $setupVars['PIHOLE_DNS_'.$i]);
-    } elseif (strpos($setupVars['PIHOLE_DNS_'.$i], '.') !== false) {
-        if (!isset($custom1)) {
-            $custom1 = $setupVars['PIHOLE_DNS_'.$i];
-        } else {
-            $custom2 = $setupVars['PIHOLE_DNS_'.$i];
-        }
-    } elseif (strpos($setupVars['PIHOLE_DNS_'.$i], ':') !== false) {
-        if (!isset($custom3)) {
-            $custom3 = $setupVars['PIHOLE_DNS_'.$i];
-        } else {
-            $custom4 = $setupVars['PIHOLE_DNS_'.$i];
-        }
-    }
-    ++$i;
-}
-*/
-if (isset($setupVars['DNS_FQDN_REQUIRED'])) {
-    if ($setupVars['DNS_FQDN_REQUIRED']) {
-        $DNSrequiresFQDN = true;
-    } else {
-        $DNSrequiresFQDN = false;
-    }
-} else {
-    $DNSrequiresFQDN = false;
-}
-
-if (isset($setupVars['DNS_BOGUS_PRIV'])) {
-    if ($setupVars['DNS_BOGUS_PRIV']) {
-        $DNSbogusPriv = true;
-    } else {
-        $DNSbogusPriv = false;
-    }
-} else {
-    $DNSbogusPriv = false;
-}
-
-if (isset($setupVars['DNSSEC'])) {
-    if ($setupVars['DNSSEC']) {
-        $DNSSEC = true;
-    } else {
-        $DNSSEC = false;
-    }
-} else {
-    $DNSSEC = false;
-}
-
-if (isset($setupVars['DNSMASQ_LISTENING'])) {
-    if ($setupVars['DNSMASQ_LISTENING'] === 'single') {
-        $DNSinterface = 'single';
-    } elseif ($setupVars['DNSMASQ_LISTENING'] === 'bind') {
-        $DNSinterface = 'bind';
-    } elseif ($setupVars['DNSMASQ_LISTENING'] === 'all') {
-        $DNSinterface = 'all';
-    } else {
-        $DNSinterface = 'local';
-    }
-} else {
-    $DNSinterface = 'single';
-}
-if (isset($setupVars['REV_SERVER']) && ($setupVars['REV_SERVER'] == 1)) {
-    $rev_server = true;
-    $rev_server_cidr = $setupVars['REV_SERVER_CIDR'];
-    $rev_server_target = $setupVars['REV_SERVER_TARGET'];
-    $rev_server_domain = $setupVars['REV_SERVER_DOMAIN'];
-} else {
-    $rev_server = false;
-}
-?>
-
-<?php
-// Query logging
-if (isset($setupVars['QUERY_LOGGING'])) {
-    if ($setupVars['QUERY_LOGGING'] == 1) {
-        $piHoleLogging = true;
-    } else {
-        $piHoleLogging = false;
-    }
-} else {
-    $piHoleLogging = true;
-}
-?>
-
-<?php
-// Excluded domains in API Query Log call
-if (isset($setupVars['API_EXCLUDE_DOMAINS'])) {
-    $excludedDomains = explode(',', $setupVars['API_EXCLUDE_DOMAINS']);
-} else {
-    $excludedDomains = array();
-}
-
-// Excluded clients in API Query Log call
-if (isset($setupVars['API_EXCLUDE_CLIENTS'])) {
-    $excludedClients = explode(',', $setupVars['API_EXCLUDE_CLIENTS']);
-} else {
-    $excludedClients = array();
-}
-
-// Excluded clients
-if (isset($setupVars['API_QUERY_LOG_SHOW'])) {
-    $queryLog = $setupVars['API_QUERY_LOG_SHOW'];
-} else {
-    $queryLog = 'all';
-}
-
-?>
-
-<?php
 if (isset($_GET['tab']) && in_array($_GET['tab'], array('sysadmin', 'dns', 'piholedhcp', 'api', 'privacy', 'teleporter'))) {
     $tab = $_GET['tab'];
 } else {
@@ -224,7 +43,49 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array('sysadmin', 'dns', 'piho
                 <!-- ######################################################### System admin ######################################################### -->
                 <div id="sysadmin" class="tab-pane fade<?php if ($tab === 'sysadmin') { ?> in active<?php } ?>">
                     <div class="row">
-                        <div class="col-md-12">
+                        <div class="col-md-6">
+                            <div class="box">
+                                <div class="box-header with-border">
+                                    <h3 class="box-title">System Information</h3>
+                                </div>
+                                <div class="box-body">
+                                    <div class="row">
+                                        <div class="col-lg-12">
+                                            <table class="table table-striped table-bordered nowrap">
+                                                <tbody>
+                                                    <tr>
+                                                        <th scope="row">Hostname:</th>
+                                                        <td><span id="sysinfo-hostname"></span></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">CPU:</th>
+                                                        <td><span id="sysinfo-cpu"></span> <span id="sysinfo-cpu-ftl"></span></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">Used memory:</th>
+                                                        <td><span id="sysinfo-memory-ram"></span> <span id="sysinfo-ram-ftl"></span</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">Used swap:</th>
+                                                        <td><span id="sysinfo-memory-swap"></span></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">Kernel:</th>
+                                                        <td><span id="sysinfo-kernel"></span></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">Uptime:</th>
+                                                        <td><span id="sysinfo-uptime"></span></td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="overlay" id="sysinfo-system-overlay">
+                                    <i class="fa fa-sync fa-spin"></i>
+                                </div>
+                            </div>
                             <div class="box">
                                 <div class="box-header with-border">
                                     <h3 class="box-title">FTL Information</h3>
@@ -232,71 +93,117 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array('sysadmin', 'dns', 'piho
                                 <div class="box-body">
                                     <div class="row">
                                         <div class="col-lg-12">
-                                            <?php
-                                            $FTLpid = 0;//intval(pidofFTL());
-if ($FTLpid !== 0) {
-    $FTLversion = exec('/usr/bin/pihole-FTL version'); ?>
                                             <table class="table table-striped table-bordered nowrap">
                                                 <tbody>
                                                     <tr>
-                                                        <th scope="row">FTL version:</th>
-                                                        <td><?php echo $FTLversion; ?></td>
+                                                        <th scope="row">FTL's PID:</th>
+                                                        <td><span id="sysinfo-pid-ftl"></span></td>
                                                     </tr>
                                                     <tr>
-                                                        <th scope="row">Process identifier (PID):</th>
-                                                        <td><?php echo $FTLpid; ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <th scope="row">Time FTL started:</th>
-                                                        <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($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($FTLpid, '%cpu')); ?>%</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <th scope="row">Memory utilization:</th>
-                                                        <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($FTLpid, 'rss'))); ?></td>
+                                                        <th scope="row">Privacy level:</th>
+                                                        <td><span id="sysinfo-privacy_level"></span></td>
                                                     </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="overlay" id="sysinfo-ftl-overlay">
+                                    <i class="fa fa-sync fa-spin"></i>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="box">
+                                <div class="box-header with-border">
+                                    <h3 class="box-title">DNS Information</h3>
+                                </div>
+                                <div class="box-body">
+                                    <div class="row">
+                                        <div class="col-lg-12">
+                                            <table class="table table-striped table-bordered nowrap">
+                                                <tbody>
                                                     <tr>
                                                         <th scope="row">
                                                             <span title="Size of the DNS domain cache">DNS cache size:</span>
                                                         </th>
-                                                        <td id="cache-size">&nbsp;</td>
+                                                        <td id="sysinfo-cache-size">&nbsp;</td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">
                                                             <span title="Number of cache insertions">DNS cache insertions:</span>
                                                         </th>
-                                                        <td id="cache-inserted">&nbsp;</td>
+                                                        <td id="sysinfo-cache-inserted">&nbsp;</td>
                                                     </tr>
                                                     <tr>
                                                         <th scope="row">
                                                             <span title="Number of cache entries that had to be removed although they are not expired (increase cache size to reduce this number)" lookatme-text="DNS cache evictions:">DNS cache evictions:</span>
                                                         </th>
-                                                        <td id="cache-live-freed">&nbsp;</td>
+                                                        <td id="sysinfo-cache-evicted">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid A records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-a">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid AAAA records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-aaaa">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid CNAME records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-cname">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid SRV records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-srv">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid DS records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-ds">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Valid DNSKEY records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-dnskey">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Other valid records in cache:
+                                                        </th>
+                                                        <td id="sysinfo-cache-valid-other">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            DNS cache expiries:
+                                                        </th>
+                                                        <td id="sysinfo-cache-expired">&nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th scope="row">
+                                                            Immortal DNS cache entries:
+                                                        </th>
+                                                        <td id="sysinfo-cache-immortal">&nbsp;</td>
                                                     </tr>
                                                 </tbody>
                                             </table>
                                             See also our <a href="https://docs.pi-hole.net/ftldns/dns-cache/" rel="noopener" target="_blank">DNS cache documentation</a>.
-                                            <?php
-} else { ?>
-                                            <div>The FTL service is offline!</div>
-                                            <?php } ?>
                                         </div>
                                     </div>
                                 </div>
+                                <div class="overlay" id="sysinfo-cache-overlay">
+                                    <i class="fa fa-sync fa-spin"></i>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -598,7 +505,7 @@ if ($DHCP) {
     }
 }
 
-//readStaticLeasesFile();
+// readStaticLeasesFile();
 ?>
                             <div class="col-md-12">
                                 <div class="box box-warning">
@@ -1434,7 +1341,7 @@ if (isset($piholeFTLConf['RATE_LIMIT'])) {
                                 </div>
                             </div>
                         </div>
-                        <?php } else */{ ?>
+                        <?php } else */ ?>
                         <div class="col-lg-12">
                             <div class="box box-warning">
                                 <div class="box-header with-border">
@@ -1445,7 +1352,6 @@ if (isset($piholeFTLConf['RATE_LIMIT'])) {
                                 </div>
                             </div>
                         </div>
-                        <?php } ?>
                     </div>
                 </div>
             </div>