diff --git a/apps/web/src/routes/_app/admin/groups/index.tsx b/apps/web/src/routes/_app/admin/groups/index.tsx
index b0e1d07ce..20a933ded 100644
--- a/apps/web/src/routes/_app/admin/groups/index.tsx
+++ b/apps/web/src/routes/_app/admin/groups/index.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-import { Button, ClientTable, Heading, SearchBar, Sheet } from '@douglasneuroinformatics/libui/components';
+import { Button, DataTable, Heading, Sheet } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { Group } from '@opendatacapture/schemas/group';
 import { createFileRoute, Link } from '@tanstack/react-router';
@@ -8,14 +8,12 @@ import { createFileRoute, Link } from '@tanstack/react-router';
 import { PageHeader } from '@/components/PageHeader';
 import { useDeleteGroupMutation } from '@/hooks/useDeleteGroupMutation';
 import { groupsQueryOptions, useGroupsQuery } from '@/hooks/useGroupsQuery';
-import { useSearch } from '@/hooks/useSearch';
 
 const RouteComponent = () => {
   const { t } = useTranslation();
   const groupsQuery = useGroupsQuery();
   const deleteGroupMutation = useDeleteGroupMutation();
   const [selectedGroup, setSelectedGroup] = useState<Group | null>(null);
-  const { filteredData, searchTerm, setSearchTerm } = useSearch(groupsQuery.data ?? [], 'name');
 
   return (
     <Sheet open={Boolean(selectedGroup)} onOpenChange={() => setSelectedGroup(null)}>
@@ -27,33 +25,16 @@ const RouteComponent = () => {
           })}
         </Heading>
       </PageHeader>
