diff --git a/ui/web/src/components/layout/system-settings-modal.tsx b/ui/web/src/components/layout/system-settings-modal.tsx
index d6cf545e..db9f0ff0 100644
--- a/ui/web/src/components/layout/system-settings-modal.tsx
+++ b/ui/web/src/components/layout/system-settings-modal.tsx
@@ -275,7 +275,7 @@ export function SystemSettingsModal({ open, onOpenChange }: SystemSettingsModalP
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex max-h-[90vh] w-[95vw] flex-col sm:max-w-2xl">
+      <DialogContent className="flex max-h-[90vh] w-[95vw] flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Settings2 className="h-5 w-5" />
diff --git a/ui/web/src/pages/agents/agent-detail/agent-advanced-dialog.tsx b/ui/web/src/pages/agents/agent-detail/agent-advanced-dialog.tsx
index 27967a8b..16202a66 100644
--- a/ui/web/src/pages/agents/agent-detail/agent-advanced-dialog.tsx
+++ b/ui/web/src/pages/agents/agent-detail/agent-advanced-dialog.tsx
@@ -213,7 +213,7 @@ export function AgentAdvancedDialog({ open, onOpenChange, agent, onUpdate }: Age
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-2xl">
+      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Settings className="h-4 w-4" />
diff --git a/ui/web/src/pages/agents/agent-detail/heartbeat-config-dialog.tsx b/ui/web/src/pages/agents/agent-detail/heartbeat-config-dialog.tsx
index df680cd9..1c7b6453 100644
--- a/ui/web/src/pages/agents/agent-detail/heartbeat-config-dialog.tsx
+++ b/ui/web/src/pages/agents/agent-detail/heartbeat-config-dialog.tsx
@@ -163,7 +163,7 @@ export function HeartbeatConfigDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-2xl">
+      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Heart className="h-4 w-4 text-rose-500" />
diff --git a/ui/web/src/pages/channels/channel-detail/channel-advanced-dialog.tsx b/ui/web/src/pages/channels/channel-detail/channel-advanced-dialog.tsx
index 1a9a11c8..858e9312 100644
--- a/ui/web/src/pages/channels/channel-detail/channel-advanced-dialog.tsx
+++ b/ui/web/src/pages/channels/channel-detail/channel-advanced-dialog.tsx
@@ -93,7 +93,7 @@ export function ChannelAdvancedDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-2xl">
+      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Settings className="h-4 w-4" />
diff --git a/ui/web/src/pages/channels/channel-fields.tsx b/ui/web/src/pages/channels/channel-fields.tsx
index 2db4e618..124d5283 100644
--- a/ui/web/src/pages/channels/channel-fields.tsx
+++ b/ui/web/src/pages/channels/channel-fields.tsx
@@ -123,20 +123,23 @@ function FieldRenderer({
         </div>
       );
 
-    case "boolean":
+    case "boolean": {
+      const boolHint = resolvedHint || help;
       return (
-        <div className={`flex items-center gap-2${disabled ? " opacity-50" : ""}`}>
-          <Switch
-            id={id}
-            checked={(value as boolean) ?? (field.defaultValue as boolean) ?? false}
-            onCheckedChange={(v) => onChange(v)}
-            disabled={disabled}
-          />
-          <Label htmlFor={id}>{label}</Label>
-          {resolvedHint && <span className="text-xs text-muted-foreground ml-1">— {resolvedHint}</span>}
-          {!resolvedHint && help && <span className="text-xs text-muted-foreground ml-1">— {help}</span>}
+        <div className={`grid gap-1${disabled ? " opacity-50" : ""}`}>
+          <div className="flex items-center gap-2">
+            <Switch
+              id={id}
+              checked={(value as boolean) ?? (field.defaultValue as boolean) ?? false}
+              onCheckedChange={(v) => onChange(v)}
+              disabled={disabled}
+            />
+            <Label htmlFor={id}>{label}</Label>
+          </div>
+          {boolHint && <p className="text-xs text-muted-foreground ml-9">{boolHint}</p>}
         </div>
       );
+    }
 
     case "select":
       return (
diff --git a/ui/web/src/pages/cron/cron-detail/cron-advanced-dialog.tsx b/ui/web/src/pages/cron/cron-detail/cron-advanced-dialog.tsx
index b8d33995..0275cab6 100644
--- a/ui/web/src/pages/cron/cron-detail/cron-advanced-dialog.tsx
+++ b/ui/web/src/pages/cron/cron-detail/cron-advanced-dialog.tsx
@@ -117,7 +117,7 @@ export function CronAdvancedDialog({ open, onOpenChange, job, onUpdate }: CronAd
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-2xl">
+      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Settings className="h-4 w-4" />
diff --git a/ui/web/src/pages/providers/provider-detail/provider-advanced-dialog.tsx b/ui/web/src/pages/providers/provider-detail/provider-advanced-dialog.tsx
index 4da63eff..ade377bc 100644
--- a/ui/web/src/pages/providers/provider-detail/provider-advanced-dialog.tsx
+++ b/ui/web/src/pages/providers/provider-detail/provider-advanced-dialog.tsx
@@ -110,7 +110,7 @@ export function ProviderAdvancedDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-2xl">
+      <DialogContent className="max-h-[90vh] w-[95vw] flex flex-col sm:max-w-3xl">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Settings className="h-4 w-4" />