diff --git a/frontend/packages/swarm-ui/src/agent/detail/AgentInference.css b/frontend/packages/swarm-ui/src/agent/detail/AgentInference.css
index f7f0a2b7..90c18e91 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/AgentInference.css
+++ b/frontend/packages/swarm-ui/src/agent/detail/AgentInference.css
@@ -1,4 +1,4 @@
-/* <AgentInference> — one setting per line: badge, then where it comes from. */
+/* <AgentInference> — the settings in one wrapping line: each badge, then where it comes from. */
 .ui-agent-inference {
   display: flex;
   flex-direction: column;
@@ -6,17 +6,16 @@
   gap: 0.3em;
 }
 .ui-agent-inference-list {
+  display: contents;
   list-style: none;
   margin: 0;
   padding: 0;
-  display: grid;
-  gap: 0.3em;
 }
 .ui-agent-inference-list li {
-  display: flex;
-  align-items: center;
-  gap: 0.5em;
-  flex-wrap: wrap;
+  display: contents;
+}
+.ui-agent-inference-source {
+  margin-left: -0.25em;
 }
 .ui-agent-inference-source,
 .ui-agent-inference-muted {
diff --git a/frontend/packages/swarm-ui/src/agent/detail/AgentInference.tsx b/frontend/packages/swarm-ui/src/agent/detail/AgentInference.tsx
index cc3c3cc4..da8c43fb 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/AgentInference.tsx
+++ b/frontend/packages/swarm-ui/src/agent/detail/AgentInference.tsx
@@ -222,62 +222,66 @@ export function AgentInference({ agent }: { agent: string }) {
   return (
     <div class="ui-agent-inference">
       {errorPanel}
-      <ul class="ui-agent-inference-list">
-        <li>
-          {effective ? (
-            <>
-              <Badge label="model" value={effective.model} />
-              <span class="ui-agent-inference-source">
-                {SOURCE_LABEL[effective.model_source]}
-              </span>
-            </>
-          ) : (
+      <div class="ui-badge-row">
+        <ul class="ui-agent-inference-list">
+          <li>
+            {effective ? (
+              <>
+                <Badge label="model" value={effective.model} />
+                <span class="ui-agent-inference-source">
+                  {SOURCE_LABEL[effective.model_source]}
+                </span>
+              </>
+            ) : (
+              <Badge
+                label="model"
+                value={configured?.model ?? "its own"}
+                title="the agent has not reported what it runs on yet"
+              />
+            )}
+          </li>
+          <li>
+            {effective ? (
+              <>
+                <Badge label="effort" value={effective.effort} />
+                <span class="ui-agent-inference-source">
+                  {SOURCE_LABEL[effective.effort_source]}
+                </span>
+              </>
+            ) : (
+              <Badge
+                label="effort"
+                value={configured?.effort ?? "its own"}
+                title="the agent has not reported what it runs on yet"
+              />
+            )}
+          </li>
+          <li>
             <Badge
-              label="model"
-              value={configured?.model ?? "its own"}
-              title="the agent has not reported what it runs on yet"
+              label="subagent models"
+              value={
+                swarmModels.length > 0 ? swarmModels.join(", ") : "its own"
+              }
             />
-          )}
-        </li>
-        <li>
-          {effective ? (
-            <>
-              <Badge label="effort" value={effective.effort} />
-              <span class="ui-agent-inference-source">
-                {SOURCE_LABEL[effective.effort_source]}
-              </span>
-            </>
-          ) : (
+          </li>
+          <li>
             <Badge
-              label="effort"
-              value={configured?.effort ?? "its own"}
-              title="the agent has not reported what it runs on yet"
+              label="max subagents"
+              value={
+                configured?.max_subagents === 0
+                  ? "0 (no subagents)"
+                  : String(configured?.max_subagents ?? "no cap")
+              }
             />
-          )}
-        </li>
-        <li>
-          <Badge
-            label="subagent models"
-            value={swarmModels.length > 0 ? swarmModels.join(", ") : "its own"}
-          />
-        </li>
-        <li>
-          <Badge
-            label="max subagents"
-            value={
-              configured?.max_subagents === 0
-                ? "0 (no subagents)"
-                : String(configured?.max_subagents ?? "no cap")
-            }
-          />
-        </li>
-      </ul>
-      <Badge
-        variant="quiet"
-        value="edit"
-        title={`set the swarm's model, effort, subagent models and subagent cap for ${agent}`}
-        onClick={() => setEditing(true)}
-      />
+          </li>
+        </ul>
+        <Badge
+          variant="quiet"
+          value="edit"
+          title={`set the swarm's model, effort, subagent models and subagent cap for ${agent}`}
+          onClick={() => setEditing(true)}
+        />
+      </div>
       <Dialog
         open={editing}
         onClose={() => setEditing(false)}
diff --git a/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.css b/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.css
index 13aaa477..bbebf0fd 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.css
+++ b/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.css
@@ -1,4 +1,4 @@
-/* <AgentLimits> — one cap per line, then the edit action. */
+/* <AgentLimits> — the caps and the edit action in one wrapping line. */
 .ui-agent-limits {
   display: flex;
   flex-direction: column;
@@ -6,11 +6,10 @@
   gap: 0.3em;
 }
 .ui-agent-limits-list {
+  display: contents;
   list-style: none;
   margin: 0;
   padding: 0;
-  display: grid;
-  gap: 0.3em;
 }
 .ui-agent-limits-muted {
   color: var(--muted);
diff --git a/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.tsx b/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.tsx
index c4adeaf6..3444f22f 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.tsx
+++ b/frontend/packages/swarm-ui/src/agent/detail/AgentLimits.tsx
@@ -138,20 +138,22 @@ export function AgentLimits({ agent }: { agent: string }) {
   return (
     <div class="ui-agent-limits">
       {errorPanel}
-      <ul class="ui-agent-limits-list">
-        <li>
-          <Badge label="cpu quota" value={caps.cpu_quota ?? HIVE_DECIDES} />
-        </li>
-        <li>
-          <Badge label="memory max" value={caps.memory_max ?? HIVE_DECIDES} />
-        </li>
-      </ul>
-      <Badge
-        variant="quiet"
-        value="edit"
-        title={`set the swarm's CPU and memory caps for ${agent}`}
-        onClick={() => setEditing(true)}
-      />
+      <div class="ui-badge-row">
+        <ul class="ui-agent-limits-list">
+          <li>
+            <Badge label="cpu quota" value={caps.cpu_quota ?? HIVE_DECIDES} />
+          </li>
+          <li>
+            <Badge label="memory max" value={caps.memory_max ?? HIVE_DECIDES} />
+          </li>
+        </ul>
+        <Badge
+          variant="quiet"
+          value="edit"
+          title={`set the swarm's CPU and memory caps for ${agent}`}
+          onClick={() => setEditing(true)}
+        />
+      </div>
       <Dialog
         open={editing}
         onClose={() => setEditing(false)}
diff --git a/frontend/packages/swarm-ui/src/agent/detail/AllowedDomains.tsx b/frontend/packages/swarm-ui/src/agent/detail/AllowedDomains.tsx
index 7017ef08..793f016f 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/AllowedDomains.tsx
+++ b/frontend/packages/swarm-ui/src/agent/detail/AllowedDomains.tsx
@@ -136,7 +136,7 @@ export function AllowedDomains({ agent }: { agent: string }) {
   return (
     <div class="ui-agent-limits">
       {errorPanel}
-      <div class="ui-badge-popover-row">
+      <div class="ui-badge-row">
         {shown.length === 0 ? (
           <Badge label="allowed domains" value="none added" />
         ) : null}
diff --git a/frontend/packages/swarm-ui/src/ui/badge-popover/BadgePopover.css b/frontend/packages/swarm-ui/src/ui/badge-popover/BadgePopover.css
index 61c23dd3..1ab6620d 100644
--- a/frontend/packages/swarm-ui/src/ui/badge-popover/BadgePopover.css
+++ b/frontend/packages/swarm-ui/src/ui/badge-popover/BadgePopover.css
@@ -25,8 +25,8 @@
   display: grid;
   gap: 0.3em;
 }
-/* A line of badge popovers that wraps when it runs out of room. */
-.ui-badge-popover-row {
+/* A line of badges that wraps when it runs out of room. */
+.ui-badge-row {
   display: flex;
   flex-wrap: wrap;
   align-items: center;