-      <div className="mb-3 flex gap-3">
-        <SearchBar
-          className="grow"
-          placeholder={t({
-            en: 'Search by Group Name',
-            fr: 'Recherche par nom de groupe'
-          })}
-          value={searchTerm}
-          onValueChange={setSearchTerm}
-        />
-        <Button asChild variant="outline">
-          <Link to="/admin/groups/create">
-            {t({
-              en: 'Add Group',
-              fr: 'Ajouter un groupe'
-            })}
-          </Link>
-        </Button>
-      </div>
-      <ClientTable<Group>
+      <DataTable
         columns={[
           {
-            field: 'name',
-            label: t('common.groupName')
+            accessorKey: 'name',
+            header: t('common.groupName')
           },
           {
-            field: ({ type }) => {
+            accessorKey: 'type',
+            cell: (ctx) => {
+              const type = ctx.getValue() as Group['type'];
               if (type === 'CLINICAL') {
                 return t('common.clinical');
               } else if (type === 'RESEARCH') {
@@ -61,13 +42,26 @@ const RouteComponent = () => {
               }
               return type satisfies never;
             },
-            label: t('common.groupType')
+            header: t('common.groupType')
           }
         ]}
-        data={filteredData}
-        entriesPerPage={15}
-        minRows={15}
-        onEntryClick={setSelectedGroup}
+        data={groupsQuery.data}
+        rowActions={[
+          {
+            label: t('common.manage'),
+            onSelect: setSelectedGroup
+          }
+        ]}
+        togglesComponent={() => (
+          <Button asChild variant="outline">
+            <Link to="/admin/groups/create">
+              {t({
+                en: 'Add Group',
+                fr: 'Ajouter un groupe'
+              })}
+            </Link>
+          </Button>
+        )}
       />
       <Sheet.Content>
         <Sheet.Header>
diff --git a/apps/web/src/routes/_app/admin/users/index.tsx b/apps/web/src/routes/_app/admin/users/index.tsx
index 6965b13e5..d375b9108 100644
--- a/apps/web/src/routes/_app/admin/users/index.tsx
+++ b/apps/web/src/routes/_app/admin/users/index.tsx
@@ -2,15 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { isAllUndefined, snakeToCamelCase } from '@douglasneuroinformatics/libjs';
 import { estimatePasswordStrength } from '@douglasneuroinformatics/libpasswd';
-import {
-  Button,
-  ClientTable,
-  Dialog,
-  Form,
-  Heading,
-  SearchBar,
-  Sheet
-} from '@douglasneuroinformatics/libui/components';
+import { Button, DataTable, Dialog, Form, Heading, Sheet } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { FormTypes } from '@opendatacapture/runtime-core';
 import { $UserPermission } from '@opendatacapture/schemas/core';
@@ -24,7 +16,6 @@ import { PageHeader } from '@/components/PageHeader';
 import { WithFallback } from '@/components/WithFallback';
 import { useDeleteUserMutation } from '@/hooks/useDeleteUserMutation';
 import { groupsQueryOptions, useGroupsQuery } from '@/hooks/useGroupsQuery';
-import { useSearch } from '@/hooks/useSearch';
 import { useUpdateUserMutation } from '@/hooks/useUpdateUserMutation';
 import { usersQueryOptions, useUsersQuery } from '@/hooks/useUsersQuery';
 import { useAppStore } from '@/store';
@@ -276,7 +267,6 @@ const RouteComponent = () => {
   const deleteUserMutation = useDeleteUserMutation();
   const updateUserMutation = useUpdateUserMutation();
   const [selectedUser, setSelectedUser] = useState<null | User>(null);
-  const { filteredData, searchTerm, setSearchTerm } = useSearch(usersQuery.data ?? [], 'username');
 
   const [data, setData] = useState<null | UpdateUserFormInputData>(null);
 
@@ -307,34 +297,16 @@ const RouteComponent = () => {
           })}
         </Heading>
       </PageHeader>
-      <div className="mb-3 flex gap-3">
-        <SearchBar
-          className="grow"
-          data-testid="admin-users-search"
-          placeholder={t({
-            en: 'Search by Username',
-            fr: "Recherche par nom d'utilisateur"
-          })}
-          value={searchTerm}
-          onValueChange={setSearchTerm}
-        />
-        <Button variant="outline">
-          <Link to="/admin/users/create">
-            {t({
-              en: 'Add User',
-              fr: 'Ajouter un utilisateur'
-            })}
-          </Link>
-        </Button>
-      </div>
-      <ClientTable<User>
+      <DataTable
         columns={[
           {
-            field: 'username',
-            label: t('common.username')
+            accessorKey: 'username',
+            header: t('common.username')
           },
           {
-            field: ({ basePermissionLevel }) => {
+            accessorKey: 'basePermissionLevel',
+            cell: (ctx) => {
+              const basePermissionLevel = ctx.getValue() as User['basePermissionLevel'];
               if (!basePermissionLevel) {
                 return t({
                   en: 'None',
@@ -343,14 +315,27 @@ const RouteComponent = () => {
               }
               return t(`common.${snakeToCamelCase(basePermissionLevel)}`);
             },
-            label: t('common.basePermissionLevel')
+            header: t('common.basePermissionLevel')
           }
         ]}
-        data={filteredData}
+        data={usersQuery.data}
         data-testid="admin-users-table"
-        entriesPerPage={15}
-        minRows={15}
-        onEntryClick={setSelectedUser}
+        rowActions={[
+          {
+            label: t('common.manage'),
+            onSelect: setSelectedUser
+          }
+        ]}
+        togglesComponent={() => (
+          <Button variant="outline">
+            <Link to="/admin/users/create">
+              {t({
+                en: 'Add User',
+                fr: 'Ajouter un utilisateur'
+              })}
+            </Link>
+          </Button>
+        )}
       />
       <Sheet.Content className="flex flex-col p-0" data-testid="admin-user-edit-sheet">
         <Sheet.Header className="px-6 pt-6">
diff --git a/apps/web/src/routes/_app/datahub/index.tsx b/apps/web/src/routes/_app/datahub/index.tsx
index 4a813e689..74cfa9656 100644
--- a/apps/web/src/routes/_app/datahub/index.tsx
+++ b/apps/web/src/routes/_app/datahub/index.tsx
@@ -41,7 +41,7 @@ const Filters: React.FC<{ table: TanstackTable.Table<Subject> }> = ({ table }) =
 
   const columns = table.getAllColumns();
 
-  const dobColumn = columns.find((column) => column.id === 'date-of-birth')!;
+  const dobColumn = columns.find((column) => column.id === 'dateOfBirth')!;
   const dobFilter = dobColumn.getFilterValue() as DateFilter;
 
   const sexColumn = columns.find((column) => column.id === 'sex')!;
@@ -311,7 +311,7 @@ const MasterDataTable: React.FC<{
             id: 'subjectId'
           },
           {
-            accessorFn: (subject) => subject.dateOfBirth,
+            accessorKey: 'dateOfBirth',
             cell: (ctx) => {
               const value = ctx.getValue() as Date | null | undefined;
               return value ? toBasicISOString(value) : 'NULL';
@@ -327,8 +327,7 @@ const MasterDataTable: React.FC<{
               }
               return true;
             },
-            header: t('core.identificationData.dateOfBirth.label'),
-            id: 'date-of-birth'
+            header: t('core.identificationData.dateOfBirth.label')
           },
           {
             accessorFn: (subject) => subject.sex ?? null,
@@ -358,7 +357,7 @@ const MasterDataTable: React.FC<{
               value: ['MALE', 'FEMALE', null] satisfies SexFilter
             },
             {
-              id: 'date-of-birth',
+              id: 'dateOfBirth',
               value: {
                 allowNull: true,
                 max: null,
diff --git a/apps/web/src/translations/common.json b/apps/web/src/translations/common.json
index 1a0c68248..6e7025669 100644
--- a/apps/web/src/translations/common.json
+++ b/apps/web/src/translations/common.json
@@ -77,6 +77,10 @@
     "en": "Insufficient password strength",
     "fr": "Mot de passe trop faible"
   },
+  "manage": {
+    "en": "Manage",
+    "fr": "Gérer"
+  },
   "method": {
     "en": "Method",
     "fr": "Méthode"
@@ -85,6 +89,10 @@
     "en": "Password",
     "fr": "Mot de passe"
   },
+  "passwordsMustMatch": {
+    "en": "Passwords Must Match",
+    "fr": "Les mots de passe doivent correspondre"
+  },
   "personalInfo": {
     "en": "Personal Information",
     "fr": "Renseignements personnels"
@@ -101,10 +109,6 @@
     "en": "Standard",
     "fr": "Standard"
   },
-  "passwordsMustMatch": {
-    "en": "Passwords Must Match",
-    "fr": "Les mots de passe doivent correspondre"
-  },
   "subjectIdentification": {
     "description": {
       "en": "The following items are used to compute a unique identifier that enables consistent cross-session identification.",
@@ -154,5 +158,9 @@
   "usernameExists": {
     "en": "Username already exists",
     "fr": "Le nom d'utilisateur existe déjà"
+  },
+  "view": {
+    "en": "View",
+    "fr": "Voir"
   }
 }
diff --git a/apps/web/src/translations/layout.json b/apps/web/src/translations/layout.json
index 9c7192c22..194d3966a 100644
--- a/apps/web/src/translations/layout.json
+++ b/apps/web/src/translations/layout.json
@@ -50,10 +50,6 @@
       "en": "Data Hub",
       "fr": "Centre de données"
     },
-    "upload": {
-      "en": "Upload Data",
-      "fr": "Téléverser les données"
-    },
     "endSession": {
       "en": "End Current Session",
       "fr": "Terminer la session en cours"
@@ -66,6 +62,10 @@
       "en": "Start Session",
       "fr": "Commencer une session"
     },
+    "upload": {
+      "en": "Upload Data",
+      "fr": "Téléverser les données"
+    },
     "viewCurrentSubject": {
       "en": "View Current Subject",
       "fr": "Voir le client actuel"