diff --git a/.oxlintrc.json b/.oxlintrc.json
index 8d8de0274f2..ee5c80fb16f 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -115,6 +115,7 @@
     {
       "files": ["apps/webapp/app/**/*.ts", "apps/webapp/app/**/*.tsx"],
       "rules": {
+        "react/jsx-no-useless-fragment": "error",
         "react/no-unstable-nested-components": "error",
         "react/rules-of-hooks": "error",
         "trigger-runops/no-control-plane-run-graph-access": "error",
diff --git a/apps/webapp/app/components/ErrorDisplay.tsx b/apps/webapp/app/components/ErrorDisplay.tsx
index d40fce0957b..d0f60840f35 100644
--- a/apps/webapp/app/components/ErrorDisplay.tsx
+++ b/apps/webapp/app/components/ErrorDisplay.tsx
@@ -34,22 +34,16 @@ export function RouteErrorDisplay(options?: ErrorDisplayOptions) {
     );
   }
 
-  return (
-    <>
-      {isRouteErrorResponse(error) ? (
-        <ErrorDisplay
-          title={friendlyErrorDisplay(error.status, error.statusText).title}
-          message={
-            error.data.message ?? friendlyErrorDisplay(error.status, error.statusText).message
-          }
-          {...options}
-        />
-      ) : error instanceof Error ? (
-        <ErrorDisplay title={error.name} message={error.message} {...options} />
-      ) : (
-        <ErrorDisplay title="Oops" message={JSON.stringify(error)} {...options} />
-      )}
-    </>
+  return isRouteErrorResponse(error) ? (
+    <ErrorDisplay
+      title={friendlyErrorDisplay(error.status, error.statusText).title}
+      message={error.data.message ?? friendlyErrorDisplay(error.status, error.statusText).message}
+      {...options}
+    />
+  ) : error instanceof Error ? (
+    <ErrorDisplay title={error.name} message={error.message} {...options} />
+  ) : (
+    <ErrorDisplay title="Oops" message={JSON.stringify(error)} {...options} />
   );
 }
 
diff --git a/apps/webapp/app/components/dashboard-agent/AskAgentButton.tsx b/apps/webapp/app/components/dashboard-agent/AskAgentButton.tsx
index f5acc37bb38..602a96e123b 100644
--- a/apps/webapp/app/components/dashboard-agent/AskAgentButton.tsx
+++ b/apps/webapp/app/components/dashboard-agent/AskAgentButton.tsx
@@ -21,7 +21,7 @@ export function AskAgentButton({
   fallback?: React.ReactNode;
 }) {
   const available = useDashboardAgentAvailable();
-  if (!available) return <>{fallback}</>;
+  if (!available) return fallback;
 
   const button = (
     <Button
diff --git a/apps/webapp/app/components/dashboard-agent/WhenAgentUnavailable.tsx b/apps/webapp/app/components/dashboard-agent/WhenAgentUnavailable.tsx
index b9c58605c65..9e849ce8282 100644
--- a/apps/webapp/app/components/dashboard-agent/WhenAgentUnavailable.tsx
+++ b/apps/webapp/app/components/dashboard-agent/WhenAgentUnavailable.tsx
@@ -6,5 +6,5 @@ export function WhenAgentUnavailable({ children }: { children: React.ReactNode }
     return null;
   }
 
-  return <>{children}</>;
+  return children;
 }
diff --git a/apps/webapp/app/components/primitives/Buttons.tsx b/apps/webapp/app/components/primitives/Buttons.tsx
index 1394d8c803d..1dcac677d8e 100644
--- a/apps/webapp/app/components/primitives/Buttons.tsx
+++ b/apps/webapp/app/components/primitives/Buttons.tsx
@@ -318,7 +318,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
                 {text}
               </span>
             ) : (
-              <>{text}</>
+              text
             ))}
 
           {shortcut &&
diff --git a/apps/webapp/app/components/primitives/SegmentedControl.tsx b/apps/webapp/app/components/primitives/SegmentedControl.tsx
index 0fdccdbbc42..6d88d2aff3b 100644
--- a/apps/webapp/app/components/primitives/SegmentedControl.tsx
+++ b/apps/webapp/app/components/primitives/SegmentedControl.tsx
@@ -129,25 +129,23 @@ export default function SegmentedControl({
               }
             >
               {({ checked }) => (
-                <>
-                  <div
-                    className={cn(
-                      "relative flex h-full w-full items-center justify-between",
-                      variantStyle.option
-                    )}
-                  >
-                    <div className="z-10 flex h-full w-full items-center justify-center">
-                      <RadioGroup.Label as="p">{option.label}</RadioGroup.Label>
-                    </div>
-                    {checked && (
-                      <motion.div
-                        layoutId={`segmented-control-${name}`}
-                        transition={{ duration: 0.4, type: "spring" }}
-                        className={variantStyle.selected}
-                      />
-                    )}
+                <div
+                  className={cn(
+                    "relative flex h-full w-full items-center justify-between",
+                    variantStyle.option
+                  )}
+                >
+                  <div className="z-10 flex h-full w-full items-center justify-center">
+                    <RadioGroup.Label as="p">{option.label}</RadioGroup.Label>
                   </div>
-                </>
+                  {checked && (
+                    <motion.div
+                      layoutId={`segmented-control-${name}`}
+                      transition={{ duration: 0.4, type: "spring" }}
+                      className={variantStyle.selected}
+                    />
+                  )}
+                </div>
               )}
             </RadioGroup.Option>
           ))}
