diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/columns.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/columns.tsx
index 673a7b1..e9fc3c2 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/columns.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/columns.tsx
@@ -47,12 +47,14 @@ export const columns: ColumnDef<Enrollment>[] = [
   {
     id: 'select',
     header: DataTableColumnHeaderSelect,
-    cell: DataTableColumnSelect
+    cell: DataTableColumnSelect,
+    meta: { className: 'w-9' }
   },
   ...columns_,
   {
-    id: 'actions',
-    cell: ActionMenu
+    id: 'action',
+    cell: ActionMenu,
+    meta: { className: 'w-12' }
   }
 ]
 
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
index 25613b2..7aba3e9 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
@@ -89,6 +89,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
             sort={[{ id: 'created_at', desc: true }]}
             columns={columns}
             data={hits as Enrollment[]}
+            columnPinning={{ left: ['select'], right: ['action'] }}
             pageIndex={page - 1}
             pageSize={hitsPerPage}
             setSelectedRows={setSelectedRows}
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx
index 4bad4b3..7998337 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx
@@ -14,7 +14,8 @@ export const columns: ColumnDef<Order>[] = [
   {
     id: 'select',
     header: DataTableColumnHeaderSelect,
-    cell: DataTableColumnSelect
+    cell: DataTableColumnSelect,
+    meta: { className: 'w-9' }
   },
   ...columns_
 ]
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
index 0888185..ac016d4 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
@@ -42,12 +42,14 @@ export const columns: ColumnDef<User>[] = [
   {
     id: 'select',
     header: DataTableColumnHeaderSelect,
-    cell: DataTableColumnSelect
+    cell: DataTableColumnSelect,
+    meta: { className: 'w-9' }
   },
   ...columns_,
   {
     id: 'actions',
-    cell: ActionMenu
+    cell: ActionMenu,
+    meta: { className: 'w-12' }
   }
 ]
 
