diff --git a/src/components/account-page.tsx b/src/components/account-page.tsx
index 43e1b78..7f93138 100644
--- a/src/components/account-page.tsx
+++ b/src/components/account-page.tsx
@@ -198,11 +198,11 @@ export function AccountPage({
 
   return (
     <Dialog open={isOpen} onOpenChange={onClose} subPage={subPage}>
-      <DialogContent className="flex max-h-[calc(100vh-4rem)] max-w-2xl flex-col">
+      <DialogContent className="flex max-h-[calc(100vh-5rem)] max-w-3xl flex-col">
         <div
           className={cn(
-            "flex min-h-0 flex-1 flex-col gap-4 overflow-y-auto p-4",
-            subPage && "mx-auto w-full max-w-2xl",
+            "min-h-0 flex-1 overflow-y-auto",
+            subPage && "mx-auto w-full max-w-3xl",
           )}
         >
           <AnimatedTabs defaultValue="account">
diff --git a/src/components/extension-management-dialog.tsx b/src/components/extension-management-dialog.tsx
index 35cfa5d..133432f 100644
--- a/src/components/extension-management-dialog.tsx
+++ b/src/components/extension-management-dialog.tsx
@@ -1101,7 +1101,7 @@ export function ExtensionManagementDialog({
   return (
     <>
       <Dialog open={isOpen} onOpenChange={onClose} subPage={subPage}>
-        <DialogContent className="flex max-h-[90vh] max-w-[min(80rem,calc(100%-4rem))] flex-col">
+        <DialogContent className="flex max-h-[85vh] max-w-[min(80rem,calc(100%-4rem))] flex-col">
           {!subPage && (
             <DialogHeader>
               <DialogTitle className="flex items-center gap-2">
diff --git a/src/components/group-management-dialog.tsx b/src/components/group-management-dialog.tsx
index 9dd0f99..a8a9625 100644
--- a/src/components/group-management-dialog.tsx
+++ b/src/components/group-management-dialog.tsx
@@ -557,7 +557,7 @@ export function GroupManagementDialog({
   return (
     <>
       <Dialog open={isOpen} onOpenChange={onClose} subPage={subPage}>
-        <DialogContent className="flex max-h-[90vh] max-w-[min(60rem,calc(100%-4rem))] flex-col">
+        <DialogContent className="flex max-h-[85vh] max-w-[min(80rem,calc(100%-4rem))] flex-col">
           {!subPage && (
             <DialogHeader>
               <DialogTitle>{t("groups.management")}</DialogTitle>
@@ -567,15 +567,13 @@ export function GroupManagementDialog({
             </DialogHeader>
           )}
 
-          <div className="flex min-h-0 w-full flex-1 flex-col gap-4">
-            <div className="flex items-start justify-between gap-3">
-              <div className="flex flex-col gap-1">
-                <h2 className="text-base font-semibold">
-                  {t("groups.pageTitle")}
-                </h2>
-                <p className="text-xs text-muted-foreground">
-                  {t("groups.pageDescription")}
-                </p>
+          <div className="@container flex min-h-0 w-full flex-1 flex-col">
+            <div className="flex shrink-0 flex-wrap items-center justify-between gap-2">
+              <div className="inline-flex h-7 items-center justify-center gap-1.5 rounded-md bg-accent px-3 text-sm font-medium whitespace-nowrap text-foreground">
+                <span>{t("groups.pageTitle")}</span>
+                <span className="text-xs text-muted-foreground tabular-nums">
+                  {groups.length}
+                </span>
               </div>
               <RippleButton
                 size="sm"
@@ -583,31 +581,34 @@ export function GroupManagementDialog({
                   setCreateDialogOpen(true);
                 }}
                 className="flex shrink-0 items-center gap-2"
+                aria-label={t("proxies.management.create")}
               >
                 <GoPlus className="size-4" />
-                {t("proxies.management.create")}
+                <span className="hidden @2xl:inline">
+                  {t("proxies.management.create")}
+                </span>
               </RippleButton>
             </div>
 
             {error && (
-              <div className="rounded-md bg-destructive/10 p-3 text-sm text-destructive">
+              <div className="mt-4 rounded-md bg-destructive/10 p-3 text-sm text-destructive">
                 {error}
               </div>
             )}
 
             {/* Groups list */}
             {isLoading ? (
-              <div className="text-sm text-muted-foreground">
+              <div className="mt-4 text-sm text-muted-foreground">
                 {t("common.buttons.loading")}
               </div>
             ) : groups.length === 0 ? (
-              <div className="text-sm text-muted-foreground">
+              <div className="mt-4 text-sm text-muted-foreground">
                 {t("groups.noGroupsDescription")}
               </div>
             ) : (
               <FadingScrollArea
                 className={cn(
-                  "min-h-0 flex-1",
+                  "mt-4 min-h-0 flex-1",
                   selectedGroupsForBulk.length > 0 && "pb-16",
                 )}
                 style={
diff --git a/src/components/profile-data-table.tsx b/src/components/profile-data-table.tsx
index 2d3920d..8c757fd 100644
--- a/src/components/profile-data-table.tsx
+++ b/src/components/profile-data-table.tsx
@@ -1665,6 +1665,30 @@ export function ProfilesDataTable({
     };
   }, [browserState.isClient, loadAllTags]);
 
+  // A running browser keeps the name it launched with, so close any inline
+  // rename that was open when the profile entered a runtime transition.
+  React.useEffect(() => {
+    if (!profileToRename) return;
+
+    const profileId = profileToRename.id;
+    const isRuntimeLocked =
+      (browserState.isClient && runningProfiles.has(profileId)) ||
+      launchingProfiles.has(profileId) ||
+      stoppingProfiles.has(profileId);
+
+    if (isRuntimeLocked) {
+      setProfileToRename(null);
+      setNewProfileName("");
+      setRenameError(null);
+    }
+  }, [
+    profileToRename,
+    runningProfiles,
+    launchingProfiles,
+    stoppingProfiles,
+    browserState.isClient,
+  ]);
+
   // Automatically deselect profiles that become running, updating, launching, or stopping
   React.useEffect(() => {
     const newSet = new Set(selectedProfiles);
@@ -2479,7 +2503,15 @@ export function ProfilesDataTable({
           const profile = row.original as BrowserProfile;
           const rawName: string = row.getValue("name");
           const name = getBrowserDisplayName(rawName);
-          const isEditing = meta.profileToRename?.id === profile.id;
+          const isRuntimeLocked =
+            (meta.isClient && meta.runningProfiles.has(profile.id)) ||
+            meta.launchingProfiles.has(profile.id) ||
+            meta.stoppingProfiles.has(profile.id);
+          const isCrossOsBlocked = isCrossOsProfile(profile);
+          const isEditing =
+            meta.profileToRename?.id === profile.id &&
+            !isRuntimeLocked &&
+            !isCrossOsBlocked;
 
           if (isEditing) {
             return (
@@ -2530,45 +2562,44 @@ export function ProfilesDataTable({
             />
           );
 
-          const isCrossOs = isCrossOsProfile(profile);
-          const isCrossOsBlocked = isCrossOs;
-          const isRunning =
-            meta.isClient && meta.runningProfiles.has(profile.id);
-          const isLaunching = meta.launchingProfiles.has(profile.id);
-          const isStopping = meta.stoppingProfiles.has(profile.id);
-          const isDisabled =
-            isRunning || isLaunching || isStopping || isCrossOsBlocked;
           const lockedEmail = meta.getProfileLockEmail(profile.id);
           const isLocked = meta.isProfileLockedByAnother(profile.id);
-
-          return (
-            <div className="flex max-w-full min-w-0 items-center gap-1.5 overflow-hidden">
-              <button
-                type="button"
-                className={cn(
-                  "mr-auto h-6 max-w-full min-w-0 overflow-hidden rounded border-none bg-transparent px-2 py-1 text-left",
-                  isDisabled
-                    ? "cursor-not-allowed opacity-60"
-                    : "cursor-pointer hover:bg-accent/50",
-                )}
-                onClick={() => {
-                  if (isDisabled) return;
+          const nameControl = isRuntimeLocked ? (
+            <div className="mr-auto h-6 max-w-full min-w-0 cursor-text overflow-hidden rounded px-2 py-1 text-left select-text">
+              {display}
+            </div>
+          ) : (
+            <button
+              type="button"
+              className={cn(
+                "mr-auto h-6 max-w-full min-w-0 overflow-hidden rounded border-none bg-transparent px-2 py-1 text-left",
+                isCrossOsBlocked
+                  ? "cursor-not-allowed opacity-60"
+                  : "cursor-pointer hover:bg-accent/50",
+              )}
+              onClick={() => {
+                if (isCrossOsBlocked) return;
+                meta.setProfileToRename(profile);
+                meta.setNewProfileName(profile.name);
+                meta.setRenameError(null);
+              }}
+              onKeyDown={(e) => {
+                if (isCrossOsBlocked) return;
+                if (e.key === "Enter" || e.key === " ") {
+                  e.preventDefault();
                   meta.setProfileToRename(profile);
                   meta.setNewProfileName(profile.name);
                   meta.setRenameError(null);
-                }}
-                onKeyDown={(e) => {
-                  if (isDisabled) return;
-                  if (e.key === "Enter" || e.key === " ") {
-                    e.preventDefault();
-                    meta.setProfileToRename(profile);
-                    meta.setNewProfileName(profile.name);
-                    meta.setRenameError(null);
-                  }
-                }}
-              >
-                {display}
-              </button>
+                }
+              }}
+            >
+              {display}
+            </button>
+          );
+
+          return (
+            <div className="flex max-w-full min-w-0 items-center gap-1.5 overflow-hidden">
+              {nameControl}
               {isLocked && (
                 <Tooltip>
                   <TooltipTrigger asChild>
@@ -2595,14 +2626,7 @@ export function ProfilesDataTable({
         cell: ({ row, table }) => {
           const meta = table.options.meta as TableMeta;
           const profile = row.original;
-          const isCrossOs = isCrossOsProfile(profile);
-          const isCrossOsBlocked = isCrossOs;
-          const isRunning =
-            meta.isClient && meta.runningProfiles.has(profile.id);
-          const isLaunching = meta.launchingProfiles.has(profile.id);
-          const isStopping = meta.stoppingProfiles.has(profile.id);
-          const isDisabled =
-            isRunning || isLaunching || isStopping || isCrossOsBlocked;
+          const isDisabled = isCrossOsProfile(profile);
 
           return (
             <TagsCell
@@ -2628,14 +2652,7 @@ export function ProfilesDataTable({
         cell: ({ row, table }) => {
           const meta = table.options.meta as TableMeta;
           const profile = row.original;
-          const isCrossOs = isCrossOsProfile(profile);
-          const isCrossOsBlocked = isCrossOs;
-          const isRunning =
-            meta.isClient && meta.runningProfiles.has(profile.id);
-          const isLaunching = meta.launchingProfiles.has(profile.id);
-          const isStopping = meta.stoppingProfiles.has(profile.id);
-          const isDisabled =
-            isRunning || isLaunching || isStopping || isCrossOsBlocked;
+          const isDisabled = isCrossOsProfile(profile);
 
           return (
             <NoteCell
diff --git a/src/components/settings-dialog.tsx b/src/components/settings-dialog.tsx
index 7436134..8e86f28 100644
--- a/src/components/settings-dialog.tsx
+++ b/src/components/settings-dialog.tsx
@@ -490,7 +490,9 @@ export function SettingsDialog({
       }
 
       setOriginalSettings(settingsToSave);
-      onClose();
+      if (!subPage) {
+        onClose();
+      }
     } catch (error) {
       console.error("Failed to save settings:", error);
     } finally {
@@ -498,6 +500,7 @@ export function SettingsDialog({
     }
   }, [
     onClose,
+    subPage,
     setTheme,
     settings,
     customThemeState,
diff --git a/src/components/ui/animated-tabs.tsx b/src/components/ui/animated-tabs.tsx
index 5315621..c40a2f5 100644
--- a/src/components/ui/animated-tabs.tsx
+++ b/src/components/ui/animated-tabs.tsx
@@ -78,7 +78,7 @@ function AnimatedTabsList({
     <TabsPrimitive.List
       data-slot="animated-tabs-list"
       className={cn(
-        "relative inline-flex max-w-full scrollbar-none items-center gap-1 overflow-x-auto rounded-md p-0",
+        "relative isolate inline-flex max-w-full scrollbar-none items-center gap-1 overflow-x-auto rounded-md p-0",
         className,
       )}
       onMouseLeave={(event) => {
@@ -120,7 +120,7 @@ function AnimatedTabsTrigger({
         onMouseEnter?.(event);
       }}
       className={cn(
-        "relative isolate inline-flex h-7 cursor-pointer items-center justify-center gap-1.5 rounded-md px-3 text-sm font-medium whitespace-nowrap transition-colors duration-150",
+        "relative inline-flex h-7 cursor-pointer items-center justify-center gap-1.5 rounded-md px-3 text-sm font-medium whitespace-nowrap transition-colors duration-150",
         "text-muted-foreground hover:text-foreground",
         isActive && "text-foreground",
         "focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none",
@@ -132,7 +132,7 @@ function AnimatedTabsTrigger({
       {showIndicator && (
         <motion.span
           layoutId={`animated-tabs-indicator-${indicatorId}`}
-          className="absolute inset-0 -z-10 rounded-md bg-accent"
+          className="pointer-events-none absolute inset-0 -z-10 rounded-md bg-accent"
           transition={{ type: "spring", stiffness: 360, damping: 32 }}
         />
       )}