diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4db6756bc..c71a6ef7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -364,6 +364,8 @@ importers:
         specifier: ^5.9.2
         version: 5.9.2
 
+  dist: {}
+
 packages:
 
   '@ampproject/remapping@2.3.0':
diff --git a/src/app/(main)/links/[linkId]/LinkPage.tsx b/src/app/(main)/links/[linkId]/LinkPage.tsx
index e0e10213b..a77516256 100644
--- a/src/app/(main)/links/[linkId]/LinkPage.tsx
+++ b/src/app/(main)/links/[linkId]/LinkPage.tsx
@@ -7,24 +7,19 @@ import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
 import { LinkMetricsBar } from '@/app/(main)/links/[linkId]/LinkMetricsBar';
 import { LinkControls } from '@/app/(main)/links/[linkId]/LinkControls';
 import { LinkPanels } from '@/app/(main)/links/[linkId]/LinkPanels';
-import { Column, Grid } from '@umami/react-zen';
 
 export function LinkPage({ linkId }: { linkId: string }) {
   return (
     <LinkProvider linkId={linkId}>
-      <Grid width="100%" height="100%">
-        <Column margin="2">
-          <PageBody gap>
-            <LinkHeader />
-            <LinkControls linkId={linkId} />
-            <LinkMetricsBar linkId={linkId} showChange={true} />
-            <Panel>
-              <WebsiteChart websiteId={linkId} />
-            </Panel>
-            <LinkPanels linkId={linkId} />
-          </PageBody>
-        </Column>
-      </Grid>
+      <PageBody gap>
+        <LinkHeader />
+        <LinkControls linkId={linkId} />
+        <LinkMetricsBar linkId={linkId} showChange={true} />
+        <Panel>
+          <WebsiteChart websiteId={linkId} />
+        </Panel>
+        <LinkPanels linkId={linkId} />
+      </PageBody>
     </LinkProvider>
   );
 }
diff --git a/src/app/(main)/pixels/[pixelId]/PixelPage.tsx b/src/app/(main)/pixels/[pixelId]/PixelPage.tsx
index a65c821e0..6a55a6ebc 100644
--- a/src/app/(main)/pixels/[pixelId]/PixelPage.tsx
+++ b/src/app/(main)/pixels/[pixelId]/PixelPage.tsx
@@ -7,24 +7,19 @@ import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
 import { PixelMetricsBar } from '@/app/(main)/pixels/[pixelId]/PixelMetricsBar';
 import { PixelControls } from '@/app/(main)/pixels/[pixelId]/PixelControls';
 import { PixelPanels } from '@/app/(main)/pixels/[pixelId]/PixelPanels';
-import { Column, Grid } from '@umami/react-zen';
 
 export function PixelPage({ pixelId }: { pixelId: string }) {
   return (
     <PixelProvider pixelId={pixelId}>
-      <Grid width="100%" height="100%">
-        <Column margin="2">
-          <PageBody gap>
-            <PixelHeader />
-            <PixelControls pixelId={pixelId} />
-            <PixelMetricsBar pixelId={pixelId} showChange={true} />
-            <Panel>
-              <WebsiteChart websiteId={pixelId} />
-            </Panel>
-            <PixelPanels pixelId={pixelId} />
-          </PageBody>
-        </Column>
-      </Grid>
+      <PageBody gap>
+        <PixelHeader />
+        <PixelControls pixelId={pixelId} />
+        <PixelMetricsBar pixelId={pixelId} showChange={true} />
+        <Panel>
+          <WebsiteChart websiteId={pixelId} />
+        </Panel>
+        <PixelPanels pixelId={pixelId} />
+      </PageBody>
     </PixelProvider>
   );
 }
diff --git a/src/app/(main)/teams/TeamsDataTable.tsx b/src/app/(main)/teams/TeamsDataTable.tsx
index 4bc939b12..6475c456a 100644
--- a/src/app/(main)/teams/TeamsDataTable.tsx
+++ b/src/app/(main)/teams/TeamsDataTable.tsx
@@ -1,9 +1,16 @@
-import { DataGrid } from '@/components/common/DataGrid';
-import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';
+import { ReactNode } from 'react';
 import Link from 'next/link';
+import { DataGrid } from '@/components/common/DataGrid';
 import { TeamsTable } from './TeamsTable';
+import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';
 
