diff --git a/front/css/app.css b/front/css/app.css
index f5e26c52..06339a4b 100755
--- a/front/css/app.css
+++ b/front/css/app.css
@@ -387,6 +387,16 @@ body
     margin-bottom: 0px;
 }
 
+.plugin-content #tabs-location .nav-tabs-custom > .nav-tabs > li
+{
+    display: contents;
+}
+
+.plugin-content .left-nav
+{
+    display: contents;
+}
+
 .pa-small-box-2 .inner h3 {
     margin-left: 0em;
     margin-bottom: 1.3em;
@@ -1411,6 +1421,7 @@ input[readonly] {
 .iconPreview svg{
     min-width: 20px;
     max-width: 20px;
+    margin-bottom: -3px;
 }
 
 
@@ -1659,8 +1670,6 @@ input[readonly] {
     border: 1px solid #aaa;
     border-radius: 4px;
     border-style: solid;
-    margin-right: 5px;
-    margin-top: 5px;
     padding: 0 5px;
     font-size: 14px;
     display: inline-block;
diff --git a/front/devices.php b/front/devices.php
index d54b7e11..0a7ac674 100755
--- a/front/devices.php
+++ b/front/devices.php
@@ -902,7 +902,7 @@ function initializeDatatable (status) {
       // Parent Mac      
       {targets: [mapIndx(14)],
         'createdCell': function (td, cellData, rowData, row, col) {
-          if (!cellData) {
+          if (!isValidMac(cellData)) {
             $(td).html('');
             return;
           }
diff --git a/front/js/ui_components.js b/front/js/ui_components.js
index 795f5e47..f3a992aa 100755
--- a/front/js/ui_components.js
+++ b/front/js/ui_components.js
@@ -781,7 +781,7 @@ function initSelect2() {
 
 // ------------------------------------------
 // Render a device link with hover-over functionality
-function renderDeviceLink(data, container, useName=false) {
+function renderDeviceLink(data, container, useName = false) {
   if (!data.id) return data.text; // default placeholder etc.
 
   const device = getDevDataByMac(data.id);
@@ -792,35 +792,37 @@ function renderDeviceLink(data, container, useName=false) {
     device.devMac
   );
 
-  $(container).addClass(badge.cssClass);
-
+  // Add badge class and hover-info class to container
+  $(container)
+    .addClass(`${badge.cssClass} hover-node-info`)
+    .attr({
+      'data-name': device.devName,
+      'data-ip': device.devLastIP,
+      'data-mac': device.devMac,
+      'data-vendor': device.devVendor,
+      'data-type': device.devType,
+      'data-lastseen': device.devLastConnection,
+      'data-firstseen': device.devFirstConnection,
+      'data-relationship': device.devParentRelType,
+      'data-status': device.devStatus,
+      'data-present': device.devPresentLastScan,
+      'data-alert': device.devAlertDown,
+      'data-icon': device.devIcon
+    });
+  
   return `
     <a href="${badge.url}" target="_blank">
-      <span class="custom-chip hover-node-info" 
-            data-name="${device.devName}"
-            data-ip="${device.devLastIP}"
-            data-mac="${device.devMac}"
-            data-vendor="${device.devVendor}"
-            data-type="${device.devType}"
-            data-lastseen="${device.devLastConnection}"
-            data-firstseen="${device.devFirstConnection}"
-            data-relationship="${device.devParentRelType}"
-            data-status="${device.devStatus}"
-            data-present="${device.devPresentLastScan}"
-            data-alert="${device.devAlertDown}"
-            data-icon="${device.devIcon}"
-      >
+      <span class="custom-chip">
         <span class="iconPreview">${atob(device.devIcon)}</span>
         ${useName ? device.devName : data.text}
         <span>
-        (${badge.iconHtml})
+          (${badge.iconHtml})
         </span>
       </span>
     </a>
   `;
 }
 
-
 // ------------------------------------------
 // Display device info on hover (attach only once)
 function initHoverNodeInfo() {
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 7ae6b294..5e621cf2 100755
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -436,8 +436,24 @@
         </li>
 
         <!-- system info menu item -->
-        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('systeminfo.php') ) ){ echo 'active'; } ?>">
-          <a href="systeminfo.php"><i class="fa fa-fw fa-info-circle"></i> <span><?= lang('Navigation_SystemInfo');?></span></a>
+        <li class=" treeview <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('systeminfo.php') ) ){ echo 'active menu-open'; } ?>">
+          <a href="#">
+          <i class="fa fa-fw fa-info-circle"></i> <span><?= lang('Navigation_SystemInfo');?></span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu " style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('systeminfo.php') ) ){ echo 'block'; } else {echo 'none';} ?>;">                    
+            <li>
+              <a href="systeminfo.php#panServer" onclick="setCache('activeSysinfoTab','tabServer');initializeTabs()"><?= lang('Systeminfo_System');?></a>
+            </li>           
+            <li>
+              <a href="systeminfo.php#panNetwork"  onclick="setCache('activeSysinfoTab','tabNetwork');initializeTabs()"><?= lang('Systeminfo_Network');?></a>
+            </li>           
+            <li>
+              <a href="systeminfo.php#panStorage" onclick="setCache('activeSysinfoTab','tabStorage');initializeTabs()"><?= lang('Systeminfo_Storage');?></a>
+            </li>           
+          </ul>
         </li>
 
       </ul>
@@ -450,24 +466,6 @@
 
 <script defer>
 
-// Generate work-in-progress icons
-function workInProgress() {
-
-  if($(".work-in-progress").length > 0 && $(".work-in-progress").html().trim() == "")
-  {
-    $(".work-in-progress").append(`
-              <a href="https://github.com/jokob-sk/NetAlertX/issues" target="_blank">
-                <b class="pointer" title="${getString("Gen_Work_In_Progress")}">🦺</b>
-              </a>
-            `)
-  }
-}
-
-//--------------------------------------------------------------
-
-
-  //--------------------------------------------------------------
-
   function toggleFullscreen() {
 
    if (document.fullscreenElement) {
@@ -485,6 +483,5 @@ function workInProgress() {
 
   // Update server state in the header
   updateState()
-  workInProgress() 
   
 </script>
diff --git a/server/api_server/graphql_schema.py b/server/api_server/graphql_schema.py
index b287d2e5..ff6c20db 100755
--- a/server/api_server/graphql_schema.py
+++ b/server/api_server/graphql_schema.py
@@ -197,7 +197,7 @@ class Query(ObjectType):
                 searchable_fields = [
                     "devName", "devMac", "devOwner", "devType", "devVendor", "devLastIP",
                     "devGroup", "devComments", "devLocation", "devStatus", "devSSID", 
-                    "devSite", "devSourcePlugin", "devSyncHubNode", "devFQDN", "devParentRelType"
+                    "devSite", "devSourcePlugin", "devSyncHubNode", "devFQDN", "devParentRelType", "devParentMAC"
                 ]
 
                 search_term = options.search.lower()