diff --git a/config/settings.yaml b/config/settings.yaml
index ad0f98c..3eff432 100755
--- a/config/settings.yaml
+++ b/config/settings.yaml
@@ -7,88 +7,42 @@ title: Phil's Home Lab
 providers:
         # openweathermap: openweathermapapikey
   weatherapi: c3ed78e184cf4e688f413510241310
-layout:
   
-Glance:
+layout:
+  # Glance tab groups
+  glance_dash:
     tab: Glance
+    style: column
     header: false
 
-Netgrimoire:
-  tab: Netgrimoire
-
-Applications:
-  tab: Netgrimoire
-  style: column
-
-Management:
-  tab: Netgrimoire
-  style: column
-
-Monitoring:
-  tab: Netgrimoire
-  style: column
-
-Remote Access:
-  tab: Netgrimoire
-  style: column
-
-Wasted-Bandwidth:
-  tab: Wasted-Bandwidth
-
-Jolly Roger:
-  tab: Wasted-Bandwidth
-  style: column
-
-
-VPN Protected Apps:
-  tab: Wasted-Bandwidth
-  style: column
-
-PNCHarris:
-  tab: PNCHarris
-
-PNC Apps:
-  tab: PNCHarris
-  style: column
-
-Nucking-Futz:
-  tab: Nucking-Futz
-
-Nucking Apps:
-  tab: Nucking-Futz
-  style: column
-
-
-
-
-
-
-
-
- 
-
-
-  
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
+  # PNCHarris tab groups
+  pncharris_apps:
+    tab: PNCHarris
+    style: column
 
+  pncharris_media:
+    tab: PNCHarris
+    style: column
 
+  # Netgrimoire tab groups
+  netgrimoire_apps:
+    tab: Netgrimoire
+    style: column
 
+  netgrimoire_infra:
+    tab: Netgrimoire
+    style: column
 
+  # Wasted-Bandwidth tab groups
+  wasted_apps:
+    tab: Wasted-Bandwidth
+    style: column
 
+  wasted_media:
+    tab: Wasted-Bandwidth
+    style: column
 
+  # Nucking-Futz tab groups
+  nucking_apps:
+    tab: Nucking-Futz
+    style: column