-export function TeamsDataTable() {
+export function TeamsDataTable({
+  showActions,
+}: {
+  allowEdit?: boolean;
+  showActions?: boolean;
+  children?: ReactNode;
+}) {
   const { user } = useLoginQuery();
   const query = useUserTeamsQuery(user.id);
   const { pathname } = useNavigation();
@@ -20,7 +27,7 @@ export function TeamsDataTable() {
   return (
     <DataGrid query={query}>
       {({ data }) => {
-        return <TeamsTable data={data} renderLink={renderLink} />;
+        return <TeamsTable data={data} showActions={showActions} renderLink={renderLink} />;
       }}
     </DataGrid>
   );
diff --git a/src/app/(main)/teams/TeamsJoinButton.tsx b/src/app/(main)/teams/TeamsJoinButton.tsx
index e30ff1204..7e1e24e7c 100644
--- a/src/app/(main)/teams/TeamsJoinButton.tsx
+++ b/src/app/(main)/teams/TeamsJoinButton.tsx
@@ -1,5 +1,5 @@
 import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';
-import { AddUserSvg } from '@/components/icons';
+import { AddUser } from '@/components/icons';
 import { useMessages, useModified } from '@/components/hooks';
 import { TeamJoinForm } from './TeamJoinForm';
 
@@ -17,7 +17,7 @@ export function TeamsJoinButton() {
     <DialogTrigger>
       <Button>
         <Icon>
-          <AddUserSvg />
+          <AddUser />
         </Icon>
         <Text>{formatMessage(labels.joinTeam)}</Text>
       </Button>
diff --git a/src/app/(main)/teams/TeamsTable.tsx b/src/app/(main)/teams/TeamsTable.tsx
index 5a22bcda8..2108de130 100644
--- a/src/app/(main)/teams/TeamsTable.tsx
+++ b/src/app/(main)/teams/TeamsTable.tsx
@@ -20,12 +20,12 @@ export function TeamsTable({
       <DataColumn id="owner" label={formatMessage(labels.owner)}>
         {(row: any) => row?.members?.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
       </DataColumn>
-      <DataColumn id="members" label={formatMessage(labels.members)} align="end">
-        {(row: any) => row?._count?.members}
-      </DataColumn>
       <DataColumn id="websites" label={formatMessage(labels.websites)} align="end">
         {(row: any) => row?._count?.websites}
       </DataColumn>
+      <DataColumn id="members" label={formatMessage(labels.members)} align="end">
+        {(row: any) => row?._count?.members}
+      </DataColumn>
     </DataTable>
   );
 }
diff --git a/src/app/(main)/teams/[teamId]/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsx
index c186a1a0a..c5994c0d3 100644
--- a/src/app/(main)/teams/[teamId]/TeamSettings.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx
@@ -2,7 +2,7 @@ import Link from 'next/link';
 import { Column, Icon, Text, Row } from '@umami/react-zen';
 import { useLoginQuery, useMessages, useNavigation, useTeam } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
-import { Users, ArrowLeft } from '@/components/icons';
+import { Users, Arrow } from '@/components/icons';
 import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';
 import { TeamManage } from './TeamManage';
 import { TeamEditForm } from './TeamEditForm';
@@ -34,8 +34,8 @@ export function TeamSettings({ teamId }: { teamId: string }) {
     <>
       <Link href="/settings/teams">
         <Row marginTop="2" alignItems="center" gap>
-          <Icon>
-            <ArrowLeft />
+          <Icon rotate={180}>
+            <Arrow />
           </Icon>
           <Text>{formatMessage(labels.teams)}</Text>
         </Row>
diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx
index f57382ca3..200449fc9 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx
@@ -19,7 +19,7 @@ export function CohortsTable({ data = [] }) {
     <DataTable data={data}>
       <DataColumn id="name" label={formatMessage(labels.name)}>
         {(row: any) => (
-          <Link href={renderUrl(`/websites/${websiteId}?cohort=${row.id}`, false)}>{row.name}</Link>
+          <Link href={renderUrl(`/websites/${websiteId}?cohort=${row.id}`)}>{row.name}</Link>
         )}
       </DataColumn>
       <DataColumn id="created" label={formatMessage(labels.created)}>
diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx
index 804c7b5bb..98224637d 100644
--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx
@@ -18,9 +18,7 @@ export function SegmentsTable({ data = [] }) {
     <DataTable data={data}>
       <DataColumn id="name" label={formatMessage(labels.name)}>
         {(row: any) => (
-          <Link href={renderUrl(`/websites/${websiteId}?segment=${row.id}`, false)}>
-            {row.name}
-          </Link>
+          <Link href={renderUrl(`/websites/${websiteId}?segment=${row.id}`)}>{row.name}</Link>
         )}
       </DataColumn>
       <DataColumn id="created" label={formatMessage(labels.created)}>
diff --git a/src/components/icons.ts b/src/components/icons.ts
index a4c180ff8..0280c31a5 100644
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -14,5 +14,4 @@ export {
   Path as PathSvg,
   Tag as TagSvg,
   Target as TargetSvg,
-  AddUser as AddUserSvg,
 } from '@/components/svg';
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index c5ec469c4..c6c63c709 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -127,12 +127,12 @@ export const DATA_TYPES = {
 
 export const ROLES = {
   admin: 'admin',
-  user: 'user',
-  viewOnly: 'view-only',
-  teamOwner: 'team-owner',
   teamManager: 'team-manager',
   teamMember: 'team-member',
+  teamOwner: 'team-owner',
   teamViewOnly: 'team-view-only',
+  user: 'user',
+  viewOnly: 'view-only',
 } as const;
 
 export const PERMISSIONS = {
diff --git a/src/lib/request.ts b/src/lib/request.ts
index 4840f36c0..fb01a0494 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -119,7 +119,7 @@ export async function getQueryFilters(
       }));
 
       cohortFilters.push({
-        name: `cohort_${cohortParams.action.type}`,
+        name: cohortParams.action.type,
         operator: 'eq',
         value: cohortParams.action.value,
       });