diff --git a/src/components/nav-user.tsx b/src/components/nav-user.tsx
index f83d6db..a0f1ff8 100644
--- a/src/components/nav-user.tsx
+++ b/src/components/nav-user.tsx
@@ -67,8 +67,8 @@ export function NavUser() {
       <SidebarMenu>
         <SidebarMenuItem>
           <SidebarMenuButton size="lg">
-            <Skeleton className="size-8 rounded-lg" />
-            <div className="grid flex-1 gap-1">
+            <Skeleton className="size-8 shrink-0 rounded-lg" />
+            <div className="grid flex-1 gap-1 group-data-[collapsible=icon]:hidden">
               <Skeleton className="h-4 rounded" />
               <Skeleton className="h-3 rounded" />
             </div>
@@ -99,20 +99,21 @@ export function NavUser() {
             <SidebarMenuButton
               size="lg"
               className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
+              tooltip={userName}
             >
-              <Avatar className="size-8 rounded-lg">
+              <Avatar className="size-8 shrink-0 rounded-lg">
                 <AvatarImage src={avatarUrl} alt={userName} />
                 <AvatarFallback className="rounded-lg">
                   {getInitials(userName)}
                 </AvatarFallback>
               </Avatar>
-              <div className="grid flex-1 text-left text-sm leading-tight">
+              <div className="grid flex-1 text-left text-sm leading-tight group-data-[collapsible=icon]:hidden">
                 <span className="truncate font-medium">{userName}</span>
                 <span className="truncate text-xs text-sidebar-foreground/65">
                   {formattedRole || userEmail}
                 </span>
               </div>
-              <ChevronsUpDown className="ml-auto size-4" />
+              <ChevronsUpDown className="ml-auto size-4 group-data-[collapsible=icon]:hidden" />
             </SidebarMenuButton>
           </DropdownMenuTrigger>
 
diff --git a/src/components/team-switcher.tsx b/src/components/team-switcher.tsx
index 3ca5870..0ef3f88 100644
--- a/src/components/team-switcher.tsx
+++ b/src/components/team-switcher.tsx
@@ -23,6 +23,11 @@ import {
   SidebarMenuItem,
   useSidebar,
 } from '@/components/ui/sidebar';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip';
 
 type OrgItem = {
   _id: string;
@@ -31,7 +36,7 @@ type OrgItem = {
 };
 
 export function TeamSwitcher() {
-  const { isMobile } = useSidebar();
+  const { isMobile, state } = useSidebar();
   const { user } = useAuthUser();
   const {
     years,
@@ -77,25 +82,36 @@ export function TeamSwitcher() {
     <SidebarMenu>
       <SidebarMenuItem>
         <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <SidebarMenuButton
-              size="lg"
-              className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <DropdownMenuTrigger asChild>
+                <SidebarMenuButton
+                  size="lg"
+                  className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
+                >
+                  <div className="flex aspect-square size-8 shrink-0 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground">
+                    <WandSparkles className="size-4" />
+                  </div>
+                  <div className="grid flex-1 text-left text-sm leading-tight group-data-[collapsible=icon]:hidden">
+                    <span className="truncate font-semibold">
+                      {activeOrg?.name ?? 'WorkloadWizard'}
+                    </span>
+                    <span className="truncate text-xs text-sidebar-foreground/70">
+                      {currentYear?.name ?? (activeOrg?.code ?? 'No year selected')}
+                    </span>
+                  </div>
+                  <ChevronsUpDown className="ml-auto group-data-[collapsible=icon]:hidden" />
+                </SidebarMenuButton>
+              </DropdownMenuTrigger>
+            </TooltipTrigger>
+            <TooltipContent
+              side="right"
+              align="center"
+              hidden={state !== 'collapsed' || isMobile}
             >
-              <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground">
-                <WandSparkles className="size-4" />
-              </div>
-              <div className="grid flex-1 text-left text-sm leading-tight">
-                <span className="truncate font-semibold">
-                  {activeOrg?.name ?? 'WorkloadWizard'}
-                </span>
-                <span className="truncate text-xs text-sidebar-foreground/70">
-                  {currentYear?.name ?? (activeOrg?.code ?? 'No year selected')}
-                </span>
-              </div>
-              <ChevronsUpDown className="ml-auto" />
-            </SidebarMenuButton>
-          </DropdownMenuTrigger>
+              {activeOrg?.name ?? 'WorkloadWizard'}
+            </TooltipContent>
+          </Tooltip>
 
           <DropdownMenuContent
             className="w-(--radix-dropdown-menu-trigger-width) min-w-64 rounded-lg"
diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx
index 0bb6e70..2c08426 100644
--- a/src/components/ui/sidebar.tsx
+++ b/src/components/ui/sidebar.tsx
@@ -530,7 +530,7 @@ const sidebarMenuButtonVariants = cva(
       size: {
         default: 'min-h-11 text-sm',
         sm: 'min-h-9 text-xs',
-        lg: 'min-h-14 text-sm group-data-[collapsible=icon]:p-0!',
+        lg: 'min-h-14 text-sm group-data-[collapsible=icon]:size-10! group-data-[collapsible=icon]:p-0! group-data-[collapsible=icon]:justify-center',
       },
     },
     defaultVariants: {
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 8b6d8ad..2b93392 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -10,7 +10,11 @@ const PublicEnvSchema = z.object({
   NEXT_PUBLIC_CONVEX_URL: z
     .string()
     .url('NEXT_PUBLIC_CONVEX_URL must be a URL'),
-  NEXT_PUBLIC_APP_URL: z.string().url('NEXT_PUBLIC_APP_URL must be a URL'),
+  NEXT_PUBLIC_APP_URL: z
+    .string()
+    .url('NEXT_PUBLIC_APP_URL must be a URL')
+    .optional()
+    .default('http://localhost:3000'),
   NEXT_PUBLIC_SENTRY_DSN: OptionalUrlSchema,
   NODE_ENV: z
     .enum(['development', 'test', 'production'])