diff --git a/web/components/layout/Page.tsx b/web/components/layout/Page.tsx
index eb8e72a..6117157 100644
--- a/web/components/layout/Page.tsx
+++ b/web/components/layout/Page.tsx
@@ -8,7 +8,7 @@ import Link from 'next/link'
 import {
   Dialog,
   ExpansionIcon,
-  HelpwaveLogo,
+  HelpwaveLogo, IconButton, Input,
   MarkdownInterpreter,
   SolidButton,
   useLocalStorage
@@ -16,7 +16,7 @@ import {
 import { getConfig } from '@/utils/config'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import clsx from 'clsx'
-import { CircleCheck, Grid2X2PlusIcon, User } from 'lucide-react'
+import { BellIcon, CircleCheck, Grid2X2PlusIcon, SettingsIcon, User } from 'lucide-react'
 import { usePathname } from 'next/navigation'
 
 export const StagingDisclaimerDialog = () => {
@@ -74,25 +74,26 @@ type HeaderProps = HTMLAttributes<HTMLHeadElement>
  * The basic header for most pages
  */
 export const Header = ({ ...props }: HeaderProps) => {
+  const translation = useTasksTranslation()
+
   return (
     <header
       {...props}
       className={clsx(
-        'flex-row-8 items-center justify-between grow max-h-18 p-4 bg-header-background text-header-text shadow-md rounded-lg',
+        'flex-row-8 items-center justify-between',
         props.className
       )}
     >
-      <div className="flex grow-1">
-        <Link href="/" className="flex-row-2 bg-surface text-on-surface items-center rounded-lg p-2">
-          <HelpwaveLogo className="min-h-7 min-w-7 p-0.5 bg-header-background rounded-md"/>
-          <span className="typography-title-md whitespace-nowrap">{'helpwave tasks'}</span>
-        </Link>
+      <div className="flex-col-0">
+        <Input placeholder={translation('search')}/>
       </div>
-      <div className="flex-col-0 grow-1 justify-center items-center">
-        <span className="typography-title-md">{'TK'}</span>
-        <span className="text-description">{'Test Klinkum'}</span>
-      </div>
-      <div className="flex-row-0 grow-1 justify-end">
+      <div className="flex-row-4 justify-end">
+        <IconButton color="neutral">
+          <BellIcon />
+        </IconButton>
+        <IconButton color="neutral">
+          <SettingsIcon />
+        </IconButton>
         <SolidButton color="neutral">
           {'User Name'}
           <ExpansionIcon isExpanded={false}/>
@@ -127,8 +128,8 @@ const SidebarLink = ({ children, route, ...props }: SidebarLinkProps) => {
     <Link
       {...props}
       className={clsx(
-        'flex-row-2 w-full px-2.5 py-1.5 rounded-md hover:bg-white/50 dark:hover:bg-black/50',
-        { 'bg-white dark:bg-black': route === props.href }
+        'flex-row-2 w-full px-2.5 py-1.5 rounded-md hover:bg-black/30',
+        { 'text-primary font-bold bg-black/10': route === props.href }
       )}
     >
       {children}
@@ -162,11 +163,15 @@ export const Sidebar = ({ ...props }: SidebarProps) => {
     <aside
       {...props}
       className={clsx(
-        'flex-col-4 w-50 min-w-56 rounded-lg bg-surface text-on-surface overflow-hidden mb-4 p-2.5',
+        'flex-col-4 w-50 min-w-56 rounded-lg bg-surface text-on-surface overflow-hidden p-2.5',
         props.className
       )}
     >
       <nav className="flex-col-2 overflow-auto">
+        <Link href="/" className="flex-row-2 text-primary items-center rounded-lg p-2 mb-8">
+          <HelpwaveLogo className="min-h-7 min-w-7 p-0.5 bg-header-background rounded-md"/>
+          <span className="typography-title-md whitespace-nowrap">{'helpwave tasks'}</span>
+        </Link>
         {/* TODO add station swticher here */}
         <SidebarLink href="/" route={route}>
           <Grid2X2PlusIcon className="-rotate-90"/>
@@ -203,14 +208,14 @@ export const Page = ({
                        pageTitle,
                      }: PageWithHeaderProps) => {
   return (
-    <div className="flex-col-4 h-screen w-screen overflow-hidden pt-4 pl-4">
+    <div className="flex-row-8 h-screen w-screen overflow-hidden">
       <Head>
         <title>{titleWrapper(pageTitle)}</title>
       </Head>
       <StagingDisclaimerDialog/>
-      <Header className="mr-4"/>
-      <div className="flex-row-4 grow overflow-hidden">
-        <Sidebar/>
+      <Sidebar className="my-4 ml-4"/>
+      <div className="flex-col-4 grow overflow-hidden">
+        <Header className="mr-4 mt-4 bg-background text-on-background"/>
         <main className="flex-col-2 grow overflow-auto">
           {children}
           <div className="min-h-16"/>
diff --git a/web/i18n/translations.ts b/web/i18n/translations.ts
index 76c2eb7..c2d9649 100644
--- a/web/i18n/translations.ts
+++ b/web/i18n/translations.ts
@@ -25,9 +25,11 @@ export type TasksTranslationEntries = {
   'myTasks': string,
   'nBed': (values: { count: number }) => string,
   'nOrganization': (values: { count: number }) => string,
+  'notAssigned': string,
   'notes': string,
   'nPatient': (values: { count: number }) => string,
   'nRoom': (values: { count: number }) => string,
+  'nTask': (values: { count: number }) => string,
   'nWard': (values: { count: number }) => string,
   'pages.404.notFound': string,
   'pages.404.notFoundDescription1': string,
@@ -70,6 +72,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
         'other': `${count} Organisationen`,
       })
     },
+    'notAssigned': `Nicht zugewiesen`,
     'notes': `Notizen`,
     'nPatient': ({ count }): string => {
       return TranslationGen.resolvePlural(count, {
@@ -83,6 +86,12 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
         'other': `${count} Zimmer`,
       })
     },
+    'nTask': ({ count }): string => {
+      return TranslationGen.resolvePlural(count, {
+        '=1': `${count} Aufgabe`,
+        'other': `${count} Aufgaben`,
+      })
+    },
     'nWard': ({ count }): string => {
       return TranslationGen.resolvePlural(count, {
         '=1': `${count} Station`,
@@ -128,6 +137,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
         'other': `${count} Organizations`,
       })
     },
+    'notAssigned': `Not assigned`,
     'notes': `notes`,
     'nPatient': ({ count }): string => {
       return TranslationGen.resolvePlural(count, {
@@ -141,6 +151,12 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
         'other': `${count} Rooms`,
       })
     },
+    'nTask': ({ count }): string => {
+      return TranslationGen.resolvePlural(count, {
+        '=1': `${count} Task`,
+        'other': `${count} Tasks`,
+      })
+    },
     'nWard': ({ count }): string => {
       return TranslationGen.resolvePlural(count, {
         '=1': `${count} Ward`,
diff --git a/web/locales/de-DE.arb b/web/locales/de-DE.arb
index 17a35b6..4805904 100644
--- a/web/locales/de-DE.arb
+++ b/web/locales/de-DE.arb
@@ -39,6 +39,14 @@
       }
     }
   },
+  "nTask": "{count, plural, =1{# Aufgabe} other{# Aufgaben}}",
+  "@nTask": {
+    "placeholders": {
+      "count": {
+        "type": "number"
+      }
+    }
+  },
   "visibility": "Sichtbarkeit",
   "private": "Privat",
   "public": "Öffentlich",
@@ -61,5 +69,6 @@
   "rooms": "Zimmer",
   "loginRequired": "Login benötigt",
   "loginRequiredDescription": "Um diese Seite benutzen zu können musst du eingeloggt sein.",
-  "login": "Login"
+  "login": "Login",
+  "notAssigned": "Nicht zugewiesen"
 }
diff --git a/web/locales/en-US.arb b/web/locales/en-US.arb
index 280cfe2..b51344b 100644
--- a/web/locales/en-US.arb
+++ b/web/locales/en-US.arb
@@ -39,6 +39,14 @@
       }
     }
   },
+  "nTask": "{count, plural, =1{# Task} other{# Tasks}}",
+  "@nTask": {
+    "placeholders": {
+      "count": {
+        "type": "number"
+      }
+    }
+  },
   "visibility": "Visibility",
   "private": "private",
   "public": "public",
@@ -61,5 +69,6 @@
   "rooms": "Rooms",
   "loginRequired": "Login required",
   "loginRequiredDescription": "To use this site you need to be logged in.",
-  "login": "Login"
+  "login": "Login",
+  "notAssigned": "Not assigned"
 }
diff --git a/web/next-env.d.ts b/web/next-env.d.ts
index aa2757a..4bc7849 100644
--- a/web/next-env.d.ts
+++ b/web/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import './build/dev/types/routes.d.ts'
+import "./build/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index f8c07d4..6f2fd7d 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -3,258 +3,19 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { Chip, SolidButton, Table } from '@helpwave/hightide'
-import { useMemo } from 'react'
-import type { ColumnDef } from '@tanstack/table-core'
 import { withAuth } from '@/hooks/useAuth'
 import { useMyQueryQuery } from '@/api/gql/generated'
 
-type Patient = {
-  name: string,
-}
-
-type Room = {
-  name: string,
-}
-
-type Task = {
-  id: string,
-  name: string,
-  dueDate: Date,
-  patient?: Patient,
-  room?: Room,
-  done: boolean,
-}
-
-const tasks: Task[] = [
-  {
-    id: 't1',
-    name: 'Check vitals',
-    dueDate: new Date('2025-01-10T08:00'),
-    patient: { name: 'Alice Kim' },
-    done: false
-  },
-  {
-    id: 't2',
-    name: 'Administer medication',
-    dueDate: new Date('2025-01-10T09:30'),
-    patient: { name: 'John Park' },
-    done: false
-  },
-  {
-    id: 't3',
-    name: 'Prepare room for surgery',
-    dueDate: new Date('2025-01-10T10:00'),
-    room: { name: 'OR-2' },
-    done: false
-  },
-  {
-    id: 't4',
-    name: 'Daily wound inspection',
-    dueDate: new Date('2025-01-10T11:00'),
-    patient: { name: 'Sarah Lee' },
-    done: false
-  },
-  {
-    id: 't5',
-    name: 'Clean recovery room',
-    dueDate: new Date('2025-01-10T12:00'),
-    room: { name: 'Recovery-5' },
-    done: false
-  },
-  {
-    id: 't6',
-    name: 'Update patient chart',
-    dueDate: new Date('2025-01-10T13:00'),
-    patient: { name: 'Daniel Cho' },
-    done: false
-  },
-  {
-    id: 't7',
-    name: 'Disinfect equipment',
-    dueDate: new Date('2025-01-10T14:00'),
-    room: { name: 'Utility-3' },
-    done: true
-  },
-  {
-    id: 't8',
-    name: 'Prepare IV line',
-    dueDate: new Date('2025-01-10T14:30'),
-    patient: { name: 'Emma Yoon' },
-    done: false
-  },
-  {
-    id: 't9',
-    name: 'Room ventilation check',
-    dueDate: new Date('2025-01-10T15:00'),
-    room: { name: 'ICU-1' },
-    done: false
-  },
-  {
-    id: 't10',
-    name: 'Transport patient for imaging',
-    dueDate: new Date('2025-01-10T15:30'),
-    patient: { name: 'Michael Han' },
-    done: true
-  },
-  {
-    id: 't11',
-    name: 'Replace linens',
-    dueDate: new Date('2025-01-10T16:00'),
-    room: { name: 'Room-204' },
-    done: false
-  },
-  {
-    id: 't12',
-    name: 'Monitor infusion pump',
-    dueDate: new Date('2025-01-10T16:30'),
-    patient: { name: 'Grace Jung' },
-    done: false
-  },
-  {
-    id: 't13',
-    name: 'Calibrate sensors',
-    dueDate: new Date('2025-01-10T17:00'),
-    room: { name: 'Lab-1' },
-    done: true
-  },
-  {
-    id: 't14',
-    name: 'Check oxygen supply',
-    dueDate: new Date('2025-01-10T17:30'),
-    room: { name: 'ICU-3' },
-    done: false
-  },
-  {
-    id: 't15',
-    name: 'Assist with mobility',
-    dueDate: new Date('2025-01-10T18:00'),
-    patient: { name: 'Henry Park' },
-    done: false
-  },
-  {
-    id: 't16',
-    name: 'Inventory medications',
-    dueDate: new Date('2025-01-10T18:30'),
-    room: { name: 'Pharmacy' },
-    done: true
-  },
-  {
-    id: 't17',
-    name: 'Measure blood glucose',
-    dueDate: new Date('2025-01-10T19:00'),
-    patient: { name: 'Lina Seo' },
-    done: false
-  },
-  {
-    id: 't18',
-    name: 'Sanitize surfaces',
-    dueDate: new Date('2025-01-10T19:30'),
-    room: { name: 'ER-2' },
-    done: false
-  },
-  {
-    id: 't19',
-    name: 'Check respiratory status',
-    dueDate: new Date('2025-01-10T20:00'),
-    patient: { name: 'Robert Shin' },
-    done: false
-  },
-  {
-    id: 't20',
-    name: 'Test emergency lighting',
-    dueDate: new Date('2025-01-10T20:30'),
-    room: { name: 'Hallway-A' },
-    done: true
-  }
-]
-
 
 const Dashboard: NextPage = () => {
   const translation = useTasksTranslation()
 
-  const columns = useMemo<ColumnDef<Task>[]>(() => [
-    {
-      id: 'description',
-      header: 'Description',
-      accessorKey: 'name',
-      minSize: 200,
-      size: 250,
-      maxSize: 300,
-    },
-    {
-      id: 'dueDate',
-      header: 'dueDate',
-      accessorKey: 'dueDate',
-      cell: ({ row }) => row.original.dueDate.toLocaleString(),
-      minSize: 150,
-      size: 200,
-      maxSize: 200,
-    },
-    {
-      id: 'patient',
-      header: 'Patient',
-      accessorFn: ({ patient }) => patient?.name,
-      sortingFn: 'text',
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
-    },
-    {
-      id: 'room',
-      header: 'Room',
-      accessorFn: ({ room }) => room?.name,
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
-    },
-    {
-      id: 'status',
-      header: 'status',
-      accessorKey: 'done',
-      cell: ({ row }) => (
-        <Chip color={row.original.done ? 'green' : 'yellow'}>
-          {row.original.done ? 'done' : 'todo'}
-        </Chip>
-      ),
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
-    },
-    {
-      id: 'actions',
-      header: 'Actions',
-      cell: ({ row }) => {
-        const task = row.original
-        return (
-          <SolidButton
-            onClick={() => {
-              console.log(`clicked on finish of task ${task.id}`)
-            }}
-          >
-            {'Finish'}
-          </SolidButton>
-        )
-      },
-      enableSorting: false,
-      enableColumnFilter: false,
-      size: 120,
-      minSize: 100,
-      maxSize: 150
-    }
-  ], [])
-
   const { data, isLoading } = useMyQueryQuery()
   return (
     <Page pageTitle={titleWrapper(translation('homePage'))}>
       <ContentPanel title={translation('homePage')} description="The beginning of something">
-        <Table
-          className="w-full h-full"
-          data={tasks}
-          columns={columns}
-        />
-
         {isLoading ? 'Loading' : data?.patients.toString()}
+        <div className="h-3000"></div>
       </ContentPanel>
     </Page>
   )
diff --git a/web/pages/patients/index.tsx b/web/pages/patients/index.tsx
index f8c07d4..b6b39d8 100644
--- a/web/pages/patients/index.tsx
+++ b/web/pages/patients/index.tsx
@@ -3,254 +3,188 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { Chip, SolidButton, Table } from '@helpwave/hightide'
-import { useMemo } from 'react'
+import { IconButton, Table } from '@helpwave/hightide'
+import { useEffect, useMemo, useState } from 'react'
 import type { ColumnDef } from '@tanstack/table-core'
 import { withAuth } from '@/hooks/useAuth'
 import { useMyQueryQuery } from '@/api/gql/generated'
+import type { User } from 'oidc-client-ts'
+import { getUser } from '@/api/auth/authService'
+import { SettingsIcon } from 'lucide-react'
 
-type Patient = {
+type Room = {
   name: string,
 }
 
-type Room = {
+type Bed = {
   name: string,
 }
 
 type Task = {
+  id: string,
+  assigneeId: string,
+  done: boolean,
+}
+
+type Patient = {
   id: string,
   name: string,
-  dueDate: Date,
-  patient?: Patient,
+  tasks: Task[],
   room?: Room,
-  done: boolean,
+  bed?: Bed,
+  lastUpdate?: Date,
 }
 
-const tasks: Task[] = [
-  {
-    id: 't1',
-    name: 'Check vitals',
-    dueDate: new Date('2025-01-10T08:00'),
-    patient: { name: 'Alice Kim' },
-    done: false
-  },
-  {
-    id: 't2',
-    name: 'Administer medication',
-    dueDate: new Date('2025-01-10T09:30'),
-    patient: { name: 'John Park' },
-    done: false
-  },
-  {
-    id: 't3',
-    name: 'Prepare room for surgery',
-    dueDate: new Date('2025-01-10T10:00'),
-    room: { name: 'OR-2' },
-    done: false
-  },
-  {
-    id: 't4',
-    name: 'Daily wound inspection',
-    dueDate: new Date('2025-01-10T11:00'),
-    patient: { name: 'Sarah Lee' },
-    done: false
-  },
-  {
-    id: 't5',
-    name: 'Clean recovery room',
-    dueDate: new Date('2025-01-10T12:00'),
-    room: { name: 'Recovery-5' },
-    done: false
-  },
-  {
-    id: 't6',
-    name: 'Update patient chart',
-    dueDate: new Date('2025-01-10T13:00'),
-    patient: { name: 'Daniel Cho' },
-    done: false
-  },
-  {
-    id: 't7',
-    name: 'Disinfect equipment',
-    dueDate: new Date('2025-01-10T14:00'),
-    room: { name: 'Utility-3' },
-    done: true
-  },
-  {
-    id: 't8',
-    name: 'Prepare IV line',
-    dueDate: new Date('2025-01-10T14:30'),
-    patient: { name: 'Emma Yoon' },
-    done: false
-  },
-  {
-    id: 't9',
-    name: 'Room ventilation check',
-    dueDate: new Date('2025-01-10T15:00'),
-    room: { name: 'ICU-1' },
-    done: false
-  },
-  {
-    id: 't10',
-    name: 'Transport patient for imaging',
-    dueDate: new Date('2025-01-10T15:30'),
-    patient: { name: 'Michael Han' },
-    done: true
-  },
-  {
-    id: 't11',
-    name: 'Replace linens',
-    dueDate: new Date('2025-01-10T16:00'),
-    room: { name: 'Room-204' },
-    done: false
-  },
-  {
-    id: 't12',
-    name: 'Monitor infusion pump',
-    dueDate: new Date('2025-01-10T16:30'),
-    patient: { name: 'Grace Jung' },
-    done: false
-  },
-  {
-    id: 't13',
-    name: 'Calibrate sensors',
-    dueDate: new Date('2025-01-10T17:00'),
-    room: { name: 'Lab-1' },
-    done: true
-  },
-  {
-    id: 't14',
-    name: 'Check oxygen supply',
-    dueDate: new Date('2025-01-10T17:30'),
-    room: { name: 'ICU-3' },
-    done: false
-  },
-  {
-    id: 't15',
-    name: 'Assist with mobility',
-    dueDate: new Date('2025-01-10T18:00'),
-    patient: { name: 'Henry Park' },
-    done: false
-  },
-  {
-    id: 't16',
-    name: 'Inventory medications',
-    dueDate: new Date('2025-01-10T18:30'),
-    room: { name: 'Pharmacy' },
-    done: true
-  },
-  {
-    id: 't17',
-    name: 'Measure blood glucose',
-    dueDate: new Date('2025-01-10T19:00'),
-    patient: { name: 'Lina Seo' },
-    done: false
+const patients: Patient[] = [
+  {
+    id: 'p1',
+    name: 'Ana Lopez',
+    room: { name: '301B' },
+    bed: { name: 'Fenster' },
+    tasks: [
+      {
+        id: 't1',
+        assigneeId: 'nurse-14',
+        done: false,
+      },
+      {
+        id: 't2',
+        assigneeId: 'physician-03',
+        done: true,
+      },
+    ],
   },
+
   {
-    id: 't18',
-    name: 'Sanitize surfaces',
-    dueDate: new Date('2025-01-10T19:30'),
-    room: { name: 'ER-2' },
-    done: false
+    id: 'p2',
+    name: 'Michael Chen',
+    room: { name: '207A' },
+    bed: { name: 'Tür' },
+    tasks: [
+      {
+        id: 't3',
+        assigneeId: 'nurse-08',
+        done: false,
+      },
+    ],
   },
+
   {
-    id: 't19',
-    name: 'Check respiratory status',
-    dueDate: new Date('2025-01-10T20:00'),
-    patient: { name: 'Robert Shin' },
-    done: false
+    id: 'p3',
+    name: 'Evelyn Hart',
+    tasks: [
+      {
+        id: 't4',
+        assigneeId: 'nurse-18',
+        done: true,
+      },
+      {
+        id: 't5',
+        assigneeId: 'physician-03',
+        done: false,
+      },
+    ],
   },
-  {
-    id: 't20',
-    name: 'Test emergency lighting',
-    dueDate: new Date('2025-01-10T20:30'),
-    room: { name: 'Hallway-A' },
-    done: true
-  }
 ]
 
 
 const Dashboard: NextPage = () => {
   const translation = useTasksTranslation()
+  const [user, setUser] = useState<User>()
+
+  useEffect(() => {
+    getUser().then(
+      value => value && setUser(value)
+    )
+  }, [])
 
-  const columns = useMemo<ColumnDef<Task>[]>(() => [
+  const columns = useMemo<ColumnDef<Patient>[]>(() => [
     {
-      id: 'description',
-      header: 'Description',
-      accessorKey: 'name',
+      id: 'name',
+      header: 'Name',
+      cell: ({ row }) => {
+        const data = row.original
+        const unassigned = !data.room && !data.bed
+        return (
+          <div className="flex-col-0">
+            {data.name}
+            <span className="text-description">
+              {unassigned ?
+                translation('notAssigned') :
+                [data.room?.name, data.bed?.name].filter(Boolean).join(' ')
+              }
+            </span>
+          </div>
+        )
+      },
       minSize: 200,
       size: 250,
       maxSize: 300,
     },
     {
-      id: 'dueDate',
-      header: 'dueDate',
-      accessorKey: 'dueDate',
-      cell: ({ row }) => row.original.dueDate.toLocaleString(),
-      minSize: 150,
-      size: 200,
+      id: 'openTasks',
+      header: 'Open Tasks',
+      accessorFn: ({ tasks }) => tasks.filter(value => !value.done).length,
+      minSize: 100,
+      size: 100,
       maxSize: 200,
     },
     {
-      id: 'patient',
-      header: 'Patient',
-      accessorFn: ({ patient }) => patient?.name,
-      sortingFn: 'text',
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
-    },
-    {
-      id: 'room',
-      header: 'Room',
-      accessorFn: ({ room }) => room?.name,
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
+      id: 'myTasks',
+      header: 'My Tasks',
+      // TODO use correct id
+      accessorFn: ({ tasks }) => tasks.filter(value => value.assigneeId === user?.profile.sid).length,
+      minSize: 100,
+      size: 100,
+      maxSize: 200,
     },
     {
-      id: 'status',
-      header: 'status',
-      accessorKey: 'done',
-      cell: ({ row }) => (
-        <Chip color={row.original.done ? 'green' : 'yellow'}>
-          {row.original.done ? 'done' : 'todo'}
-        </Chip>
-      ),
-      minSize: 250,
-      size: 250,
-      maxSize: 400,
+      id: 'lastChange',
+      header: 'Last Change',
+      accessorKey: 'lastUpdate',
+      cell: ({ row }) => {
+        return (
+          row.original.lastUpdate?.toLocaleString()
+        )
+      },
+      minSize: 100,
+      size: 150,
+      maxSize: 200,
     },
     {
       id: 'actions',
-      header: 'Actions',
+      header: '',
       cell: ({ row }) => {
-        const task = row.original
+        const data = row.original
         return (
-          <SolidButton
+          <IconButton
+            color="neutral"
             onClick={() => {
-              console.log(`clicked on finish of task ${task.id}`)
+              console.log(`clicked on settings of ${data.name}`)
             }}
           >
-            {'Finish'}
-          </SolidButton>
+            <SettingsIcon/>
+          </IconButton>
         )
       },
       enableSorting: false,
       enableColumnFilter: false,
-      size: 120,
-      minSize: 100,
-      maxSize: 150
+      size: 77,
+      minSize: 77,
+      maxSize: 77
     }
-  ], [])
+  ], [user])
 
   const { data, isLoading } = useMyQueryQuery()
   return (
-    <Page pageTitle={titleWrapper(translation('homePage'))}>
-      <ContentPanel title={translation('homePage')} description="The beginning of something">
+    <Page pageTitle={titleWrapper(translation('patients'))}>
+      <ContentPanel
+        title={translation('patients')}
+        description={translation('nPatient', { count: patients.length })}
+      >
         <Table
           className="w-full h-full"
-          data={tasks}
+          data={patients}
           columns={columns}
         />
 
diff --git a/web/pages/tasks/index.tsx b/web/pages/tasks/index.tsx
index f8c07d4..9b2aaea 100644
--- a/web/pages/tasks/index.tsx
+++ b/web/pages/tasks/index.tsx
@@ -3,11 +3,12 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { Chip, SolidButton, Table } from '@helpwave/hightide'
+import { Checkbox, Chip, IconButton, Table } from '@helpwave/hightide'
 import { useMemo } from 'react'
 import type { ColumnDef } from '@tanstack/table-core'
 import { withAuth } from '@/hooks/useAuth'
 import { useMyQueryQuery } from '@/api/gql/generated'
+import { SettingsIcon } from 'lucide-react'
 
 type Patient = {
   name: string,
@@ -173,7 +174,24 @@ const tasks: Task[] = [
 const Dashboard: NextPage = () => {
   const translation = useTasksTranslation()
 
+  // TODO do translations of headers
   const columns = useMemo<ColumnDef<Task>[]>(() => [
+    {
+      id: 'done',
+      header: '',
+      cell: ({ row }) => (
+        <Checkbox
+          checked={row.original.done}
+          onChange={(checked) => {
+            console.debug(checked)
+            // TODO change checked state
+          }}
+        />
+      ),
+      minSize: 60,
+      size: 60,
+      enableResizing: false,
+    },
     {
       id: 'description',
       header: 'Description',
@@ -184,7 +202,7 @@ const Dashboard: NextPage = () => {
     },
     {
       id: 'dueDate',
-      header: 'dueDate',
+      header: 'Due Date',
       accessorKey: 'dueDate',
       cell: ({ row }) => row.original.dueDate.toLocaleString(),
       minSize: 150,
@@ -210,7 +228,7 @@ const Dashboard: NextPage = () => {
     },
     {
       id: 'status',
-      header: 'status',
+      header: 'Status',
       accessorKey: 'done',
       cell: ({ row }) => (
         <Chip color={row.original.done ? 'green' : 'yellow'}>
@@ -223,31 +241,32 @@ const Dashboard: NextPage = () => {
     },
     {
       id: 'actions',
-      header: 'Actions',
+      header: '',
       cell: ({ row }) => {
         const task = row.original
         return (
-          <SolidButton
+          <IconButton
+            color="neutral"
             onClick={() => {
               console.log(`clicked on finish of task ${task.id}`)
             }}
           >
-            {'Finish'}
-          </SolidButton>
+            <SettingsIcon/>
+          </IconButton>
         )
       },
       enableSorting: false,
       enableColumnFilter: false,
-      size: 120,
-      minSize: 100,
-      maxSize: 150
+      size: 77,
+      minSize: 77,
+      maxSize: 77
     }
   ], [])
 
   const { data, isLoading } = useMyQueryQuery()
   return (
-    <Page pageTitle={titleWrapper(translation('homePage'))}>
-      <ContentPanel title={translation('homePage')} description="The beginning of something">
+    <Page pageTitle={titleWrapper(translation('myTasks'))}>
+      <ContentPanel title={translation('myTasks')} description={translation('nTask', { count: tasks.length })}>
         <Table
           className="w-full h-full"
           data={tasks}