diff --git a/apps/webapp/app/components/primitives/Select.tsx b/apps/webapp/app/components/primitives/Select.tsx
index 129e3396dd0..446a6fc5f1f 100644
--- a/apps/webapp/app/components/primitives/Select.tsx
+++ b/apps/webapp/app/components/primitives/Select.tsx
@@ -225,7 +225,7 @@ export function Select<TValue extends string | string[], TItem>({
         {...props}
       />
       <SelectPopover className={popoverClassName}>
-        {!searchable && showHeading && heading && <SelectHeading render={<>{heading}</>} />}
+        {!searchable && showHeading && heading && <SelectHeading render={<span>{heading}</span>} />}
         {searchable && <ComboBox placeholder={heading} shortcut={shortcut} value={searchValue} />}
 
         <SelectList>
@@ -313,22 +313,20 @@ export function SelectTrigger({
     content = children;
   } else if (text !== undefined) {
     if (typeof text === "function") {
-      content = <SelectValue>{(value) => <>{text(value) ?? placeholder}</>}</SelectValue>;
+      content = <SelectValue>{(value) => text(value) ?? placeholder}</SelectValue>;
     } else {
       content = text;
     }
   } else {
     content = (
       <SelectValue>
-        {(value) => (
-          <>
-            {typeof value === "string"
-              ? (value ?? placeholder)
-              : value.length === 0
-                ? placeholder
-                : value.join(", ")}
-          </>
-        )}
+        {(value) =>
+          typeof value === "string"
+            ? (value ?? placeholder)
+            : value.length === 0
+              ? placeholder
+              : value.join(", ")
+        }
       </SelectValue>
     );
   }
diff --git a/apps/webapp/app/components/primitives/Table.tsx b/apps/webapp/app/components/primitives/Table.tsx
index bd9b2e82185..995765772e1 100644
--- a/apps/webapp/app/components/primitives/Table.tsx
+++ b/apps/webapp/app/components/primitives/Table.tsx
@@ -460,7 +460,7 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
             {trailingContent}
           </div>
         ) : (
-          <>{children}</>
+          children
         )}
       </td>
     );
diff --git a/apps/webapp/app/components/primitives/Tabs.tsx b/apps/webapp/app/components/primitives/Tabs.tsx
index b1284944d15..d7762f33843 100644
--- a/apps/webapp/app/components/primitives/Tabs.tsx
+++ b/apps/webapp/app/components/primitives/Tabs.tsx
@@ -258,38 +258,36 @@ export function TabButton({
       ref={ref}
       {...props}
     >
-      <>
-        <div className={cn("flex items-center gap-1", title && "flex-1")}>
-          <span
-            className={cn(
-              "transition duration-200",
-              title
-                ? cn(
-                    headerVariants.header2.text,
-                    isActive ? "text-text-bright" : "text-text-dimmed group-hover:text-text-bright"
-                  )
-                : "text-sm text-text-bright"
-            )}
-          >
-            {props.children}
-          </span>
-          {shortcut && <ShortcutKey className={cn("")} shortcut={shortcut} variant={"small"} />}
-        </div>
-        {isActive ? (
-          <motion.div
-            layoutId={layoutId}
-            transition={{ type: "spring", stiffness: 500, damping: 30 }}
-            className={cn("h-0.5 w-full bg-indigo-500", !title && "mt-1")}
-          />
-        ) : (
-          <div
-            className={cn(
-              "h-0.5 w-full bg-surface-control-active opacity-0 transition duration-200 group-hover:opacity-100",
-              !title && "mt-1"
-            )}
-          />
-        )}
-      </>
+      <div className={cn("flex items-center gap-1", title && "flex-1")}>
+        <span
+          className={cn(
+            "transition duration-200",
+            title
+              ? cn(
+                  headerVariants.header2.text,
+                  isActive ? "text-text-bright" : "text-text-dimmed group-hover:text-text-bright"
+                )
+              : "text-sm text-text-bright"
+          )}
+        >
+          {props.children}
+        </span>
+        {shortcut && <ShortcutKey className={cn("")} shortcut={shortcut} variant={"small"} />}
+      </div>
+      {isActive ? (
+        <motion.div
+          layoutId={layoutId}
+          transition={{ type: "spring", stiffness: 500, damping: 30 }}
+          className={cn("h-0.5 w-full bg-indigo-500", !title && "mt-1")}
+        />
+      ) : (
+        <div
+          className={cn(
+            "h-0.5 w-full bg-surface-control-active opacity-0 transition duration-200 group-hover:opacity-100",
+            !title && "mt-1"
+          )}
+        />
+      )}
     </button>
   );
 }