diff --git a/packages/ui/src/components/data-table/data-table.tsx b/packages/ui/src/components/data-table/data-table.tsx
index 4f9e8ff..1ea75fb 100644
--- a/packages/ui/src/components/data-table/data-table.tsx
+++ b/packages/ui/src/components/data-table/data-table.tsx
@@ -5,6 +5,7 @@ import {
   getCoreRowModel,
   useReactTable,
   type ColumnDef,
+  type ColumnPinningState,
   type ColumnSort,
   type RowSelectionState,
   type SortingState,
@@ -38,6 +39,7 @@ import { DataTablePagination } from './pagination'
 interface DataTableProps<TData, TValue> {
   children?: ReactNode
   columns: ColumnDef<TData, TValue>[]
+  columnPinning?: ColumnPinningState
   data: TData[]
   setSelectedRows?: (selectedRows: TData[]) => void
   pageIndex: number
@@ -67,6 +69,7 @@ export function DataTable<TData, TValue>({
   data,
   children,
   columns,
+  columnPinning = { left: [], right: [] },
   sort,
   pageIndex,
   pageSize,
@@ -192,10 +195,12 @@ export function DataTable<TData, TValue>({
       sorting,
       rowSelection,
       columnVisibility,
+      columnPinning,
       pagination: { pageIndex, pageSize }
     },
     manualSorting: true,
     manualPagination: true,
+    enableColumnPinning: true,
     enableRowSelection: true,
     getRowId,
     getCoreRowModel: getCoreRowModel(),
@@ -220,7 +225,7 @@ export function DataTable<TData, TValue>({
           <CardContent>
             {children}
 
-            <Table_ className="table-auto">
+            <Table_ className="table-auto w-full">
               <TableHeader>
                 {table.getHeaderGroups().map((headerGroup) => (
                   <TableRow
@@ -228,11 +233,18 @@ export function DataTable<TData, TValue>({
                     className="hover:bg-transparent"
                   >
                     {headerGroup.headers.map((header) => {
+                      const isPinned = header.column.getIsPinned()
+
                       return (
                         <TableHead
                           key={header.id}
                           className={cn(
+                            isPinned && 'z-1 lg:sticky bg-card',
+                            isPinned === 'left' && 'left-0',
+                            isPinned === 'right' && 'right-0',
                             'p-2.5',
+                            // Override the shadcn class
+                            '[&:has([role=checkbox])]:pr-2.5',
                             // @ts-ignore
                             header.column.columnDef.meta?.className
                           )}
@@ -252,29 +264,42 @@ export function DataTable<TData, TValue>({
 
               <TableBody>
                 {table.getRowModel().rows?.length ? (
-                  table.getRowModel().rows.map((row) => (
-                    <TableRow
-                      key={row.id}
-                      data-state={row.getIsSelected() && 'selected'}
-                      className="has-data-[state=open]:bg-muted/50"
-                    >
-                      {row.getVisibleCells().map((cell) => (
-                        <TableCell
-                          key={cell.id}
-                          className={cn(
-                            'p-2.5',
-                            // @ts-ignore
-                            cell.column.columnDef.meta?.className
-                          )}
-                        >
-                          {flexRender(
-                            cell.column.columnDef.cell,
-                            cell.getContext()
-                          )}
-                        </TableCell>
-                      ))}
-                    </TableRow>
-                  ))
+                  table.getRowModel().rows.map((row) => {
+                    const isSelected = row.getIsSelected()
+
+                    return (
+                      <TableRow
+                        key={row.id}
+                        data-state={isSelected && 'selected'}
+                        className="group has-data-[state=open]:bg-muted transition-none hover:bg-muted relative z-5"
+                      >
+                        {row.getVisibleCells().map((cell) => {
+                          const isPinned = cell.column.getIsPinned()
+
+                          return (
+                            <TableCell
+                              key={cell.id}
+                              className={cn(
+                                isPinned &&
+                                  'lg:sticky z-1 bg-card group-hover:bg-muted group-has-data-[state=open]:bg-muted',
+                                isPinned && isSelected && 'bg-muted',
+                                isPinned === 'left' && 'left-0',
+                                isPinned === 'right' && 'right-0',
+                                'p-2.5',
+                                // @ts-ignore
+                                cell.column.columnDef.meta?.className
+                              )}
+                            >
+                              {flexRender(
+                                cell.column.columnDef.cell,
+                                cell.getContext()
+                              )}
+                            </TableCell>
+                          )
+                        })}
+                      </TableRow>
+                    )
+                  })
                 ) : (
                   <TableRow>
                     <TableCell
diff --git a/packages/ui/src/routes/enrollments/columns.tsx b/packages/ui/src/routes/enrollments/columns.tsx
index 2dd4a54..4a8eb10 100644
--- a/packages/ui/src/routes/enrollments/columns.tsx
+++ b/packages/ui/src/routes/enrollments/columns.tsx
@@ -28,7 +28,9 @@ export const columns: ColumnDef<Enrollment>[] = [
       return (
         <div className="flex gap-2.5 items-center">
           <Avatar className="size-10 hidden lg:block">
-            <AvatarFallback>{initials(user.name)}</AvatarFallback>
+            <AvatarFallback className="border">
+              {initials(user.name)}
+            </AvatarFallback>
           </Avatar>
 
           <ul>
diff --git a/packages/ui/src/routes/users/columns.tsx b/packages/ui/src/routes/users/columns.tsx
index d9fbf48..91f00dd 100644
--- a/packages/ui/src/routes/users/columns.tsx
+++ b/packages/ui/src/routes/users/columns.tsx
@@ -23,7 +23,7 @@ export const columns: ColumnDef<User>[] = [
       return (
         <div className="flex gap-2.5 items-center">
           <Avatar className="size-10 hidden lg:block">
-            <AvatarFallback>{initials(name)}</AvatarFallback>
+            <AvatarFallback className="border">{initials(name)}</AvatarFallback>
           </Avatar>
 
           <ul>