diff --git a/apps/webapp/app/components/FeatureBadges.tsx b/apps/webapp/app/components/FeatureBadges.tsx
index 728f4e775c..1364d0f76c 100644
--- a/apps/webapp/app/components/FeatureBadges.tsx
+++ b/apps/webapp/app/components/FeatureBadges.tsx
@@ -56,17 +56,11 @@ export function BetaTitle({ children }: { children: React.ReactNode }) {
 
 export function NewBadge({ inline = false, className }: { inline?: boolean; className?: string }) {
   return (
-    <SimpleTooltip
-      button={
-        <Badge
-          variant="extra-small"
-          className={cn("text-success", inline ? "inline-grid" : "", className)}
-        >
-          New
-        </Badge>
-      }
-      content="This feature is new"
-      disableHoverableContent
-    />
+    <Badge
+      variant="extra-small"
+      className={cn("text-success", inline ? "inline-grid" : "", className)}
+    >
+      New
+    </Badge>
   );
 }
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 6bb6062e6a..aea0238a03 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
@@ -262,8 +262,8 @@ export default function Page() {
             <div className={cn("grid h-full grid-rows-1")}>
               {hasItems ? (
                 <div className="flex min-w-0 max-w-full flex-col">
-                  <div className="max-h-full overflow-hidden">
-                    <div className="flex items-center justify-between gap-1.5 p-2">
+                  <div className="flex h-full flex-col overflow-hidden">
+                    <div className="flex shrink-0 items-center justify-between gap-1.5 p-2">
                       <div className="flex flex-1 items-center gap-1.5">
                         <SearchInput placeholder="Search tasks…" autoFocus resetParams={["page"]} />
                         <TaskTypeFilter />
@@ -287,7 +287,7 @@ export default function Page() {
                         />
                       </div>
                     </div>
-                    <Table containerClassName="max-h-full">
+                    <Table containerClassName="min-h-0 flex-1">
                       <TableHeader>
                         <TableRow>
                           <TableHeaderCell>ID</TableHeaderCell>