diff --git a/argocd/manifests/frigate/ingress-tailscale.yaml b/argocd/manifests/frigate/ingress-tailscale.yaml
index f814b70..d66b14f 100644
--- a/argocd/manifests/frigate/ingress-tailscale.yaml
+++ b/argocd/manifests/frigate/ingress-tailscale.yaml
@@ -9,7 +9,7 @@ metadata:
     tailscale.com/proxy-group: "ingress"
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "NVR"
-    gethomepage.dev/group: "Infrastructure"
+    gethomepage.dev/group: "Home"
     gethomepage.dev/icon: "frigate.png"
     gethomepage.dev/description: "Network video recorder"
     gethomepage.dev/href: "https://nvr.ops.eblu.me"
diff --git a/argocd/manifests/grafana-config/ingress-tailscale.yaml b/argocd/manifests/grafana-config/ingress-tailscale.yaml
index e02269c..8233592 100644
--- a/argocd/manifests/grafana-config/ingress-tailscale.yaml
+++ b/argocd/manifests/grafana-config/ingress-tailscale.yaml
@@ -12,7 +12,7 @@ metadata:
     tailscale.com/proxy-group: "ingress"
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Grafana"
-    gethomepage.dev/group: "Content"
+    gethomepage.dev/group: "Infrastructure"
     gethomepage.dev/icon: "grafana.png"
     gethomepage.dev/description: "Metrics dashboards"
     gethomepage.dev/href: "https://grafana.ops.eblu.me"
diff --git a/argocd/manifests/homepage/services.yaml b/argocd/manifests/homepage/services.yaml
index 9861e0a..0a3db25 100644
--- a/argocd/manifests/homepage/services.yaml
+++ b/argocd/manifests/homepage/services.yaml
@@ -43,6 +43,19 @@
               query: borgmatic_repo_deduplicated_size_bytes
               format:
                 type: bytes
+    # TODO: Add Caddy widget when admin API is enabled (currently admin off)
+    # - Caddy:
+    #     href: https://indri.tail8d86e.ts.net
+    #     icon: caddy
+    #     description: Reverse proxy
+    #     widget:
+    #       type: caddy
+    #       url: http://indri.tail8d86e.ts.net:2019
+- Home:
+    - NVR:
+        href: https://nvr.ops.eblu.me
+        icon: frigate.png
+        description: Network video recorder
     - Jellyfin:
         href: https://jellyfin.ops.eblu.me
         icon: jellyfin
@@ -53,14 +66,6 @@
           key: "{{HOMEPAGE_VAR_JELLYFIN_API_KEY}}"
           enableBlocks: true
           enableNowPlaying: true
-    # TODO: Add Caddy widget when admin API is enabled (currently admin off)
-    # - Caddy:
-    #     href: https://indri.tail8d86e.ts.net
-    #     icon: caddy
-    #     description: Reverse proxy
-    #     widget:
-    #       type: caddy
-    #       url: http://indri.tail8d86e.ts.net:2019
 - Services:
     - JobSync:
         href: https://jobsync.ops.eblu.me
@@ -71,10 +76,6 @@
         href: https://authentik.ops.eblu.me
         icon: authentik
         description: Identity provider
-    - NVR:
-        href: https://nvr.ops.eblu.me
-        icon: frigate.png
-        description: Network video recorder
     - Ntfy:
         href: https://ntfy.ops.eblu.me
         icon: ntfy.png
diff --git a/argocd/manifests/homepage/settings.yaml b/argocd/manifests/homepage/settings.yaml
index f8c06fc..c03fa09 100644
--- a/argocd/manifests/homepage/settings.yaml
+++ b/argocd/manifests/homepage/settings.yaml
@@ -8,10 +8,12 @@ quicklaunch:
   suggestionUrl: https://kagisuggest.com/api/autosuggest?q=
 layout:
   Host Services:
-    style: column
+    style: row
+  Home:
+    style: row
   Content:
-    style: column
+    style: row
   Infrastructure:
-    style: column
+    style: row
   Services:
-    style: column
+    style: row
diff --git a/argocd/manifests/navidrome/ingress-tailscale.yaml b/argocd/manifests/navidrome/ingress-tailscale.yaml
index 12eb53e..7264086 100644
--- a/argocd/manifests/navidrome/ingress-tailscale.yaml
+++ b/argocd/manifests/navidrome/ingress-tailscale.yaml
@@ -9,7 +9,7 @@ metadata:
     tailscale.com/proxy-group: "ingress"
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "DJ"
-    gethomepage.dev/group: "Content"
+    gethomepage.dev/group: "Home"
     gethomepage.dev/icon: "navidrome.png"
     gethomepage.dev/description: "Music streaming server"
     gethomepage.dev/href: "https://dj.ops.eblu.me"