diff --git a/ui/suite/index.html b/ui/suite/index.html
index c40409b..0350a60 100644
--- a/ui/suite/index.html
+++ b/ui/suite/index.html
@@ -120,7 +120,7 @@
                             aria-label="Chat application"
                             hx-get="/suite/chat/chat.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#chat"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -148,7 +148,7 @@
                             aria-label="Research application"
                             hx-get="/suite/research/research.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#research"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -176,7 +176,7 @@
                             aria-label="Paper - Notes & Writing"
                             hx-get="/suite/paper/paper.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#paper"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -207,7 +207,7 @@
                             aria-label="Drive application"
                             hx-get="/suite/drive/drive.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#drive"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -235,7 +235,7 @@
                             aria-label="Calendar application"
                             hx-get="/suite/calendar/calendar.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#calendar"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -271,7 +271,7 @@
                             aria-label="Tasks application"
                             hx-get="/suite/tasks/tasks.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#tasks"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -300,7 +300,7 @@
                             aria-label="Mail application"
                             hx-get="/suite/mail/mail.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#mail"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -329,7 +329,7 @@
                             aria-label="Meet application"
                             hx-get="/suite/meet/meet.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#meet"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -363,7 +363,7 @@
                             aria-label="Analytics Dashboard"
                             hx-get="/suite/analytics/analytics.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#analytics"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg
@@ -391,7 +391,7 @@
                             aria-label="System Monitoring"
                             hx-get="/suite/monitoring/monitoring.html"
                             hx-target="#main-content"
-                            hx-push-url="true"
+                            hx-push-url="/#monitoring"
                         >
                             <div class="app-icon" aria-hidden="true">
                                 <svg