diff --git a/src/lib/v2/ui/NavBarLink.svelte b/src/lib/v2/ui/NavBarLink.svelte
index 8a3eea6..1f256ad 100644
--- a/src/lib/v2/ui/NavBarLink.svelte
+++ b/src/lib/v2/ui/NavBarLink.svelte
@@ -4,10 +4,11 @@
   let { Icon = null, children, active, ...others } = $props();
 </script>
 
-<li role="none">
+<li role="none" class="grow-1">
   <Button.Root
     role="menuitem"
-    class="flex items-center cursor-pointer px-4 py-1 rounded-full transition-all duration-300 ease-in-out
+    class="flex items-center justify-center cursor-pointer px-4 py-1 rounded-full
+      transition-all duration-300 ease-in-out
 		  {active ? 'bg-neutral-100 text-neutral-900' : 'hover:bg-neutral-600'}"
     {...others}
   >
diff --git a/src/routes/dash/+layout.svelte b/src/routes/dash/+layout.svelte
index b79d9f0..fbfb9ce 100644
--- a/src/routes/dash/+layout.svelte
+++ b/src/routes/dash/+layout.svelte
@@ -34,10 +34,12 @@
     <NavBarLink Icon={IconHome} active={isActive('devices')} href="/dash/devices"
       >Devices</NavBarLink
     >
-    <NavBarLink Icon={IconUsers} active={isActive('users')} href="/dash/users">Users</NavBarLink>
-    <NavBarLink Icon={IconUsersGroup} active={isActive('groups')} href="/dash/groups"
-      >Groups</NavBarLink
-    >
+    {#if data.user.admin}
+      <NavBarLink Icon={IconUsers} active={isActive('users')} href="/dash/users">Users</NavBarLink>
+      <NavBarLink Icon={IconUsersGroup} active={isActive('groups')} href="/dash/groups"
+        >Groups</NavBarLink
+      >
+    {/if}
   </NavBar>
   <div class="flex grow">
     <div