diff --git a/apps/hydra/glance/configmap-glance.yaml b/apps/hydra/glance/configmap-glance.yaml
index 0f4f3fa..b5c04d8 100644
--- a/apps/hydra/glance/configmap-glance.yaml
+++ b/apps/hydra/glance/configmap-glance.yaml
@@ -57,19 +57,6 @@ data:
                     - title: Linkding
                       icon: sh:linkding
                       url: https://link.danicos.me
-                    - title: TrueNAS VPN
-                      icon: sh:truenas-core
-                      url: http://apex-truenas.orca-uaru.ts.net
-                - title: "Hosted in Homelab VPN"
-                  description: "Hosted in my personal homlab, accesible only throught Private VPN"
-                  color: 200 40 40
-                  links:
-                    - title: Immich VPN
-                      icon: sh:immich
-                      url: http://hydra-0.orca-uaru.ts.net:30011
-                    - title: TrueNAS VPN
-                      icon: sh:truenas-core
-                      url: http://apex-truenas.orca-uaru.ts.net
                 - title: "Hosted in the Cloud"
                   description: "Hosted in my OVH Cloud VPS"
                   color: 10 70 50
@@ -83,6 +70,16 @@ data:
                     - title: Git platform (Gitea)
                       icon: sh:gitea
                       url: https://danicos.dev
+                - title: "Hosted in Homelab VPN"
+                  description: "Hosted in my personal homlab, accesible only throught Private VPN"
+                  color: 200 40 40
+                  links:
+                    - title: Immich VPN
+                      icon: sh:immich
+                      url: http://hydra-0.orca-uaru.ts.net:30011
+                    - title: TrueNAS VPN
+                      icon: sh:truenas-core
+                      url: http://apex-truenas.orca-uaru.ts.net
                 - title: "Public"
                   color: 100 40 25
                   links:
@@ -151,24 +148,27 @@ data:
 
         - size: full
           widgets:
-            - type: videos
-              title: Homestead/Farm
-              channels:
-                - UCv2Li-PxOya3XCL-St_4DkA # Homesteady
-                - UCkOTo20XS1LL95g2p6CcE3A # Few Acres Farm
-                - UCBn3itOeDjCeuol70nQq1cg # Domaie Sauvage
-              style: grid-cards
-              collapse-after-rows: 1
-              limit: 8
+            - type: group
+              title: Videos
+              widgets:
+                - type: videos
+                  title: Homestead/Farm
+                  channels:
+                    - UCv2Li-PxOya3XCL-St_4DkA # Homesteady
+                    - UCkOTo20XS1LL95g2p6CcE3A # Few Acres Farm
+                    - UCBn3itOeDjCeuol70nQq1cg # Domaie Sauvage
+                  style: grid-cards
+                  collapse-after-rows: 2
+                  limit: 8
 
-            - type: videos
-              title: Hardware
-              channels:
-                - UCBB0oz7Yo_35gnbPYGKGJTA # Diesel Creek
-                - UCKqKiBDpq9j29bXbBx0cfOw # BuildWit
-              style: grid-cards
-              collapse-after-rows: 1
-              limit: 8
+                - type: videos
+                  title: Hardware
+                  channels:
+                    - UCBB0oz7Yo_35gnbPYGKGJTA # Diesel Creek
+                    - UCKqKiBDpq9j29bXbBx0cfOw # BuildWit
+                  style: grid-cards
+                  collapse-after-rows: 2
+                  limit: 8
 
         - size: small
           widgets:
diff --git a/config/glance/config/home.yml b/config/glance/config/home.yml
index 55871b7..5bbcd65 100644
--- a/config/glance/config/home.yml
+++ b/config/glance/config/home.yml
@@ -19,19 +19,6 @@
                 - title: Linkding
                   icon: sh:linkding
                   url: https://link.danicos.me
-                - title: TrueNAS VPN
-                  icon: sh:truenas-core
-                  url: http://apex-truenas.orca-uaru.ts.net
-            - title: "Hosted in Homelab VPN"
-              description: "Hosted in my personal homlab, accesible only throught Private VPN"
-              color: 200 40 40
-              links:
-                - title: Immich VPN
-                  icon: sh:immich
-                  url: http://hydra-0.orca-uaru.ts.net:30011
-                - title: TrueNAS VPN
-                  icon: sh:truenas-core
-                  url: http://apex-truenas.orca-uaru.ts.net
             - title: "Hosted in the Cloud"
               description: "Hosted in my OVH Cloud VPS"
               color: 10 70 50
@@ -45,6 +32,16 @@
                 - title: Git platform (Gitea)
                   icon: sh:gitea
                   url: https://danicos.dev
+            - title: "Hosted in Homelab VPN"
+              description: "Hosted in my personal homlab, accesible only throught Private VPN"
+              color: 200 40 40
+              links:
+                - title: Immich VPN
+                  icon: sh:immich
+                  url: http://hydra-0.orca-uaru.ts.net:30011
+                - title: TrueNAS VPN
+                  icon: sh:truenas-core
+                  url: http://apex-truenas.orca-uaru.ts.net
             - title: "Public"
               color: 100 40 25
               links:
@@ -113,24 +110,27 @@
 
     - size: full
       widgets:
-        - type: videos
-          title: Homestead/Farm
-          channels:
-            - UCv2Li-PxOya3XCL-St_4DkA # Homesteady
-            - UCkOTo20XS1LL95g2p6CcE3A # Few Acres Farm
-            - UCBn3itOeDjCeuol70nQq1cg # Domaie Sauvage
-          style: grid-cards
-          collapse-after-rows: 1
-          limit: 8
+        - type: group
+          title: Videos
+          widgets:
+            - type: videos
+              title: Homestead/Farm
+              channels:
+                - UCv2Li-PxOya3XCL-St_4DkA # Homesteady
+                - UCkOTo20XS1LL95g2p6CcE3A # Few Acres Farm
+                - UCBn3itOeDjCeuol70nQq1cg # Domaie Sauvage
+              style: grid-cards
+              collapse-after-rows: 2
+              limit: 8
 
-        - type: videos
-          title: Hardware
-          channels:
-            - UCBB0oz7Yo_35gnbPYGKGJTA # Diesel Creek
-            - UCKqKiBDpq9j29bXbBx0cfOw # BuildWit
-          style: grid-cards
-          collapse-after-rows: 1
-          limit: 8
+            - type: videos
+              title: Hardware
+              channels:
+                - UCBB0oz7Yo_35gnbPYGKGJTA # Diesel Creek
+                - UCKqKiBDpq9j29bXbBx0cfOw # BuildWit
+              style: grid-cards
+              collapse-after-rows: 2
+              limit: 8
 
     - size: small
       widgets: