diff --git a/messages/en-US.json b/messages/en-US.json
index f13489f55..363a2a99d 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1099,7 +1099,7 @@
     "accessRoleErrorNewRequired": "New role is required",
     "accessRoleErrorRemove": "Failed to remove role",
     "accessRoleErrorRemoveDescription": "An error occurred while removing the role.",
-    "accessRoleInferenceBudget": "Inference Budget",
+    "accessRoleInferenceBudget": "AI Budget",
     "accessRoleInferenceBudgetDescription": "Configure how members of this role restrict AI usage based on spending or token limits",
     "accessRoleName": "Role Name",
     "accessRoleQuestionRemove": "You're about to delete the `{name}` role. You cannot undo this action.",
@@ -1720,7 +1720,7 @@
     "virtualApiKeysErrorFetchSecret": "Error loading secret",
     "virtualApiKeysErrorFetchSecretDescription": "Failed to load the virtual API key secret",
     "virtualApiKeysFilterUnassigned": "Unassigned",
-    "virtualApiKeysInferenceBudget": "Inference Budget",
+    "virtualApiKeysInferenceBudget": "Budget",
     "virtualApiKeysInferenceBudgetDescription": "Configure how this key restricts AI usage based on spending or token limits",
     "myVirtualApiKeysTitle": "Your API Keys",
     "myVirtualApiKeysDescription": "View your identity key and any virtual API keys attributed to you in this organization",
@@ -1924,10 +1924,10 @@
     "aiProviderModelsSourceAll": "Matches every model key",
     "aiProviderModelsBudgetConfigured": "Budget configured",
     "aiProviderModelsEditTitle": "Edit Model",
-    "aiProviderModelsEditDescription": "Update the model key or configure its inference budget.",
-    "aiProviderModelsBudgetTab": "Inference Budget",
+    "aiProviderModelsEditDescription": "Update the model key or configure its budget.",
+    "aiProviderModelsBudgetTab": "Budget",
     "aiProviderModelsBudgetDescription": "Configure how this model restricts usage based on spending or token limits",
-    "aiProviderModelsBudgetUnsaved": "Save this model first to configure its inference budget.",
+    "aiProviderModelsBudgetUnsaved": "Save this model first to configure its budget.",
     "aiProviderModelsKeyLabel": "Model Key",
     "aiProviderModelsKeyRequired": "Enter a model key",
     "aiProviderModelsKeyDuplicate": "This model key is already on a list",
diff --git a/src/components/AiProviderModelListEditor.tsx b/src/components/AiProviderModelListEditor.tsx
index 38014d25f..4da6fb10c 100644
--- a/src/components/AiProviderModelListEditor.tsx
+++ b/src/components/AiProviderModelListEditor.tsx
@@ -964,8 +964,7 @@ function EditModelCredenza({
                                                 rows={pendingBudgetRows}
                                                 onChange={setPendingBudgetRows}
                                                 disabled={
-                                                    budgetsQuery.isLoading ||
-                                                    savingBudgets
+                                                    budgetsQuery.isLoading
                                                 }
                                                 attemptedSave={
                                                     attemptedBudgetsSave
diff --git a/src/components/BudgetsEditor.tsx b/src/components/BudgetsEditor.tsx
index 3ccbfad3c..fe4cf2f9a 100644
--- a/src/components/BudgetsEditor.tsx
+++ b/src/components/BudgetsEditor.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import {
+    SettingsFormCell,
+    SettingsFormGrid,
     SettingsSection,
     SettingsSectionBody,
     SettingsSectionDescription,
@@ -9,7 +11,6 @@ import {
     SettingsSectionTitle
 } from "@app/components/Settings";
 import { Button } from "@app/components/ui/button";
-import { DataTableEmptyState } from "@app/components/ui/data-table-empty-state";
 import { Input } from "@app/components/ui/input";
 import {
     Select,
@@ -18,14 +19,6 @@ import {
     SelectTrigger,
     SelectValue
 } from "@app/components/ui/select";
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow
-} from "@app/components/ui/table";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
@@ -37,6 +30,7 @@ import {
     type AiBudgetScope,
     type AiBudgetUnit
 } from "@app/lib/aiBudgetScope";
+import { cn } from "@app/lib/cn";
 import { aiBudgetQueries } from "@app/lib/queries";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import type { AiBudget } from "@server/db";
@@ -127,6 +121,113 @@ export function getBudgetRowsErrors(rows: BudgetRow[]): {
     return { conflictingKeys, invalidAmountKeys };
 }
 
+type BudgetRowFieldProps = {
+    row: BudgetRow;
+    disabled: boolean;
+    showInvalidAmount: boolean;
+    showConflict: boolean;
+    unitLabels: Record<AiBudgetUnit, string>;
+    periodLabels: Record<AiBudgetPeriod, string>;
+    amountPlaceholder: string;
+    onUpdate: (patch: Partial<BudgetRow>) => void;
+};
+
+function BudgetRowAmountInput({
+    row,
+    disabled,
+    showInvalidAmount,
+    amountPlaceholder,
+    onUpdate,
+    className
+}: Pick<
+    BudgetRowFieldProps,
+    "row" | "disabled" | "showInvalidAmount" | "amountPlaceholder" | "onUpdate"
+> & { className?: string }) {
+    return (
+        <Input
+            type="number"
+            min="0"
+            step="any"
+            placeholder={amountPlaceholder}
+            value={row.amount}
+            aria-invalid={showInvalidAmount}
+            disabled={disabled}
+            onChange={(e) => onUpdate({ amount: e.target.value })}
+            className={cn("w-full min-w-0", className)}
+        />
+    );
+}
+
+function BudgetRowUnitSelect({
+    row,
+    disabled,
+    showConflict,
+    unitLabels,
+    onUpdate,
+    className
+}: Pick<
+    BudgetRowFieldProps,
+    "row" | "disabled" | "showConflict" | "unitLabels" | "onUpdate"
+> & { className?: string }) {
+    return (
+        <Select
+            value={row.unit}
+            onValueChange={(value) => onUpdate({ unit: value as AiBudgetUnit })}
+            disabled={disabled}
+        >
+            <SelectTrigger
+                className={cn("w-full min-w-0", className)}
+                aria-invalid={showConflict}
+            >
+                <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+                {AI_BUDGET_UNITS.map((unit) => (
+                    <SelectItem key={unit} value={unit}>
+                        {unitLabels[unit]}
+                    </SelectItem>
+                ))}
+            </SelectContent>
+        </Select>
+    );
+}
+
+function BudgetRowPeriodSelect({
+    row,
+    disabled,
+    showConflict,
+    periodLabels,
+    onUpdate,
+    className
+}: Pick<
+    BudgetRowFieldProps,
+    "row" | "disabled" | "showConflict" | "periodLabels" | "onUpdate"
+> & { className?: string }) {
+    return (
+        <Select
+            value={row.period}
+            onValueChange={(value) =>
+                onUpdate({ period: value as AiBudgetPeriod })
+            }
+            disabled={disabled}
+        >
+            <SelectTrigger
+                className={cn("w-full min-w-0", className)}
+                aria-invalid={showConflict}
+            >
+                <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+                {AI_BUDGET_PERIODS.map((period) => (
+                    <SelectItem key={period} value={period}>
+                        {periodLabels[period]}
+                    </SelectItem>
+                ))}
+            </SelectContent>
+        </Select>
+    );
+}
+
 export function BudgetRowsFields({
     rows,
     onChange,
@@ -173,6 +274,8 @@ export function BudgetRowsFields({
         tokens: t("aiBudgetUnitTokens")
     };
 
+    const amountPlaceholder = t("aiBudgetAmountPlaceholder");
+
     const addRowButton = (
         <Button
             type="button"
@@ -185,148 +288,90 @@ export function BudgetRowsFields({
         </Button>
     );
 
+    const errorMessage =
+        conflictingKeys.size > 0 ||
+        (attemptedSave && invalidAmountKeys.size > 0) ? (
+            <p className="text-destructive text-sm">
+                {conflictingKeys.size > 0
+                    ? t("aiBudgetConflictError")
+                    : t("aiBudgetInvalidAmountError")}
+            </p>
+        ) : null;
+
+    function rowFieldProps(row: BudgetRow): BudgetRowFieldProps {
+        return {
+            row,
+            disabled,
+            showInvalidAmount: attemptedSave && invalidAmountKeys.has(row.key),
+            showConflict: conflictingKeys.has(row.key),
+            unitLabels,
+            periodLabels,
+            amountPlaceholder,
+            onUpdate: (patch) => updateRow(row.key, patch)
+        };
+    }
+
     return (
-        <div className="space-y-4">
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>{t("aiBudgetAmount")}</TableHead>
-                        <TableHead>{t("aiBudgetUnit")}</TableHead>
-                        <TableHead>{t("aiBudgetPeriod")}</TableHead>
-                        <TableHead></TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody>
-                    {rows.length === 0 ? (
-                        <DataTableEmptyState
-                            colSpan={4}
-                            message={t("aiBudgetEmpty")}
-                            action={addRowButton}
-                            compact
-                        />
-                    ) : (
-                        rows.map((row) => {
-                            const showConflict = conflictingKeys.has(row.key);
-                            const showInvalidAmount =
-                                attemptedSave &&
-                                invalidAmountKeys.has(row.key);
-                            return (
-                                <TableRow key={row.key}>
-                                    <TableCell>
-                                        <Input
-                                            type="number"
-                                            min="0"
-                                            step="any"
-                                            placeholder={t(
-                                                "aiBudgetAmountPlaceholder"
-                                            )}
-                                            value={row.amount}
-                                            aria-invalid={showInvalidAmount}
-                                            disabled={disabled}
-                                            onChange={(e) =>
-                                                updateRow(row.key, {
-                                                    amount: e.target.value
-                                                })
-                                            }
-                                            className="w-full min-w-0"
-                                        />
-                                    </TableCell>
-                                    <TableCell>
-                                        <Select
-                                            value={row.unit}
-                                            onValueChange={(value) =>
-                                                updateRow(row.key, {
-                                                    unit: value as AiBudgetUnit
-                                                })
-                                            }
-                                            disabled={disabled}
-                                        >
-                                            <SelectTrigger
-                                                className="w-full min-w-0"
-                                                aria-invalid={showConflict}
-                                            >
-                                                <SelectValue />
-                                            </SelectTrigger>
-                                            <SelectContent>
-                                                {AI_BUDGET_UNITS.map(
-                                                    (unit) => (
-                                                        <SelectItem
-                                                            key={unit}
-                                                            value={unit}
-                                                        >
-                                                            {
-                                                                unitLabels[
-                                                                    unit
-                                                                ]
-                                                            }
-                                                        </SelectItem>
-                                                    )
-                                                )}
-                                            </SelectContent>
-                                        </Select>
-                                    </TableCell>
-                                    <TableCell>
-                                        <Select
-                                            value={row.period}
-                                            onValueChange={(value) =>
-                                                updateRow(row.key, {
-                                                    period: value as AiBudgetPeriod
-                                                })
-                                            }
-                                            disabled={disabled}
-                                        >
-                                            <SelectTrigger
-                                                className="w-full min-w-0"
-                                                aria-invalid={showConflict}
-                                            >
-                                                <SelectValue />
-                                            </SelectTrigger>
-                                            <SelectContent>
-                                                {AI_BUDGET_PERIODS.map(
-                                                    (period) => (
-                                                        <SelectItem
-                                                            key={period}
-                                                            value={period}
-                                                        >
-                                                            {
-                                                                periodLabels[
-                                                                    period
-                                                                ]
-                                                            }
-                                                        </SelectItem>
-                                                    )
-                                                )}
-                                            </SelectContent>
-                                        </Select>
-                                    </TableCell>
-                                    <TableCell>
-                                        <div className="flex items-center justify-end space-x-2">
-                                            <Button
-                                                type="button"
-                                                variant="outline"
-                                                disabled={disabled}
-                                                onClick={() =>
-                                                    removeRow(row.key)
-                                                }
-                                            >
-                                                Delete
-                                            </Button>
-                                        </div>
-                                    </TableCell>
-                                </TableRow>
-                            );
-                        })
-                    )}
-                </TableBody>
-            </Table>
-            {(conflictingKeys.size > 0 ||
-                (attemptedSave && invalidAmountKeys.size > 0)) && (
-                <p className="text-xs text-destructive">
-                    {conflictingKeys.size > 0
-                        ? t("aiBudgetConflictError")
-                        : t("aiBudgetInvalidAmountError")}
-                </p>
+        <div className="space-y-3">
+            {rows.length === 0 ? (
+                <div className="space-y-3">
+                    <p className="text-sm text-muted-foreground">
+                        {t("aiBudgetEmpty")}
+                    </p>
+                    {addRowButton}
+                </div>
+            ) : (
+                <div className="space-y-2">
+                    {rows.map((row) => {
+                        const fields = rowFieldProps(row);
+                        return (
+                            <div
+                                key={row.key}
+                                className="flex items-center gap-2"
+                            >
+                                <div
+                                    className={cn(
+                                        "flex h-9 min-w-0 flex-1 overflow-hidden rounded-md border border-input",
+                                        "focus-within:border-ring",
+                                        (fields.showInvalidAmount ||
+                                            fields.showConflict) &&
+                                            "border-destructive"
+                                    )}
+                                >
+                                    <BudgetRowUnitSelect
+                                        {...fields}
+                                        className="h-full w-28 min-w-28 shrink-0 rounded-none border-0 px-2 shadow-none focus-visible:ring-0"
+                                    />
+                                    <div
+                                        className="w-px shrink-0 bg-border"
+                                        aria-hidden
+                                    />
+                                    <BudgetRowAmountInput
+                                        {...fields}
+                                        className="h-full min-w-0 flex-1 rounded-none border-0 text-sm shadow-none focus-visible:border-transparent focus-visible:ring-0"
+                                    />
+                                </div>
+                                <BudgetRowPeriodSelect
+                                    {...fields}
+                                    className="h-9 w-32 min-w-32 shrink-0"
+                                />
+                                <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="icon"
+                                    className="shrink-0"
+                                    disabled={disabled}
+                                    onClick={() => removeRow(row.key)}
+                                    aria-label={t("delete")}
+                                >
+                                    <Trash2 className="h-4 w-4" />
+                                </Button>
+                            </div>
+                        );
+                    })}
+                </div>
             )}
+            {errorMessage}
             {rows.length > 0 && addRowButton}
         </div>
     );
@@ -474,12 +519,16 @@ export function BudgetsEditor({
     const body = (
         <>
             <SettingsSectionBody>
-                <BudgetRowsFields
-                    rows={rows}
-                    onChange={setRows}
-                    disabled={saveLoading || budgetsQuery.isLoading}
-                    attemptedSave={attemptedSave}
-                />
+                <SettingsFormGrid>
+                    <SettingsFormCell span="half">
+                        <BudgetRowsFields
+                            rows={rows}
+                            onChange={setRows}
+                            disabled={budgetsQuery.isLoading}
+                            attemptedSave={attemptedSave}
+                        />
+                    </SettingsFormCell>
+                </SettingsFormGrid>
             </SettingsSectionBody>
 
             <SettingsSectionFooter>
diff --git a/src/components/CreateVirtualApiKeyForm.tsx b/src/components/CreateVirtualApiKeyForm.tsx
index c443ad4b9..4a97d358a 100644
--- a/src/components/CreateVirtualApiKeyForm.tsx
+++ b/src/components/CreateVirtualApiKeyForm.tsx
@@ -99,9 +99,7 @@ export default function CreateVirtualApiKeyForm({
     const [selectedResources, setSelectedResources] = useState<
         SelectedResource[]
     >([]);
-    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>(
-        []
-    );
+    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>([]);
     const [attemptedBudgetsSave, setAttemptedBudgetsSave] = useState(false);
 
     const formSchema = z.object({
@@ -204,10 +202,7 @@ export default function CreateVirtualApiKeyForm({
                     toast({
                         variant: "destructive",
                         title: t("aiBudgetErrorSave"),
-                        description: formatAxiosError(
-                            e,
-                            t("aiBudgetErrorSave")
-                        )
+                        description: formatAxiosError(e, t("aiBudgetErrorSave"))
                     });
                 }
             }
@@ -295,120 +290,47 @@ export default function CreateVirtualApiKeyForm({
                                             }
                                         ]}
                                     >
-                                    <div className="space-y-4 mt-4">
-                                    <FormField
-                                        control={form.control}
-                                        name="name"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <FormLabel>
-                                                    {t("virtualApiKeysName")}
-                                                </FormLabel>
-                                                <FormControl>
-                                                    <Input {...field} />
-                                                </FormControl>
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-
-                                    <FormField
-                                        control={form.control}
-                                        name="description"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <FormLabel>
-                                                    {t(
-                                                        "virtualApiKeysDescriptionOptional"
-                                                    )}
-                                                </FormLabel>
-                                                <FormControl>
-                                                    <Input {...field} />
-                                                </FormControl>
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-
-                                    <div className="space-y-2">
-                                        <FormLabel>
-                                            {t(
-                                                "virtualApiKeysAssociateUserOptional"
-                                            )}
-                                        </FormLabel>
-                                        <Popover>
-                                            <PopoverTrigger asChild>
-                                                <Button
-                                                    variant="outline"
-                                                    role="combobox"
-                                                    className={cn(
-                                                        "w-full justify-between",
-                                                        !selectedUser &&
-                                                            "text-muted-foreground"
-                                                    )}
-                                                >
-                                                    {selectedUser?.text
-                                                        ? selectedUser.text
-                                                        : t("userSelect")}
-                                                    <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                                                </Button>
-                                            </PopoverTrigger>
-                                            <PopoverContent className="p-0 w-[var(--radix-popover-trigger-width)]">
-                                                <UserSelector
-                                                    orgId={org.org.orgId}
-                                                    selectedUser={selectedUser}
-                                                    onSelectUser={
-                                                        setSelectedUser
-                                                    }
-                                                />
-                                            </PopoverContent>
-                                        </Popover>
-                                        <p className="text-sm text-muted-foreground">
-                                            {t(
-                                                "virtualApiKeysAssociateUserDescription"
-                                            )}
-                                        </p>
-                                    </div>
-
-                                    <div className="space-y-3">
-                                        <div className="flex items-start space-x-2">
-                                            <Checkbox
-                                                id="all-resources"
-                                                checked={allResources}
-                                                onCheckedChange={(val) => {
-                                                    setAllResources(
-                                                        val as boolean
-                                                    );
-                                                    if (val) {
-                                                        setSelectedResources(
-                                                            []
-                                                        );
-                                                    }
-                                                }}
-                                                className="mt-0.5"
+                                        <div className="space-y-4 mt-4">
+                                            <FormField
+                                                control={form.control}
+                                                name="name"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <FormLabel>
+                                                            {t(
+                                                                "virtualApiKeysName"
+                                                            )}
+                                                        </FormLabel>
+                                                        <FormControl>
+                                                            <Input {...field} />
+                                                        </FormControl>
+                                                        <FormMessage />
+                                                    </FormItem>
+                                                )}
+                                            />
+
+                                            <FormField
+                                                control={form.control}
+                                                name="description"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <FormLabel>
+                                                            {t(
+                                                                "virtualApiKeysDescriptionOptional"
+                                                            )}
+                                                        </FormLabel>
+                                                        <FormControl>
+                                                            <Input {...field} />
+                                                        </FormControl>
+                                                        <FormMessage />
+                                                    </FormItem>
+                                                )}
                                             />
-                                            <div className="space-y-1">
-                                                <label
-                                                    htmlFor="all-resources"
-                                                    className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                                                >
-                                                    {t(
-                                                        "virtualApiKeysAllResources"
-                                                    )}
-                                                </label>
-                                                <p className="text-sm text-muted-foreground">
-                                                    {t(
-                                                        "virtualApiKeysAllResourcesDescription"
-                                                    )}
-                                                </p>
-                                            </div>
-                                        </div>
 
-                                        {!allResources && (
                                             <div className="space-y-2">
                                                 <FormLabel>
                                                     {t(
-                                                        "virtualApiKeysSelectResources"
+                                                        "virtualApiKeysAssociateUserOptional"
                                                     )}
                                                 </FormLabel>
                                                 <Popover>
@@ -418,69 +340,155 @@ export default function CreateVirtualApiKeyForm({
                                                             role="combobox"
                                                             className={cn(
                                                                 "w-full justify-between",
-                                                                selectedResources.length ===
-                                                                    0 &&
+                                                                !selectedUser &&
                                                                     "text-muted-foreground"
                                                             )}
                                                         >
-                                                            <span className="truncate text-left">
-                                                                {formatMultiResourcesSelectorLabel(
-                                                                    selectedResources,
-                                                                    t,
-                                                                    "virtualApiKeysSelectResourcesPlaceholder"
-                                                                )}
-                                                            </span>
+                                                            {selectedUser?.text
+                                                                ? selectedUser.text
+                                                                : t(
+                                                                      "userSelect"
+                                                                  )}
                                                             <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
                                                         </Button>
                                                     </PopoverTrigger>
-                                                    <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0">
-                                                        <MultiResourcesSelector
+                                                    <PopoverContent className="p-0 w-[var(--radix-popover-trigger-width)]">
+                                                        <UserSelector
                                                             orgId={
                                                                 org.org.orgId
                                                             }
-                                                            selectedResources={
-                                                                selectedResources
+                                                            selectedUser={
+                                                                selectedUser
                                                             }
-                                                            onSelectionChange={
-                                                                setSelectedResources
-                                                            }
-                                                            protocol="inference"
-                                                            showClear={
-                                                                selectedResources.length >
-                                                                0
-                                                            }
-                                                            onClear={() =>
-                                                                setSelectedResources(
-                                                                    []
-                                                                )
+                                                            onSelectUser={
+                                                                setSelectedUser
                                                             }
                                                         />
                                                     </PopoverContent>
                                                 </Popover>
-                                                <FormDescription>
+                                                <p className="text-sm text-muted-foreground">
                                                     {t(
-                                                        "virtualApiKeysSelectResourcesDescription"
+                                                        "virtualApiKeysAssociateUserDescription"
                                                     )}
-                                                </FormDescription>
+                                                </p>
                                             </div>
-                                        )}
-                                    </div>
-                                    </div>
 
-                                    <div className="space-y-4 mt-4">
-                                        <p className="text-sm text-muted-foreground">
-                                            {t(
-                                                "virtualApiKeysInferenceBudgetDescription"
-                                            )}
-                                        </p>
-                                        <BudgetRowsFields
-                                            rows={pendingBudgetRows}
-                                            onChange={setPendingBudgetRows}
-                                            attemptedSave={
-                                                attemptedBudgetsSave
-                                            }
-                                        />
-                                    </div>
+                                            <div className="space-y-3">
+                                                <div className="flex items-start space-x-2">
+                                                    <Checkbox
+                                                        id="all-resources"
+                                                        checked={allResources}
+                                                        onCheckedChange={(
+                                                            val
+                                                        ) => {
+                                                            setAllResources(
+                                                                val as boolean
+                                                            );
+                                                            if (val) {
+                                                                setSelectedResources(
+                                                                    []
+                                                                );
+                                                            }
+                                                        }}
+                                                        className="mt-0.5"
+                                                    />
+                                                    <div className="space-y-1">
+                                                        <label
+                                                            htmlFor="all-resources"
+                                                            className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                                                        >
+                                                            {t(
+                                                                "virtualApiKeysAllResources"
+                                                            )}
+                                                        </label>
+                                                        <p className="text-sm text-muted-foreground">
+                                                            {t(
+                                                                "virtualApiKeysAllResourcesDescription"
+                                                            )}
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                {!allResources && (
+                                                    <div className="space-y-2">
+                                                        <FormLabel>
+                                                            {t(
+                                                                "virtualApiKeysSelectResources"
+                                                            )}
+                                                        </FormLabel>
+                                                        <Popover>
+                                                            <PopoverTrigger
+                                                                asChild
+                                                            >
+                                                                <Button
+                                                                    variant="outline"
+                                                                    role="combobox"
+                                                                    className={cn(
+                                                                        "w-full justify-between",
+                                                                        selectedResources.length ===
+                                                                            0 &&
+                                                                            "text-muted-foreground"
+                                                                    )}
+                                                                >
+                                                                    <span className="truncate text-left">
+                                                                        {formatMultiResourcesSelectorLabel(
+                                                                            selectedResources,
+                                                                            t,
+                                                                            "virtualApiKeysSelectResourcesPlaceholder"
+                                                                        )}
+                                                                    </span>
+                                                                    <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                                                                </Button>
+                                                            </PopoverTrigger>
+                                                            <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0">
+                                                                <MultiResourcesSelector
+                                                                    orgId={
+                                                                        org.org
+                                                                            .orgId
+                                                                    }
+                                                                    selectedResources={
+                                                                        selectedResources
+                                                                    }
+                                                                    onSelectionChange={
+                                                                        setSelectedResources
+                                                                    }
+                                                                    protocol="inference"
+                                                                    showClear={
+                                                                        selectedResources.length >
+                                                                        0
+                                                                    }
+                                                                    onClear={() =>
+                                                                        setSelectedResources(
+                                                                            []
+                                                                        )
+                                                                    }
+                                                                />
+                                                            </PopoverContent>
+                                                        </Popover>
+                                                        <FormDescription>
+                                                            {t(
+                                                                "virtualApiKeysSelectResourcesDescription"
+                                                            )}
+                                                        </FormDescription>
+                                                    </div>
+                                                )}
+                                            </div>
+                                        </div>
+
+                                        <div className="space-y-4 mt-4">
+                                            <p className="text-sm text-muted-foreground">
+                                                {t(
+                                                    "virtualApiKeysInferenceBudgetDescription"
+                                                )}
+                                            </p>
+                                            <BudgetRowsFields
+                                                rows={pendingBudgetRows}
+                                                onChange={setPendingBudgetRows}
+                                                attemptedSave={
+                                                    attemptedBudgetsSave
+                                                }
+                                            />
+                                        </div>
                                     </HorizontalTabs>
                                 </form>
                             </Form>
diff --git a/src/components/EditVirtualApiKeyForm.tsx b/src/components/EditVirtualApiKeyForm.tsx
index 1d3e78dbd..b8fbcac98 100644
--- a/src/components/EditVirtualApiKeyForm.tsx
+++ b/src/components/EditVirtualApiKeyForm.tsx
@@ -112,9 +112,7 @@ export default function EditVirtualApiKeyForm({
     >([]);
     const [credential, setCredential] = useState<string | null>(null);
     const [credentialLoading, setCredentialLoading] = useState(false);
-    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>(
-        []
-    );
+    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>([]);
     const [attemptedBudgetsSave, setAttemptedBudgetsSave] = useState(false);
 
     const budgetScope = {
@@ -350,9 +348,7 @@ export default function EditVirtualApiKeyForm({
                     <div className="flex flex-col gap-y-4 px-1">
                         <Form {...form}>
                             <form
-                                onSubmit={form.handleSubmit(
-                                    handleFormSubmit
-                                )}
+                                onSubmit={form.handleSubmit(handleFormSubmit)}
                                 className="space-y-4"
                                 id="edit-virtual-api-key-form"
                             >
@@ -369,99 +365,11 @@ export default function EditVirtualApiKeyForm({
                                         }
                                     ]}
                                 >
-                                <div className="space-y-4 mt-4">
-                                <div className="space-y-2">
-                                    <Label>
-                                        {t(
-                                            "virtualApiKeysAssociateUserOptional"
-                                        )}
-                                    </Label>
-                                    <Popover>
-                                        <PopoverTrigger asChild>
-                                            <Button
-                                                variant="outline"
-                                                role="combobox"
-                                                className={cn(
-                                                    "w-full justify-between",
-                                                    !selectedUser &&
-                                                        "text-muted-foreground"
-                                                )}
-                                            >
-                                                {selectedUser?.text
-                                                    ? selectedUser.text
-                                                    : t("userSelect")}
-                                                <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                                            </Button>
-                                        </PopoverTrigger>
-                                        <PopoverContent className="p-0 w-[var(--radix-popover-trigger-width)]">
-                                            <UserSelector
-                                                orgId={org.org.orgId}
-                                                selectedUser={selectedUser}
-                                                onSelectUser={setSelectedUser}
-                                            />
-                                        </PopoverContent>
-                                    </Popover>
-                                    <p className="text-sm text-muted-foreground">
-                                        {t(
-                                            "virtualApiKeysAssociateUserDescription"
-                                        )}
-                                    </p>
-                                </div>
-
-                                <div className="space-y-3">
-                                    <FormField
-                                        control={form.control}
-                                        name="allResources"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <div className="flex items-start space-x-2">
-                                                    <FormControl>
-                                                        <Checkbox
-                                                            id="edit-all-resources"
-                                                            checked={
-                                                                field.value
-                                                            }
-                                                            onCheckedChange={(
-                                                                val
-                                                            ) => {
-                                                                field.onChange(
-                                                                    val as boolean
-                                                                );
-                                                                if (val) {
-                                                                    setSelectedResources(
-                                                                        []
-                                                                    );
-                                                                }
-                                                            }}
-                                                            className="mt-0.5"
-                                                        />
-                                                    </FormControl>
-                                                    <div className="space-y-1">
-                                                        <label
-                                                            htmlFor="edit-all-resources"
-                                                            className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                                                        >
-                                                            {t(
-                                                                "virtualApiKeysAllResources"
-                                                            )}
-                                                        </label>
-                                                        <p className="text-sm text-muted-foreground">
-                                                            {t(
-                                                                "virtualApiKeysAllResourcesDescription"
-                                                            )}
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-
-                                    {!allResources && (
+                                    <div className="space-y-4 mt-4">
                                         <div className="space-y-2">
                                             <Label>
                                                 {t(
-                                                    "virtualApiKeysSelectResources"
+                                                    "virtualApiKeysAssociateUserOptional"
                                                 )}
                                             </Label>
                                             <Popover>
@@ -471,66 +379,163 @@ export default function EditVirtualApiKeyForm({
                                                         role="combobox"
                                                         className={cn(
                                                             "w-full justify-between",
-                                                            selectedResources.length ===
-                                                                0 &&
+                                                            !selectedUser &&
                                                                 "text-muted-foreground"
                                                         )}
                                                     >
-                                                        <span className="truncate text-left">
-                                                            {formatMultiResourcesSelectorLabel(
-                                                                selectedResources,
-                                                                t,
-                                                                "virtualApiKeysSelectResourcesPlaceholder"
-                                                            )}
-                                                        </span>
+                                                        {selectedUser?.text
+                                                            ? selectedUser.text
+                                                            : t("userSelect")}
                                                         <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
                                                     </Button>
                                                 </PopoverTrigger>
-                                                <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0">
-                                                    <MultiResourcesSelector
+                                                <PopoverContent className="p-0 w-[var(--radix-popover-trigger-width)]">
+                                                    <UserSelector
                                                         orgId={org.org.orgId}
-                                                        selectedResources={
-                                                            selectedResources
+                                                        selectedUser={
+                                                            selectedUser
                                                         }
-                                                        onSelectionChange={
-                                                            setSelectedResources
-                                                        }
-                                                        protocol="inference"
-                                                        showClear={
-                                                            selectedResources.length >
-                                                            0
-                                                        }
-                                                        onClear={() =>
-                                                            setSelectedResources(
-                                                                []
-                                                            )
+                                                        onSelectUser={
+                                                            setSelectedUser
                                                         }
                                                     />
                                                 </PopoverContent>
                                             </Popover>
-                                            <FormDescription>
+                                            <p className="text-sm text-muted-foreground">
                                                 {t(
-                                                    "virtualApiKeysSelectResourcesRequired"
+                                                    "virtualApiKeysAssociateUserDescription"
                                                 )}
-                                            </FormDescription>
+                                            </p>
                                         </div>
-                                    )}
-                                </div>
-                                </div>
 
-                                <div className="space-y-4 mt-4">
-                                    <p className="text-sm text-muted-foreground">
-                                        {t(
-                                            "virtualApiKeysInferenceBudgetDescription"
-                                        )}
-                                    </p>
-                                    <BudgetRowsFields
-                                        rows={pendingBudgetRows}
-                                        onChange={setPendingBudgetRows}
-                                        disabled={budgetsQuery.isLoading}
-                                        attemptedSave={attemptedBudgetsSave}
-                                    />
-                                </div>
+                                        <div className="space-y-3">
+                                            <FormField
+                                                control={form.control}
+                                                name="allResources"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <div className="flex items-start space-x-2">
+                                                            <FormControl>
+                                                                <Checkbox
+                                                                    id="edit-all-resources"
+                                                                    checked={
+                                                                        field.value
+                                                                    }
+                                                                    onCheckedChange={(
+                                                                        val
+                                                                    ) => {
+                                                                        field.onChange(
+                                                                            val as boolean
+                                                                        );
+                                                                        if (
+                                                                            val
+                                                                        ) {
+                                                                            setSelectedResources(
+                                                                                []
+                                                                            );
+                                                                        }
+                                                                    }}
+                                                                    className="mt-0.5"
+                                                                />
+                                                            </FormControl>
+                                                            <div className="space-y-1">
+                                                                <label
+                                                                    htmlFor="edit-all-resources"
+                                                                    className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                                                                >
+                                                                    {t(
+                                                                        "virtualApiKeysAllResources"
+                                                                    )}
+                                                                </label>
+                                                                <p className="text-sm text-muted-foreground">
+                                                                    {t(
+                                                                        "virtualApiKeysAllResourcesDescription"
+                                                                    )}
+                                                                </p>
+                                                            </div>
+                                                        </div>
+                                                        <FormMessage />
+                                                    </FormItem>
+                                                )}
+                                            />
+
+                                            {!allResources && (
+                                                <div className="space-y-2">
+                                                    <Label>
+                                                        {t(
+                                                            "virtualApiKeysSelectResources"
+                                                        )}
+                                                    </Label>
+                                                    <Popover>
+                                                        <PopoverTrigger asChild>
+                                                            <Button
+                                                                variant="outline"
+                                                                role="combobox"
+                                                                className={cn(
+                                                                    "w-full justify-between",
+                                                                    selectedResources.length ===
+                                                                        0 &&
+                                                                        "text-muted-foreground"
+                                                                )}
+                                                            >
+                                                                <span className="truncate text-left">
+                                                                    {formatMultiResourcesSelectorLabel(
+                                                                        selectedResources,
+                                                                        t,
+                                                                        "virtualApiKeysSelectResourcesPlaceholder"
+                                                                    )}
+                                                                </span>
+                                                                <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                                                            </Button>
+                                                        </PopoverTrigger>
+                                                        <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0">
+                                                            <MultiResourcesSelector
+                                                                orgId={
+                                                                    org.org
+                                                                        .orgId
+                                                                }
+                                                                selectedResources={
+                                                                    selectedResources
+                                                                }
+                                                                onSelectionChange={
+                                                                    setSelectedResources
+                                                                }
+                                                                protocol="inference"
+                                                                showClear={
+                                                                    selectedResources.length >
+                                                                    0
+                                                                }
+                                                                onClear={() =>
+                                                                    setSelectedResources(
+                                                                        []
+                                                                    )
+                                                                }
+                                                            />
+                                                        </PopoverContent>
+                                                    </Popover>
+                                                    <FormDescription>
+                                                        {t(
+                                                            "virtualApiKeysSelectResourcesRequired"
+                                                        )}
+                                                    </FormDescription>
+                                                </div>
+                                            )}
+                                        </div>
+                                    </div>
+
+                                    <div className="space-y-4 mt-4">
+                                        <p className="text-sm text-muted-foreground">
+                                            {t(
+                                                "virtualApiKeysInferenceBudgetDescription"
+                                            )}
+                                        </p>
+                                        <BudgetRowsFields
+                                            rows={pendingBudgetRows}
+                                            onChange={setPendingBudgetRows}
+                                            disabled={budgetsQuery.isLoading}
+                                            attemptedSave={attemptedBudgetsSave}
+                                        />
+                                    </div>
                                 </HorizontalTabs>
                             </form>
                         </Form>
diff --git a/src/components/RoleForm.tsx b/src/components/RoleForm.tsx
index 4e8f457cb..186da2a00 100644
--- a/src/components/RoleForm.tsx
+++ b/src/components/RoleForm.tsx
@@ -219,9 +219,7 @@ export function RoleForm({
         useState<PendingTextImport | null>(null);
     const [dragOverField, setDragOverField] =
         useState<RoleTextImportField | null>(null);
-    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>(
-        []
-    );
+    const [pendingBudgetRows, setPendingBudgetRows] = useState<BudgetRow[]>([]);
     const [attemptedBudgetsSave, setAttemptedBudgetsSave] = useState(false);
 
     const budgetsQuery = useQuery({
@@ -702,7 +700,6 @@ export function RoleForm({
                             </div>
                         )}
 
-                        {/* Inference Budget tab */}
                         <div className="space-y-4 mt-4">
                             <p className="text-sm text-muted-foreground">
                                 {t("accessRoleInferenceBudgetDescription")}
@@ -711,8 +708,7 @@ export function RoleForm({
                                 rows={pendingBudgetRows}
                                 onChange={setPendingBudgetRows}
                                 disabled={
-                                    variant === "edit" &&
-                                    budgetsQuery.isLoading
+                                    variant === "edit" && budgetsQuery.isLoading
                                 }
                                 attemptedSave={attemptedBudgetsSave}
                             />