diff --git a/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx b/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
index ddb7220213c..4f134a14b68 100644
--- a/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
@@ -253,11 +253,7 @@ export function TaskRunsTable({
           >
             Duration
           </TableHeaderCell>
-          {showCompute && (
-            <>
-              <TableHeaderCell>Compute</TableHeaderCell>
-            </>
-          )}
+          {showCompute && <TableHeaderCell>Compute</TableHeaderCell>}
           <TableHeaderCell className="pl-4" tooltip={<MachineTooltipInfo />}>
             Machine
           </TableHeaderCell>
diff --git a/apps/webapp/app/root.tsx b/apps/webapp/app/root.tsx
index 1e550155fde..43812d5653d 100644
--- a/apps/webapp/app/root.tsx
+++ b/apps/webapp/app/root.tsx
@@ -146,27 +146,25 @@ export const shouldRevalidate: ShouldRevalidateFunction = (options) => {
 
 export function ErrorBoundary() {
   return (
-    <>
-      <html lang="en" className="h-full" data-theme="classic">
-        <head>
-          <meta charSet="utf-8" />
-
-          <StaleAssetRecovery isProduction={isProduction} />
-          <Meta />
-          <Links />
-        </head>
-        <body className="h-full overflow-hidden bg-background-dimmed antialiased">
-          <ShortcutsProvider>
-            <AppContainer>
-              <MainCenteredContainer>
-                <RouteErrorDisplay />
-              </MainCenteredContainer>
-            </AppContainer>
-          </ShortcutsProvider>
-          <Scripts />
-        </body>
-      </html>
-    </>
+    <html lang="en" className="h-full" data-theme="classic">
+      <head>
+        <meta charSet="utf-8" />
+
+        <StaleAssetRecovery isProduction={isProduction} />
+        <Meta />
+        <Links />
+      </head>
+      <body className="h-full overflow-hidden bg-background-dimmed antialiased">
+        <ShortcutsProvider>
+          <AppContainer>
+            <MainCenteredContainer>
+              <RouteErrorDisplay />
+            </MainCenteredContainer>
+          </AppContainer>
+        </ShortcutsProvider>
+        <Scripts />
+      </body>
+    </html>
   );
 }
 
@@ -180,39 +178,37 @@ export default function App() {
   const resolvedTheme = themePreference === "system" ? "dark" : themePreference;
 
   return (
-    <>
-      <html
-        lang="en"
-        className="h-full"
-        // The pre-paint script below may flip data-theme before hydration
-        suppressHydrationWarning
-        data-theme={resolvedTheme}
-        data-theme-preference={themePreference}
-        // Contrast overlay input for the System themes; Classic never reads it
-        style={{ "--theme-contrast": themeContrast / 100 } as CSSProperties}
-      >
-        <head>
-          <script
-            dangerouslySetInnerHTML={{
-              __html: `try{if(document.documentElement.getAttribute("data-theme-preference")==="system"){document.documentElement.setAttribute("data-theme",matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light")}}catch(e){}`,
-            }}
-          />
-          <StaleAssetRecovery isProduction={isProduction} />
-          <Meta />
-          <Links />
-        </head>
-        <body className="h-full overflow-hidden bg-background-dimmed antialiased">
-          <ShortcutsProvider>
-            <TimezoneSetter />
-            <GlobalShortcuts />
-            <Outlet />
-            <Toast />
-          </ShortcutsProvider>
-          <ScrollRestoration />
-          <ExternalScripts />
-          <Scripts />
-        </body>
-      </html>
-    </>
+    <html
+      lang="en"
+      className="h-full"
+      // The pre-paint script below may flip data-theme before hydration
+      suppressHydrationWarning
+      data-theme={resolvedTheme}
+      data-theme-preference={themePreference}
+      // Contrast overlay input for the System themes; Classic never reads it
+      style={{ "--theme-contrast": themeContrast / 100 } as CSSProperties}
+    >
+      <head>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `try{if(document.documentElement.getAttribute("data-theme-preference")==="system"){document.documentElement.setAttribute("data-theme",matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light")}}catch(e){}`,
+          }}
+        />
+        <StaleAssetRecovery isProduction={isProduction} />
+        <Meta />
+        <Links />
+      </head>
+      <body className="h-full overflow-hidden bg-background-dimmed antialiased">
+        <ShortcutsProvider>
+          <TimezoneSetter />
+          <GlobalShortcuts />
+          <Outlet />
+          <Toast />
+        </ShortcutsProvider>
+        <ScrollRestoration />
+        <ExternalScripts />
+        <Scripts />
+      </body>
+    </html>
   );
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
index cee7e34f444..00cdeb58a1c 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
@@ -563,7 +563,7 @@ function RunningCell({ state }: { state: UnifiedRunningState | undefined }) {
   if (!state) {
     return <span className="text-text-dimmed">–</span>;
   }
-  return <>{state.running ?? 0}</>;
+  return state.running ?? 0;
 }
 
 function TaskTypeFilter() {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
index aaf50f69d2f..a1c8e2c9801 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
@@ -352,15 +352,13 @@ export default function Page() {
                       }
                       text={(value) => renderSlackChannel(slack.channels, value)}
                     >
-                      {(matches) => (
-                        <>
-                          {matches?.map((channel) => (
-                            <SelectItem key={channel.id} value={`${channel.id}/${channel.name}`}>
-                              <SlackChannelTitle {...channel} />
-                            </SelectItem>
-                          ))}
-                        </>
-                      )}
+                      {(matches) =>
+                        matches?.map((channel) => (
+                          <SelectItem key={channel.id} value={`${channel.id}/${channel.name}`}>
+                            <SlackChannelTitle {...channel} />
+                          </SelectItem>
+                        ))
+                      }
                     </Select>
                     {selectedSlackChannel && selectedSlackChannel.is_private && (
                       <Callout
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
index 715cb76d3be..613433756b3 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
@@ -467,9 +467,7 @@ function Upgradable({
                         </div>
                         <ArrowDownIcon className="size-4 animate-bounce text-success" />
                       </div>
-                    ) : (
-                      <></>
-                    )}
+                    ) : null}
                   </div>
                 </TableCell>
               </TableRow>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
index ed39ddac4ed..c30c2e1f815 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
@@ -193,184 +193,182 @@ export default function Page() {
               </div>
             </MainCenteredContainer>
           ) : (
-            <>
-              <div className="overflow-x-auto">
-                <Table>
-                  <TableHeader>
-                    <TableRow>
-                      <TableHeaderCell>Region</TableHeaderCell>
-                      <TableHeaderCell>Cloud Provider</TableHeaderCell>
-                      <TableHeaderCell>
-                        <span className="flex items-center gap-1">
-                          Location
-                          <InfoIconTooltip
-                            content="Region location is where your runs execute, not where your data is stored."
-                            contentClassName="normal-case tracking-normal"
-                          />
-                        </span>
-                      </TableHeaderCell>
-                      <TableHeaderCell>Static IPs</TableHeaderCell>
-                      {isAdmin && <TableHeaderCell>Admin</TableHeaderCell>}
-                      <TableHeaderCell
-                        alignment="right"
-                        tooltip={
-                          <div className="max-w-48">
-                            <Paragraph variant="small">
-                              When you trigger a run it will execute in your default region, unless
-                              you override the region when triggering.
-                            </Paragraph>
-                            <LinkButton
-                              variant="docs/small"
-                              LeadingIcon={BookOpenIcon}
-                              to={docsPath("triggering#region")}
-                              className="mb-1 mt-3"
-                            >
-                              Read docs
-                            </LinkButton>
-                          </div>
-                        }
-                      >
-                        Default region
-                      </TableHeaderCell>
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    {regions.length === 0 ? (
-                      <TableBlankRow colSpan={5}>
-                        <Paragraph>There are no regions for this project</Paragraph>
-                      </TableBlankRow>
-                    ) : (
-                      regions.map((region) => {
-                        return (
-                          <TableRow key={region.id}>
-                            <TableCell isTabbableCell>
-                              <span className="flex items-center gap-2">
-                                <CopyableText value={region.name} />
-                                {region.workloadType === "MICROVM" && (
-                                  <Badge variant="small">MicroVM</Badge>
-                                )}
-                              </span>
-                            </TableCell>
-                            <TableCell>
-                              {region.cloudProvider ? (
-                                <span className="flex items-center gap-2">
-                                  <CloudProviderIcon
-                                    provider={region.cloudProvider}
-                                    className="size-6"
-                                  />
-                                  {cloudProviderTitle(region.cloudProvider)}
-                                </span>
-                              ) : (
-                                "–"
+            <div className="overflow-x-auto">
+              <Table>
+                <TableHeader>
+                  <TableRow>
+                    <TableHeaderCell>Region</TableHeaderCell>
+                    <TableHeaderCell>Cloud Provider</TableHeaderCell>
+                    <TableHeaderCell>
+                      <span className="flex items-center gap-1">
+                        Location
+                        <InfoIconTooltip
+                          content="Region location is where your runs execute, not where your data is stored."
+                          contentClassName="normal-case tracking-normal"
+                        />
+                      </span>
+                    </TableHeaderCell>
+                    <TableHeaderCell>Static IPs</TableHeaderCell>
+                    {isAdmin && <TableHeaderCell>Admin</TableHeaderCell>}
+                    <TableHeaderCell
+                      alignment="right"
+                      tooltip={
+                        <div className="max-w-48">
+                          <Paragraph variant="small">
+                            When you trigger a run it will execute in your default region, unless
+                            you override the region when triggering.
+                          </Paragraph>
+                          <LinkButton
+                            variant="docs/small"
+                            LeadingIcon={BookOpenIcon}
+                            to={docsPath("triggering#region")}
+                            className="mb-1 mt-3"
+                          >
+                            Read docs
+                          </LinkButton>
+                        </div>
+                      }
+                    >
+                      Default region
+                    </TableHeaderCell>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {regions.length === 0 ? (
+                    <TableBlankRow colSpan={5}>
+                      <Paragraph>There are no regions for this project</Paragraph>
+                    </TableBlankRow>
+                  ) : (
+                    regions.map((region) => {
+                      return (
+                        <TableRow key={region.id}>
+                          <TableCell isTabbableCell>
+                            <span className="flex items-center gap-2">
+                              <CopyableText value={region.name} />
+                              {region.workloadType === "MICROVM" && (
+                                <Badge variant="small">MicroVM</Badge>
                               )}
-                            </TableCell>
-                            <TableCell>
+                            </span>
+                          </TableCell>
+                          <TableCell>
+                            {region.cloudProvider ? (
                               <span className="flex items-center gap-2">
-                                {region.location ? (
-                                  <FlagIcon region={region.location} className="size-5" />
-                                ) : null}
-                                {region.description ?? "–"}
-                              </span>
-                            </TableCell>
-                            <TableCell>
-                              {region.staticIPs === null ? (
-                                <LinkButton
-                                  variant="secondary/small"
-                                  to={v3BillingPath(
-                                    organization,
-                                    "Upgrade your plan to unlock static IPs"
-                                  )}
-                                  LeadingIcon={ArrowUpCircleIcon}
-                                  leadingIconClassName="text-indigo-500"
-                                >
-                                  Unlock static IPs
-                                </LinkButton>
-                              ) : region.staticIPs !== undefined ? (
-                                <ClipboardField
-                                  value={region.staticIPs}
-                                  variant={"secondary/small"}
+                                <CloudProviderIcon
+                                  provider={region.cloudProvider}
+                                  className="size-6"
                                 />
-                              ) : (
-                                "Not available"
-                              )}
-                            </TableCell>
-                            {isAdmin && (
-                              <TableCell>{region.isHidden ? "Hidden" : "Visible"}</TableCell>
-                            )}
-                            {region.isDefault ? (
-                              <TableCell alignment="right">
-                                <Badge variant="small" className="inline-grid">
-                                  Default
-                                </Badge>
-                              </TableCell>
+                                {cloudProviderTitle(region.cloudProvider)}
+                              </span>
                             ) : (
-                              <TableCellMenu
-                                className="pl-32"
-                                isSticky
-                                hiddenButtons={
-                                  <SetDefaultDialog regions={regions} newDefaultRegion={region} />
-                                }
-                              />
+                              "–"
                             )}
-                          </TableRow>
-                        );
-                      })
-                    )}
-
-                    <TableRow className="h-12.5">
-                      <TableCell colSpan={isAdmin ? 5 : 4}>
-                        <Paragraph variant="extra-small">Suggest a new region</Paragraph>
-                      </TableCell>
-                      <TableCellMenu
-                        className="suggest-region-cell"
-                        alignment="right"
-                        isSticky
-                        visibleButtons={
-                          <Feedback
-                            button={
-                              <Button
+                          </TableCell>
+                          <TableCell>
+                            <span className="flex items-center gap-2">
+                              {region.location ? (
+                                <FlagIcon region={region.location} className="size-5" />
+                              ) : null}
+                              {region.description ?? "–"}
+                            </span>
+                          </TableCell>
+                          <TableCell>
+                            {region.staticIPs === null ? (
+                              <LinkButton
                                 variant="secondary/small"
-                                LeadingIcon={ChatBubbleLeftEllipsisIcon}
+                                to={v3BillingPath(
+                                  organization,
+                                  "Upgrade your plan to unlock static IPs"
+                                )}
+                                LeadingIcon={ArrowUpCircleIcon}
                                 leadingIconClassName="text-indigo-500"
                               >
-                                Suggest a region…
-                              </Button>
-                            }
-                            defaultValue="region"
-                          />
-                        }
-                      />
-                    </TableRow>
-                  </TableBody>
-                </Table>
-                {isManagedCloud && (
-                  <InfoPanel
-                    icon={InformationCircleIcon}
-                    iconClassName="size-4"
-                    variant="minimal"
-                    panelClassName="max-w-full gap-1"
-                  >
-                    <Paragraph variant="extra-small">
-                      Trigger.dev is fully{" "}
-                      <TextLink to="https://security.trigger.dev/gdpr?tab=securityControls&frameworks=gdpr_v1">
-                        GDPR compliant
-                      </TextLink>
-                      . Learn more in our{" "}
-                      <TextLink to="https://security.trigger.dev">security portal</TextLink> or{" "}
-                      <Feedback
-                        button={
-                          <span className="cursor-pointer text-xs text-indigo-500 transition hover:text-indigo-400">
-                            get in touch
-                          </span>
-                        }
-                        defaultValue="feedback"
-                      />
-                      .
-                    </Paragraph>
-                  </InfoPanel>
-                )}
-              </div>
-            </>
+                                Unlock static IPs
+                              </LinkButton>
+                            ) : region.staticIPs !== undefined ? (
+                              <ClipboardField
+                                value={region.staticIPs}
+                                variant={"secondary/small"}
+                              />
+                            ) : (
+                              "Not available"
+                            )}
+                          </TableCell>
+                          {isAdmin && (
+                            <TableCell>{region.isHidden ? "Hidden" : "Visible"}</TableCell>
+                          )}
+                          {region.isDefault ? (
+                            <TableCell alignment="right">
+                              <Badge variant="small" className="inline-grid">
+                                Default
+                              </Badge>
+                            </TableCell>
+                          ) : (
+                            <TableCellMenu
+                              className="pl-32"
+                              isSticky
+                              hiddenButtons={
+                                <SetDefaultDialog regions={regions} newDefaultRegion={region} />
+                              }
+                            />
+                          )}
+                        </TableRow>
+                      );
+                    })
+                  )}
+
+                  <TableRow className="h-12.5">
+                    <TableCell colSpan={isAdmin ? 5 : 4}>
+                      <Paragraph variant="extra-small">Suggest a new region</Paragraph>
+                    </TableCell>
+                    <TableCellMenu
+                      className="suggest-region-cell"
+                      alignment="right"
+                      isSticky
+                      visibleButtons={
+                        <Feedback
+                          button={
+                            <Button
+                              variant="secondary/small"
+                              LeadingIcon={ChatBubbleLeftEllipsisIcon}
+                              leadingIconClassName="text-indigo-500"
+                            >
+                              Suggest a region…
+                            </Button>
+                          }
+                          defaultValue="region"
+                        />
+                      }
+                    />
+                  </TableRow>
+                </TableBody>
+              </Table>
+              {isManagedCloud && (
+                <InfoPanel
+                  icon={InformationCircleIcon}
+                  iconClassName="size-4"
+                  variant="minimal"
+                  panelClassName="max-w-full gap-1"
+                >
+                  <Paragraph variant="extra-small">
+                    Trigger.dev is fully{" "}
+                    <TextLink to="https://security.trigger.dev/gdpr?tab=securityControls&frameworks=gdpr_v1">
+                      GDPR compliant
+                    </TextLink>
+                    . Learn more in our{" "}
+                    <TextLink to="https://security.trigger.dev">security portal</TextLink> or{" "}
+                    <Feedback
+                      button={
+                        <span className="cursor-pointer text-xs text-indigo-500 transition hover:text-indigo-400">
+                          get in touch
+                        </span>
+                      }
+                      defaultValue="feedback"
+                    />
+                    .
+                  </Paragraph>
+                </InfoPanel>
+              )}
+            </div>
           )}
         </div>
       </PageBody>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
index c50511f7ad6..53ba28b800b 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
@@ -1051,79 +1051,77 @@ function TasksTreeView({
               getTreeProps={getTreeProps}
               parentClassName="pl-3"
               renderNode={({ node, state, index }) => (
-                <>
-                  <div
-                    className={cn(
-                      "group/spannode flex h-8 cursor-pointer items-center overflow-hidden rounded-l-sm pr-2",
-                      state.selected
-                        ? "bg-grid-dimmed hover:bg-grid-bright"
-                        : "bg-transparent hover:bg-grid-dimmed"
-                    )}
-                    onClick={() => {
-                      selectNode(node.id);
-                    }}
-                  >
-                    <div className="flex h-8 items-center">
-                      {Array.from({ length: node.level }).map((_, index) => (
-                        <TaskLine
-                          key={index}
-                          isError={node.data.isError}
-                          isSelected={state.selected}
-                        />
-                      ))}
-                      <div
-                        className={cn(
-                          "flex h-8 w-4 items-center",
-                          node.hasChildren && "hover:bg-surface-control"
-                        )}
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          if (e.altKey) {
-                            if (state.expanded) {
-                              collapseAllBelowDepth(node.level);
-                            } else {
-                              expandAllBelowDepth(node.level);
-                            }
+                <div
+                  className={cn(
+                    "group/spannode flex h-8 cursor-pointer items-center overflow-hidden rounded-l-sm pr-2",
+                    state.selected
+                      ? "bg-grid-dimmed hover:bg-grid-bright"
+                      : "bg-transparent hover:bg-grid-dimmed"
+                  )}
+                  onClick={() => {
+                    selectNode(node.id);
+                  }}
+                >
+                  <div className="flex h-8 items-center">
+                    {Array.from({ length: node.level }).map((_, index) => (
+                      <TaskLine
+                        key={index}
+                        isError={node.data.isError}
+                        isSelected={state.selected}
+                      />
+                    ))}
+                    <div
+                      className={cn(
+                        "flex h-8 w-4 items-center",
+                        node.hasChildren && "hover:bg-surface-control"
+                      )}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        if (e.altKey) {
+                          if (state.expanded) {
+                            collapseAllBelowDepth(node.level);
                           } else {
-                            toggleExpandNode(node.id);
+                            expandAllBelowDepth(node.level);
                           }
-                          scrollToNode(node.id);
-                        }}
-                      >
-                        {node.hasChildren ? (
-                          state.expanded ? (
-                            <ChevronDownIcon className="h-4 w-4 text-text-dimmed" />
-                          ) : (
-                            <ChevronRightIcon className="h-4 w-4 text-text-dimmed" />
-                          )
+                        } else {
+                          toggleExpandNode(node.id);
+                        }
+                        scrollToNode(node.id);
+                      }}
+                    >
+                      {node.hasChildren ? (
+                        state.expanded ? (
+                          <ChevronDownIcon className="h-4 w-4 text-text-dimmed" />
                         ) : (
-                          <div className="h-8 w-4" />
-                        )}
-                      </div>
+                          <ChevronRightIcon className="h-4 w-4 text-text-dimmed" />
+                        )
+                      ) : (
+                        <div className="h-8 w-4" />
+                      )}
                     </div>
+                  </div>
 
-                    <div className="flex w-full items-center justify-between gap-2 pl-1">
-                      <div className="flex items-center gap-1.5 overflow-x-hidden">
-                        <RunIcon
-                          name={
-                            node.data.isAgentRun &&
-                            (node.data.style?.icon === "task" ||
-                              node.data.style?.icon === "task-cached")
-                              ? "agent"
-                              : node.data.style?.icon
-                          }
-                          spanName={node.data.message}
-                          className="size-5 min-h-5 min-w-5"
-                        />
-                        <NodeText node={node} />
-                        {node.data.isRoot && !rootRun && <Badge variant="extra-small">Root</Badge>}
-                      </div>
-                      <div className="flex items-center gap-1">
-                        <NodeStatusIcon node={node} />
-                      </div>
+                  <div className="flex w-full items-center justify-between gap-2 pl-1">
+                    <div className="flex items-center gap-1.5 overflow-x-hidden">
+                      <RunIcon
+                        name={
+                          node.data.isAgentRun &&
+                          (node.data.style?.icon === "task" ||
+                            node.data.style?.icon === "task-cached")
+                            ? "agent"
+                            : node.data.style?.icon
+                        }
+                        spanName={node.data.message}
+                        className="size-5 min-h-5 min-w-5"
+                      />
+                      <NodeText node={node} />
+                      {node.data.isRoot && !rootRun && <Badge variant="extra-small">Root</Badge>}
+                    </div>
+                    <div className="flex items-center gap-1">
+                      <NodeStatusIcon node={node} />
                     </div>
                   </div>
-                </>
+                </div>
               )}
               onScroll={(scrollTop) => {
                 //sync the scroll to the tree
@@ -1698,29 +1696,25 @@ function LiveReloadingStatus({
 }) {
   if (rootSpanCompleted) return null;
 
-  return (
-    <>
-      {isLiveReloading ? (
+  return isLiveReloading ? (
+    <div className="flex items-center gap-1">
+      <PulsingDot />
+      <Paragraph variant="extra-small" className="whitespace-nowrap text-blue-500">
+        Live reloading
+      </Paragraph>
+    </div>
+  ) : (
+    <SimpleTooltip
+      content={`Live reloading is disabled because you've exceeded ${settingValue} logs.`}
+      button={
         <div className="flex items-center gap-1">
-          <PulsingDot />
-          <Paragraph variant="extra-small" className="whitespace-nowrap text-blue-500">
-            Live reloading
+          <BoltSlashIcon className="size-3.5 text-text-dimmed" />
+          <Paragraph variant="extra-small" className="whitespace-nowrap text-text-dimmed">
+            Live reloading disabled
           </Paragraph>
         </div>
-      ) : (
-        <SimpleTooltip
-          content={`Live reloading is disabled because you've exceeded ${settingValue} logs.`}
-          button={
-            <div className="flex items-center gap-1">
-              <BoltSlashIcon className="size-3.5 text-text-dimmed" />
-              <Paragraph variant="extra-small" className="whitespace-nowrap text-text-dimmed">
-                Live reloading disabled
-              </Paragraph>
-            </div>
-          }
-        />
-      )}
-    </>
+      }
+    />
   );
 }
 
@@ -1815,7 +1809,7 @@ function CurrentTimeIndicator({
               rootStartedAt.getTime() + ms + nanosecondsToMilliseconds(queuedDurationNs ?? 0)
             )
           : undefined;
-        const currentTimeComponent = currentTime ? <DateTimeShort date={currentTime} /> : <></>;
+        const currentTimeComponent = currentTime ? <DateTimeShort date={currentTime} /> : null;
 
         return (
           <div className="relative z-50 flex h-full flex-col">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
index 50bfb36a583..cf3bef30c5c 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
@@ -324,103 +324,101 @@ function RunsList({
             selectedItems.size === 0 ? "grid-rows-1" : "grid-rows-[1fr_auto]"
           )}
         >
-          <>
-            {list.runs.length === 0 && !list.hasAnyRuns ? (
-              list.possibleTasks.length === 0 ? (
-                <CreateFirstTaskInstructions />
-              ) : (
-                <RunTaskInstructions
-                  task={
-                    list.filters.tasks.length === 1
-                      ? list.possibleTasks.find((t) => t.slug === list.filters.tasks[0])
-                      : undefined
-                  }
-                />
-              )
+          {list.runs.length === 0 && !list.hasAnyRuns ? (
+            list.possibleTasks.length === 0 ? (
+              <CreateFirstTaskInstructions />
             ) : (
-              <div className={cn("grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden")}>
-                <div className="flex items-start justify-between gap-x-2 p-2">
-                  <RunsFilters
-                    possibleTasks={list.possibleTasks}
-                    bulkActions={list.bulkActions}
-                    hasFilters={list.hasFilters}
-                    rootOnlyDefault={rootOnlyDefault}
-                  />
-                  <div className="flex items-center justify-end gap-x-2">
-                    {showNewRunsBanner && (
-                      <span className="flex duration-150 animate-in fade-in-0">
-                        <Button
-                          variant="secondary/small"
-                          className="text-text-bright"
-                          onClick={onClickShowNewRuns}
-                          LeadingIcon={<PulsingDot className="h-2 w-2" />}
-                          tooltip="Refresh to see new runs"
-                          aria-label="New runs created. Refresh to see new runs."
-                        >
-                          {newRunsCount >= 100
-                            ? "99+ new runs"
-                            : `${newRunsCount} new ${newRunsCount === 1 ? "run" : "runs"}`}
-                        </Button>
-                      </span>
-                    )}
-                    {/* Stay mounted while the inspector is open to avoid toolbar layout shift. */}
-                    <Button
-                      variant="secondary/small"
-                      disabled={isShowingBulkActionInspector || (!canCancelRuns && !canReplayRuns)}
-                      onClick={() =>
-                        replace({
-                          bulkInspector: RUNS_BULK_INSPECTOR_OPEN_VALUE,
-                          mode: selectedItems.size > 0 ? "selected" : undefined,
-                        })
-                      }
-                      LeadingIcon={ListCheckedIcon}
-                      className={cn(
-                        selectedItems.size > 0 ? "pr-1" : undefined,
-                        isShowingBulkActionInspector && "pointer-events-none invisible"
-                      )}
-                      tooltip={
-                        !canCancelRuns && !canReplayRuns ? (
-                          "You don't have permission to cancel or replay runs"
-                        ) : (
-                          <div className="-mr-1 flex items-center gap-3 text-xs text-text-dimmed">
-                            <div className="flex items-center gap-0.5">
-                              <span>Replay</span>
-                              <ShortcutKey shortcut={{ key: "r" }} variant={"small"} />
-                            </div>
-                            <div className="flex items-center gap-0.5">
-                              <span>Cancel</span>
-                              <ShortcutKey shortcut={{ key: "c" }} variant={"small"} />
-                            </div>
-                          </div>
-                        )
-                      }
-                    >
-                      <span className="flex items-center gap-x-1 whitespace-nowrap text-text-bright">
-                        <span>Bulk action</span>
-                        {selectedItems.size > 0 && (
-                          <Badge variant="rounded">{selectedItems.size}</Badge>
-                        )}
-                      </span>
-                    </Button>
-                    <ListPagination list={list} />
-                  </div>
-                </div>
-
-                <TaskRunsTable
-                  total={visibleRuns.length}
+              <RunTaskInstructions
+                task={
+                  list.filters.tasks.length === 1
+                    ? list.possibleTasks.find((t) => t.slug === list.filters.tasks[0])
+                    : undefined
+                }
+              />
+            )
+          ) : (
+            <div className={cn("grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden")}>
+              <div className="flex items-start justify-between gap-x-2 p-2">
+                <RunsFilters
+                  possibleTasks={list.possibleTasks}
+                  bulkActions={list.bulkActions}
                   hasFilters={list.hasFilters}
-                  filters={list.filters}
-                  runs={visibleRuns}
-                  childrenStatusesBasePath={childrenStatusesBasePath}
-                  isLoading={isLoading}
-                  allowSelection
                   rootOnlyDefault={rootOnlyDefault}
-                  canCancelRuns={canCancelRuns}
-                  canReplayRuns={canReplayRuns}
                 />
+                <div className="flex items-center justify-end gap-x-2">
+                  {showNewRunsBanner && (
+                    <span className="flex duration-150 animate-in fade-in-0">
+                      <Button
+                        variant="secondary/small"
+                        className="text-text-bright"
+                        onClick={onClickShowNewRuns}
+                        LeadingIcon={<PulsingDot className="h-2 w-2" />}
+                        tooltip="Refresh to see new runs"
+                        aria-label="New runs created. Refresh to see new runs."
+                      >
+                        {newRunsCount >= 100
+                          ? "99+ new runs"
+                          : `${newRunsCount} new ${newRunsCount === 1 ? "run" : "runs"}`}
+                      </Button>
+                    </span>
+                  )}
+                  {/* Stay mounted while the inspector is open to avoid toolbar layout shift. */}
+                  <Button
+                    variant="secondary/small"
+                    disabled={isShowingBulkActionInspector || (!canCancelRuns && !canReplayRuns)}
+                    onClick={() =>
+                      replace({
+                        bulkInspector: RUNS_BULK_INSPECTOR_OPEN_VALUE,
+                        mode: selectedItems.size > 0 ? "selected" : undefined,
+                      })
+                    }
+                    LeadingIcon={ListCheckedIcon}
+                    className={cn(
+                      selectedItems.size > 0 ? "pr-1" : undefined,
+                      isShowingBulkActionInspector && "pointer-events-none invisible"
+                    )}
+                    tooltip={
+                      !canCancelRuns && !canReplayRuns ? (
+                        "You don't have permission to cancel or replay runs"
+                      ) : (
+                        <div className="-mr-1 flex items-center gap-3 text-xs text-text-dimmed">
+                          <div className="flex items-center gap-0.5">
+                            <span>Replay</span>
+                            <ShortcutKey shortcut={{ key: "r" }} variant={"small"} />
+                          </div>
+                          <div className="flex items-center gap-0.5">
+                            <span>Cancel</span>
+                            <ShortcutKey shortcut={{ key: "c" }} variant={"small"} />
+                          </div>
+                        </div>
+                      )
+                    }
+                  >
+                    <span className="flex items-center gap-x-1 whitespace-nowrap text-text-bright">
+                      <span>Bulk action</span>
+                      {selectedItems.size > 0 && (
+                        <Badge variant="rounded">{selectedItems.size}</Badge>
+                      )}
+                    </span>
+                  </Button>
+                  <ListPagination list={list} />
+                </div>
               </div>
-            )}
-          </>
+
+              <TaskRunsTable
+                total={visibleRuns.length}
+                hasFilters={list.hasFilters}
+                filters={list.filters}
+                runs={visibleRuns}
+                childrenStatusesBasePath={childrenStatusesBasePath}
+                isLoading={isLoading}
+                allowSelection
+                rootOnlyDefault={rootOnlyDefault}
+                canCancelRuns={canCancelRuns}
+                canReplayRuns={canReplayRuns}
+              />
+            </div>
+          )}
         </div>
       </ResizablePanel>
       <ResizableHandle
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index f6f7fc612fb..1287b416d76 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -513,7 +513,7 @@ export default function Page() {
               </Fieldset>
             </Form>
           </div>
-          <Feedback button={<></>} />
+          <Feedback />
         </MainCenteredContainer>
       </BackgroundWrapper>
     </AppContainer>
diff --git a/apps/webapp/app/routes/_app/route.tsx b/apps/webapp/app/routes/_app/route.tsx
index 7b59fd5fa3e..ac91c037cd9 100644
--- a/apps/webapp/app/routes/_app/route.tsx
+++ b/apps/webapp/app/routes/_app/route.tsx
@@ -42,12 +42,10 @@ export default function App() {
 
 export function ErrorBoundary() {
   return (
-    <>
-      <AppContainer>
-        <MainCenteredContainer>
-          <RouteErrorDisplay />
-        </MainCenteredContainer>
-      </AppContainer>
-    </>
+    <AppContainer>
+      <MainCenteredContainer>
+        <RouteErrorDisplay />
+      </MainCenteredContainer>
+    </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/admin.notifications.tsx b/apps/webapp/app/routes/admin.notifications.tsx
index dbffc75dfbb..291d1ed5523 100644
--- a/apps/webapp/app/routes/admin.notifications.tsx
+++ b/apps/webapp/app/routes/admin.notifications.tsx
@@ -1383,7 +1383,7 @@ function CliColorMarkup({ text, fallbackClass }: { text: string; fallbackClass?:
     pos = closeIdx + 1;
   }
 
-  return <>{parts}</>;
+  return parts;
 }
 
 function Badge({
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index 37c54d4ea0b..53d3f05804e 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -322,9 +322,7 @@ export default function Page() {
                   <FormError id={confirmEmail.errorId}>{confirmEmail.errors}</FormError>
                 </InputGroup>
               ) : (
-                <>
-                  <input {...getInputProps(confirmEmail, { type: "hidden" })} value={user.email} />
-                </>
+                <input {...getInputProps(confirmEmail, { type: "hidden" })} value={user.email} />
               )}
 
               {isManagedCloud && (
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
index 74b1a1f295d..3a5c12175e9 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
@@ -304,15 +304,13 @@ export function UpsertScheduleForm({
                     dropdownIcon
                     variant="tertiary/medium"
                   >
-                    {(matches) => (
-                      <>
-                        {matches?.map((task) => (
-                          <SelectItem key={task} value={task}>
-                            {task}
-                          </SelectItem>
-                        ))}
-                      </>
-                    )}
+                    {(matches) =>
+                      matches?.map((task) => (
+                        <SelectItem key={task} value={task}>
+                          {task}
+                        </SelectItem>
+                      ))
+                    }
                   </Select>
                   <FormError id={taskIdentifier.errorId}>{taskIdentifier.errors}</FormError>
                 </InputGroup>
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
index e1ed1b2cc70..c202e2d897f 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
@@ -342,63 +342,61 @@ function CompleteManualWaitpointForm({ waitpoint }: { waitpoint: { id: string }
   );
 
   return (
-    <>
-      <Form
-        action={formAction}
-        method="post"
-        onSubmit={(e) => submitForm(e)}
-        className="grid h-full max-h-full grid-rows-[2.5rem_1fr_3.25rem] overflow-hidden border-t border-grid-bright"
-      >
-        <input type="hidden" name="type" value={"MANUAL"} />
-        <input
-          type="hidden"
-          name="successRedirect"
-          value={`${location.pathname}${location.search}`}
-        />
-        <input
-          type="hidden"
-          name="failureRedirect"
-          value={`${location.pathname}${location.search}`}
+    <Form
+      action={formAction}
+      method="post"
+      onSubmit={(e) => submitForm(e)}
+      className="grid h-full max-h-full grid-rows-[2.5rem_1fr_3.25rem] overflow-hidden border-t border-grid-bright"
+    >
+      <input type="hidden" name="type" value={"MANUAL"} />
+      <input
+        type="hidden"
+        name="successRedirect"
+        value={`${location.pathname}${location.search}`}
+      />
+      <input
+        type="hidden"
+        name="failureRedirect"
+        value={`${location.pathname}${location.search}`}
+      />
+      <div className="mx-3 flex items-center gap-1">
+        <Paragraph variant="small/bright">Manually complete this waitpoint</Paragraph>
+        <InfoIconTooltip
+          content={
+            "This is will immediately complete this waitpoint with the payload you specify. This is useful during development for testing."
+          }
+          contentClassName="normal-case tracking-normal max-w-xs"
         />
-        <div className="mx-3 flex items-center gap-1">
-          <Paragraph variant="small/bright">Manually complete this waitpoint</Paragraph>
-          <InfoIconTooltip
-            content={
-              "This is will immediately complete this waitpoint with the payload you specify. This is useful during development for testing."
-            }
-            contentClassName="normal-case tracking-normal max-w-xs"
+      </div>
+      <div className="overflow-y-auto bg-background-deep scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control">
+        <div className="max-h-[70vh] min-h-40 overflow-y-auto bg-background-deep scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control">
+          <JSONEditor
+            autoFocus
+            defaultValue={currentJson.current}
+            readOnly={false}
+            basicSetup
+            onChange={(v) => {
+              currentJson.current = v;
+            }}
+            showClearButton={false}
+            showCopyButton={false}
+            height="100%"
+            min-height="100%"
+            max-height="100%"
           />
         </div>
-        <div className="overflow-y-auto bg-background-deep scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control">
-          <div className="max-h-[70vh] min-h-40 overflow-y-auto bg-background-deep scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control">
-            <JSONEditor
-              autoFocus
-              defaultValue={currentJson.current}
-              readOnly={false}
-              basicSetup
-              onChange={(v) => {
-                currentJson.current = v;
-              }}
-              showClearButton={false}
-              showCopyButton={false}
-              height="100%"
-              min-height="100%"
-              max-height="100%"
-            />
-          </div>
-        </div>
-        <div className="flex items-center justify-end gap-2 border-t border-grid-dimmed bg-background-dimmed px-2">
-          <Button
-            variant="secondary/medium"
-            type="submit"
-            disabled={isLoading}
-            LeadingIcon={isLoading ? SpinnerWhite : undefined}
-          >
-            {isLoading ? "Completing…" : "Complete waitpoint"}
-          </Button>
-        </div>
-      </Form>
-    </>
+      </div>
+      <div className="flex items-center justify-end gap-2 border-t border-grid-dimmed bg-background-dimmed px-2">
+        <Button
+          variant="secondary/medium"
+          type="submit"
+          disabled={isLoading}
+          LeadingIcon={isLoading ? SpinnerWhite : undefined}
+        >
+          {isLoading ? "Completing…" : "Complete waitpoint"}
+        </Button>
+      </div>
+    </Form>
   );
 }
 
diff --git a/apps/webapp/app/routes/storybook.filter/route.tsx b/apps/webapp/app/routes/storybook.filter/route.tsx
index 5f63275de90..fa60e744a76 100644
--- a/apps/webapp/app/routes/storybook.filter/route.tsx
+++ b/apps/webapp/app/routes/storybook.filter/route.tsx
@@ -105,7 +105,7 @@ function Menu(props: MenuProps) {
     case "environment":
       return <Environments {...props} />;
   }
-  return <></>;
+  return null;
 }
 
 function MainMenu({ searchValue, clearSearchValue, setFilterType, trigger, shortcut }: MenuProps) {