diff --git a/backend/api/decorators/__init__.py b/backend/api/decorators/__init__.py
index 5c8500d2..ef535125 100644
--- a/backend/api/decorators/__init__.py
+++ b/backend/api/decorators/__init__.py
@@ -1,3 +1,20 @@
+from api.decorators.filter_sort import (
+    apply_filtering,
+    apply_sorting,
+    filtered_and_sorted_query,
+)
+from api.decorators.full_text_search import (
+    apply_full_text_search,
+    full_text_search_query,
+)
 from api.decorators.pagination import apply_pagination, paginated_query
 
-__all__ = ["apply_pagination", "paginated_query"]
+__all__ = [
+    "apply_pagination",
+    "paginated_query",
+    "apply_sorting",
+    "apply_filtering",
+    "filtered_and_sorted_query",
+    "apply_full_text_search",
+    "full_text_search_query",
+]
diff --git a/backend/api/decorators/filter_sort.py b/backend/api/decorators/filter_sort.py
new file mode 100644
index 00000000..c38cacb0
--- /dev/null
+++ b/backend/api/decorators/filter_sort.py
@@ -0,0 +1,694 @@
+from datetime import date as date_type
+from functools import wraps
+from typing import Any, Callable, TypeVar
+
+import strawberry
+from api.decorators.pagination import apply_pagination
+from api.inputs import (
+    ColumnType,
+    FilterInput,
+    FilterOperator,
+    PaginationInput,
+    SortDirection,
+    SortInput,
+)
+from database import models
+from database.models.base import Base
+from sqlalchemy import Select, and_, func, or_, select
+from sqlalchemy.orm import aliased
+
+T = TypeVar("T")
+
+
+def detect_entity_type(model_class: type[Base]) -> str | None:
+    if model_class == models.Patient:
+        return "patient"
+    if model_class == models.Task:
+        return "task"
+    return None
+
+
+def get_property_value_column(field_type: str) -> str:
+    field_type_mapping = {
+        "FIELD_TYPE_TEXT": "text_value",
+        "FIELD_TYPE_NUMBER": "number_value",
+        "FIELD_TYPE_CHECKBOX": "boolean_value",
+        "FIELD_TYPE_DATE": "date_value",
+        "FIELD_TYPE_DATE_TIME": "date_time_value",
+        "FIELD_TYPE_SELECT": "select_value",
+        "FIELD_TYPE_MULTI_SELECT": "multi_select_values",
+    }
+    return field_type_mapping.get(field_type, "text_value")
+
+
+def get_property_join_alias(
+    query: Select[Any],
+    model_class: type[Base],
+    property_definition_id: str,
+    field_type: str,
+) -> Any:
+    entity_type = detect_entity_type(model_class)
+    if not entity_type:
+        raise ValueError(
+            f"Unsupported entity type for property filtering: {model_class}"
+        )
+
+    property_alias = aliased(models.PropertyValue)
+    value_column = get_property_value_column(field_type)
+
+    if entity_type == "patient":
+        join_condition = and_(
+            property_alias.patient_id == model_class.id,
+            property_alias.definition_id == property_definition_id,
+        )
+    else:
+        join_condition = and_(
+            property_alias.task_id == model_class.id,
+            property_alias.definition_id == property_definition_id,
+        )
+
+    query = query.outerjoin(property_alias, join_condition)
+    return query, property_alias, getattr(property_alias, value_column)
+
+
+def apply_sorting(
+    query: Select[Any],
+    sorting: list[SortInput] | None,
+    model_class: type[Base],
+    property_field_types: dict[str, str] | None = None,
+) -> Select[Any]:
+    if not sorting:
+        return query
+
+    order_by_clauses = []
+    property_field_types = property_field_types or {}
+
+    for sort_input in sorting:
+        if sort_input.column_type == ColumnType.DIRECT_ATTRIBUTE:
+            try:
+                column = getattr(model_class, sort_input.column)
+                if sort_input.direction == SortDirection.DESC:
+                    order_by_clauses.append(column.desc())
+                else:
+                    order_by_clauses.append(column.asc())
+            except AttributeError:
+                continue
+
+        elif sort_input.column_type == ColumnType.PROPERTY:
+            if not sort_input.property_definition_id:
+                continue
+
+            field_type = property_field_types.get(
+                sort_input.property_definition_id,
+                "FIELD_TYPE_TEXT"
+            )
+            query, property_alias, value_column = (
+                get_property_join_alias(
+                    query,
+                    model_class,
+                    sort_input.property_definition_id,
+                    field_type,
+                )
+            )
+
+            if sort_input.direction == SortDirection.DESC:
+                order_by_clauses.append(value_column.desc().nulls_last())
+            else:
+                order_by_clauses.append(value_column.asc().nulls_first())
+
+    if order_by_clauses:
+        query = query.order_by(*order_by_clauses)
+
+    return query
+
+
+def apply_text_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    search_text = parameter.search_text
+    if search_text is None:
+        return None
+
+    is_case_sensitive = parameter.is_case_sensitive
+
+    if is_case_sensitive:
+        if operator == FilterOperator.TEXT_EQUALS:
+            return column.like(search_text)
+        if operator == FilterOperator.TEXT_NOT_EQUALS:
+            return ~column.like(search_text)
+        if operator == FilterOperator.TEXT_NOT_WHITESPACE:
+            return func.trim(column) != ""
+        if operator == FilterOperator.TEXT_CONTAINS:
+            return column.like(f"%{search_text}%")
+        if operator == FilterOperator.TEXT_NOT_CONTAINS:
+            return ~column.like(f"%{search_text}%")
+        if operator == FilterOperator.TEXT_STARTS_WITH:
+            return column.like(f"{search_text}%")
+        if operator == FilterOperator.TEXT_ENDS_WITH:
+            return column.like(f"%{search_text}")
+    else:
+        if operator == FilterOperator.TEXT_EQUALS:
+            return column.ilike(search_text)
+        if operator == FilterOperator.TEXT_NOT_EQUALS:
+            return ~column.ilike(search_text)
+        if operator == FilterOperator.TEXT_NOT_WHITESPACE:
+            return func.trim(column) != ""
+        if operator == FilterOperator.TEXT_CONTAINS:
+            return column.ilike(f"%{search_text}%")
+        if operator == FilterOperator.TEXT_NOT_CONTAINS:
+            return ~column.ilike(f"%{search_text}%")
+        if operator == FilterOperator.TEXT_STARTS_WITH:
+            return column.ilike(f"{search_text}%")
+        if operator == FilterOperator.TEXT_ENDS_WITH:
+            return column.ilike(f"%{search_text}")
+
+    return None
+
+
+def apply_number_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    compare_value = parameter.compare_value
+    min_value = parameter.min
+    max_value = parameter.max
+
+    if operator == FilterOperator.NUMBER_EQUALS:
+        if compare_value is not None:
+            return column == compare_value
+    elif operator == FilterOperator.NUMBER_NOT_EQUALS:
+        if compare_value is not None:
+            return column != compare_value
+    elif operator == FilterOperator.NUMBER_GREATER_THAN:
+        if compare_value is not None:
+            return column > compare_value
+    elif operator == FilterOperator.NUMBER_GREATER_THAN_OR_EQUAL:
+        if compare_value is not None:
+            return column >= compare_value
+    elif operator == FilterOperator.NUMBER_LESS_THAN:
+        if compare_value is not None:
+            return column < compare_value
+    elif operator == FilterOperator.NUMBER_LESS_THAN_OR_EQUAL:
+        if compare_value is not None:
+            return column <= compare_value
+    elif operator == FilterOperator.NUMBER_BETWEEN:
+        if min_value is not None and max_value is not None:
+            return column.between(min_value, max_value)
+    elif operator == FilterOperator.NUMBER_NOT_BETWEEN:
+        if min_value is not None and max_value is not None:
+            return ~column.between(min_value, max_value)
+
+    return None
+
+
+def normalize_date_for_comparison(date_value: Any) -> Any:
+    return date_value
+
+
+def apply_date_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    compare_date = parameter.compare_date
+    min_date = parameter.min_date
+    max_date = parameter.max_date
+
+    if operator == FilterOperator.DATE_EQUALS:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) == compare_date
+            return column == compare_date
+    elif operator == FilterOperator.DATE_NOT_EQUALS:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) != compare_date
+            return column != compare_date
+    elif operator == FilterOperator.DATE_GREATER_THAN:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) > compare_date
+            return column > compare_date
+    elif operator == FilterOperator.DATE_GREATER_THAN_OR_EQUAL:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) >= compare_date
+            return column >= compare_date
+    elif operator == FilterOperator.DATE_LESS_THAN:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) < compare_date
+            return column < compare_date
+    elif operator == FilterOperator.DATE_LESS_THAN_OR_EQUAL:
+        if compare_date is not None:
+            if isinstance(compare_date, date_type):
+                return func.date(column) <= compare_date
+            return column <= compare_date
+    elif operator == FilterOperator.DATE_BETWEEN:
+        if min_date is not None and max_date is not None:
+            if isinstance(min_date, date_type) and isinstance(max_date, date_type):
+                return func.date(column).between(min_date, max_date)
+            return column.between(min_date, max_date)
+    elif operator == FilterOperator.DATE_NOT_BETWEEN:
+        if min_date is not None and max_date is not None:
+            if isinstance(min_date, date_type) and isinstance(max_date, date_type):
+                return ~func.date(column).between(min_date, max_date)
+            return ~column.between(min_date, max_date)
+
+    return None
+
+
+def apply_datetime_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    compare_date_time = parameter.compare_date_time
+    min_date_time = parameter.min_date_time
+    max_date_time = parameter.max_date_time
+
+    if operator == FilterOperator.DATETIME_EQUALS:
+        if compare_date_time is not None:
+            return column == compare_date_time
+    elif operator == FilterOperator.DATETIME_NOT_EQUALS:
+        if compare_date_time is not None:
+            return column != compare_date_time
+    elif operator == FilterOperator.DATETIME_GREATER_THAN:
+        if compare_date_time is not None:
+            return column > compare_date_time
+    elif operator == FilterOperator.DATETIME_GREATER_THAN_OR_EQUAL:
+        if compare_date_time is not None:
+            return column >= compare_date_time
+    elif operator == FilterOperator.DATETIME_LESS_THAN:
+        if compare_date_time is not None:
+            return column < compare_date_time
+    elif operator == FilterOperator.DATETIME_LESS_THAN_OR_EQUAL:
+        if compare_date_time is not None:
+            return column <= compare_date_time
+    elif operator == FilterOperator.DATETIME_BETWEEN:
+        if min_date_time is not None and max_date_time is not None:
+            return column.between(min_date_time, max_date_time)
+    elif operator == FilterOperator.DATETIME_NOT_BETWEEN:
+        if min_date_time is not None and max_date_time is not None:
+            return ~column.between(min_date_time, max_date_time)
+
+    return None
+
+
+def apply_boolean_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    if operator == FilterOperator.BOOLEAN_IS_TRUE:
+        return column.is_(True)
+    if operator == FilterOperator.BOOLEAN_IS_FALSE:
+        return column.is_(False)
+    return None
+
+
+def apply_tags_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
+    search_tags = parameter.search_tags
+    if not search_tags:
+        return None
+
+    if operator == FilterOperator.TAGS_EQUALS:
+        tags_str = ",".join(sorted(search_tags))
+        return column == tags_str
+    if operator == FilterOperator.TAGS_NOT_EQUALS:
+        tags_str = ",".join(sorted(search_tags))
+        return column != tags_str
+    if operator == FilterOperator.TAGS_CONTAINS:
+        conditions = []
+        for tag in search_tags:
+            conditions.append(column.contains(tag))
+        return and_(*conditions)
+    if operator == FilterOperator.TAGS_NOT_CONTAINS:
+        conditions = []
+        for tag in search_tags:
+            conditions.append(~column.contains(tag))
+        return or_(*conditions)
+
+    return None
+
+
+def apply_tags_single_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    search_tags = parameter.search_tags
+    if not search_tags:
+        return None
+
+    if operator == FilterOperator.TAGS_SINGLE_EQUALS:
+        if len(search_tags) == 1:
+            return column == search_tags[0]
+    if operator == FilterOperator.TAGS_SINGLE_NOT_EQUALS:
+        if len(search_tags) == 1:
+            return column != search_tags[0]
+    if operator == FilterOperator.TAGS_SINGLE_CONTAINS:
+        conditions = []
+        for tag in search_tags:
+            conditions.append(column == tag)
+        return or_(*conditions)
+    if operator == FilterOperator.TAGS_SINGLE_NOT_CONTAINS:
+        conditions = []
+        for tag in search_tags:
+            conditions.append(column != tag)
+        return and_(*conditions)
+
+    return None
+
+
+def apply_null_filter(
+    column: Any, operator: FilterOperator, parameter: Any
+) -> Any:
+    if operator == FilterOperator.IS_NULL:
+        return column.is_(None)
+    if operator == FilterOperator.IS_NOT_NULL:
+        return column.isnot(None)
+    return None
+
+
+def apply_filtering(
+    query: Select[Any],
+    filtering: list[FilterInput] | None,
+    model_class: type[Base],
+    property_field_types: dict[str, str] | None = None,
+) -> Select[Any]:
+    if not filtering:
+        return query
+
+    filter_conditions = []
+    property_field_types = property_field_types or {}
+
+    for filter_input in filtering:
+        condition = None
+
+        if filter_input.column_type == ColumnType.DIRECT_ATTRIBUTE:
+            try:
+                column = getattr(model_class, filter_input.column)
+            except AttributeError:
+                continue
+
+            operator = filter_input.operator
+            parameter = filter_input.parameter
+
+            if operator in [
+                FilterOperator.TEXT_EQUALS,
+                FilterOperator.TEXT_NOT_EQUALS,
+                FilterOperator.TEXT_NOT_WHITESPACE,
+                FilterOperator.TEXT_CONTAINS,
+                FilterOperator.TEXT_NOT_CONTAINS,
+                FilterOperator.TEXT_STARTS_WITH,
+                FilterOperator.TEXT_ENDS_WITH,
+            ]:
+                condition = apply_text_filter(column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.NUMBER_EQUALS,
+                FilterOperator.NUMBER_NOT_EQUALS,
+                FilterOperator.NUMBER_GREATER_THAN,
+                FilterOperator.NUMBER_GREATER_THAN_OR_EQUAL,
+                FilterOperator.NUMBER_LESS_THAN,
+                FilterOperator.NUMBER_LESS_THAN_OR_EQUAL,
+                FilterOperator.NUMBER_BETWEEN,
+                FilterOperator.NUMBER_NOT_BETWEEN,
+            ]:
+                condition = apply_number_filter(column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.DATE_EQUALS,
+                FilterOperator.DATE_NOT_EQUALS,
+                FilterOperator.DATE_GREATER_THAN,
+                FilterOperator.DATE_GREATER_THAN_OR_EQUAL,
+                FilterOperator.DATE_LESS_THAN,
+                FilterOperator.DATE_LESS_THAN_OR_EQUAL,
+                FilterOperator.DATE_BETWEEN,
+                FilterOperator.DATE_NOT_BETWEEN,
+            ]:
+                condition = apply_date_filter(column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.DATETIME_EQUALS,
+                FilterOperator.DATETIME_NOT_EQUALS,
+                FilterOperator.DATETIME_GREATER_THAN,
+                FilterOperator.DATETIME_GREATER_THAN_OR_EQUAL,
+                FilterOperator.DATETIME_LESS_THAN,
+                FilterOperator.DATETIME_LESS_THAN_OR_EQUAL,
+                FilterOperator.DATETIME_BETWEEN,
+                FilterOperator.DATETIME_NOT_BETWEEN,
+            ]:
+                condition = apply_datetime_filter(column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.BOOLEAN_IS_TRUE,
+                FilterOperator.BOOLEAN_IS_FALSE,
+            ]:
+                condition = apply_boolean_filter(column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.IS_NULL,
+                FilterOperator.IS_NOT_NULL,
+            ]:
+                condition = apply_null_filter(column, operator, parameter)
+
+        elif filter_input.column_type == ColumnType.PROPERTY:
+            if not filter_input.property_definition_id:
+                continue
+
+            field_type = property_field_types.get(
+                filter_input.property_definition_id,
+                "FIELD_TYPE_TEXT"
+            )
+            query, property_alias, value_column = get_property_join_alias(
+                query, model_class, filter_input.property_definition_id, field_type
+            )
+
+            operator = filter_input.operator
+            parameter = filter_input.parameter
+
+            if operator in [
+                FilterOperator.TEXT_EQUALS,
+                FilterOperator.TEXT_NOT_EQUALS,
+                FilterOperator.TEXT_NOT_WHITESPACE,
+                FilterOperator.TEXT_CONTAINS,
+                FilterOperator.TEXT_NOT_CONTAINS,
+                FilterOperator.TEXT_STARTS_WITH,
+                FilterOperator.TEXT_ENDS_WITH,
+            ]:
+                condition = apply_text_filter(
+                    value_column, operator, parameter
+                )
+
+            elif operator in [
+                FilterOperator.NUMBER_EQUALS,
+                FilterOperator.NUMBER_NOT_EQUALS,
+                FilterOperator.NUMBER_GREATER_THAN,
+                FilterOperator.NUMBER_GREATER_THAN_OR_EQUAL,
+                FilterOperator.NUMBER_LESS_THAN,
+                FilterOperator.NUMBER_LESS_THAN_OR_EQUAL,
+                FilterOperator.NUMBER_BETWEEN,
+                FilterOperator.NUMBER_NOT_BETWEEN,
+            ]:
+                condition = apply_number_filter(value_column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.DATE_EQUALS,
+                FilterOperator.DATE_NOT_EQUALS,
+                FilterOperator.DATE_GREATER_THAN,
+                FilterOperator.DATE_GREATER_THAN_OR_EQUAL,
+                FilterOperator.DATE_LESS_THAN,
+                FilterOperator.DATE_LESS_THAN_OR_EQUAL,
+                FilterOperator.DATE_BETWEEN,
+                FilterOperator.DATE_NOT_BETWEEN,
+            ]:
+                condition = apply_date_filter(
+                    value_column, operator, parameter
+                )
+
+            elif operator in [
+                FilterOperator.DATETIME_EQUALS,
+                FilterOperator.DATETIME_NOT_EQUALS,
+                FilterOperator.DATETIME_GREATER_THAN,
+                FilterOperator.DATETIME_GREATER_THAN_OR_EQUAL,
+                FilterOperator.DATETIME_LESS_THAN,
+                FilterOperator.DATETIME_LESS_THAN_OR_EQUAL,
+                FilterOperator.DATETIME_BETWEEN,
+                FilterOperator.DATETIME_NOT_BETWEEN,
+            ]:
+                condition = apply_datetime_filter(value_column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.BOOLEAN_IS_TRUE,
+                FilterOperator.BOOLEAN_IS_FALSE,
+            ]:
+                condition = apply_boolean_filter(
+                    value_column, operator, parameter
+                )
+
+            elif operator in [
+                FilterOperator.TAGS_EQUALS,
+                FilterOperator.TAGS_NOT_EQUALS,
+                FilterOperator.TAGS_CONTAINS,
+                FilterOperator.TAGS_NOT_CONTAINS,
+            ]:
+                condition = apply_tags_filter(
+                    value_column, operator, parameter
+                )
+
+            elif operator in [
+                FilterOperator.TAGS_SINGLE_EQUALS,
+                FilterOperator.TAGS_SINGLE_NOT_EQUALS,
+                FilterOperator.TAGS_SINGLE_CONTAINS,
+                FilterOperator.TAGS_SINGLE_NOT_CONTAINS,
+            ]:
+                condition = apply_tags_single_filter(value_column, operator, parameter)
+
+            elif operator in [
+                FilterOperator.IS_NULL,
+                FilterOperator.IS_NOT_NULL,
+            ]:
+                condition = apply_null_filter(
+                    value_column, operator, parameter
+                )
+
+        if condition is not None:
+            filter_conditions.append(condition)
+
+    if filter_conditions:
+        query = query.where(and_(*filter_conditions))
+
+    return query
+
+
+def filtered_and_sorted_query(
+    filtering_param: str = "filtering",
+    sorting_param: str = "sorting",
+    pagination_param: str = "pagination",
+):
+    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+        @wraps(func)
+        async def wrapper(*args: Any, **kwargs: Any) -> Any:
+            filtering: list[FilterInput] | None = kwargs.get(filtering_param)
+            sorting: list[SortInput] | None = kwargs.get(sorting_param)
+            pagination: PaginationInput | None = kwargs.get(pagination_param)
+
+            result = await func(*args, **kwargs)
+
+            if not isinstance(result, Select):
+                return result
+
+            model_class = result.column_descriptions[0]["entity"]
+            if not model_class:
+                if isinstance(result, Select):
+                    for arg in args:
+                        if (
+                            hasattr(arg, "context")
+                            and hasattr(arg.context, "db")
+                        ):
+                            db = arg.context.db
+                            query_result = await db.execute(result)
+                            return query_result.scalars().all()
+                    else:
+                        info = kwargs.get("info")
+                        if (
+                            info
+                            and hasattr(info, "context")
+                            and hasattr(info.context, "db")
+                        ):
+                            db = info.context.db
+                            query_result = await db.execute(result)
+                            return query_result.scalars().all()
+                return result
+
+            property_field_types: dict[str, str] = {}
+
+            if filtering or sorting:
+                property_def_ids = set()
+                if filtering:
+                    for f in filtering:
+                        if (
+                            f.column_type == ColumnType.PROPERTY
+                            and f.property_definition_id
+                        ):
+                            property_def_ids.add(f.property_definition_id)
+                if sorting:
+                    for s in sorting:
+                        if (
+                            s.column_type == ColumnType.PROPERTY
+                            and s.property_definition_id
+                        ):
+                            property_def_ids.add(s.property_definition_id)
+
+                if property_def_ids:
+                    for arg in args:
+                        if (
+                            hasattr(arg, "context")
+                            and hasattr(arg.context, "db")
+                        ):
+                            db = arg.context.db
+                            prop_defs_result = await db.execute(
+                                select(models.PropertyDefinition).where(
+                                    models.PropertyDefinition.id.in_(property_def_ids)
+                                )
+                            )
+                            prop_defs = prop_defs_result.scalars().all()
+                            property_field_types = {
+                                str(prop_def.id): prop_def.field_type
+                                for prop_def in prop_defs
+                            }
+                            break
+                    else:
+                        info = kwargs.get("info")
+                        if (
+                            info
+                            and hasattr(info, "context")
+                            and hasattr(info.context, "db")
+                        ):
+                            db = info.context.db
+                            prop_defs_result = await db.execute(
+                                select(models.PropertyDefinition).where(
+                                    models.PropertyDefinition.id.in_(property_def_ids)
+                                )
+                            )
+                            prop_defs = prop_defs_result.scalars().all()
+                            property_field_types = {
+                                str(prop_def.id): prop_def.field_type
+                                for prop_def in prop_defs
+                            }
+
+            if filtering:
+                result = apply_filtering(
+                    result, filtering, model_class, property_field_types
+                )
+
+            if sorting:
+                result = apply_sorting(
+                    result, sorting, model_class, property_field_types
+                )
+
+            if pagination and pagination is not strawberry.UNSET:
+                page_index = pagination.page_index
+                page_size = pagination.page_size
+                if page_size:
+                    offset = page_index * page_size
+                    result = apply_pagination(result, limit=page_size, offset=offset)
+
+            if isinstance(result, Select):
+                for arg in args:
+                    if (
+                        hasattr(arg, "context")
+                        and hasattr(arg.context, "db")
+                    ):
+                        db = arg.context.db
+                        query_result = await db.execute(result)
+                        return query_result.scalars().all()
+                else:
+                    info = kwargs.get("info")
+                    if (
+                        info
+                        and hasattr(info, "context")
+                        and hasattr(info.context, "db")
+                    ):
+                        db = info.context.db
+                        query_result = await db.execute(result)
+                        return query_result.scalars().all()
+
+            return result
+
+        return wrapper
+
+    return decorator
diff --git a/backend/api/decorators/full_text_search.py b/backend/api/decorators/full_text_search.py
new file mode 100644
index 00000000..b251996d
--- /dev/null
+++ b/backend/api/decorators/full_text_search.py
@@ -0,0 +1,116 @@
+from functools import wraps
+from typing import Any, Callable, TypeVar
+
+import strawberry
+from api.inputs import FullTextSearchInput
+from database import models
+from database.models.base import Base
+from sqlalchemy import Select, String, and_, inspect, or_
+from sqlalchemy.orm import aliased
+
+T = TypeVar("T")
+
+
+def detect_entity_type(model_class: type[Base]) -> str | None:
+    if model_class == models.Patient:
+        return "patient"
+    if model_class == models.Task:
+        return "task"
+    return None
+
+
+def get_text_columns_from_model(model_class: type[Base]) -> list[str]:
+    mapper = inspect(model_class)
+    text_columns = []
+    for column in mapper.columns:
+        if isinstance(column.type, String):
+            text_columns.append(column.key)
+    return text_columns
+
+
+def apply_full_text_search(
+    query: Select[Any],
+    search_input: FullTextSearchInput,
+    model_class: type[Base],
+) -> Select[Any]:
+    if not search_input.search_text or not search_input.search_text.strip():
+        return query
+
+    search_text = search_input.search_text.strip()
+    search_pattern = f"%{search_text}%"
+
+    search_conditions = []
+
+    columns_to_search = search_input.search_columns
+    if columns_to_search is None:
+        columns_to_search = get_text_columns_from_model(model_class)
+
+    for column_name in columns_to_search:
+        try:
+            column = getattr(model_class, column_name)
+            search_conditions.append(column.ilike(search_pattern))
+        except AttributeError:
+            continue
+
+    if search_input.include_properties:
+        entity_type = detect_entity_type(model_class)
+        if entity_type:
+            property_alias = aliased(models.PropertyValue)
+
+            if entity_type == "patient":
+                join_condition = property_alias.patient_id == model_class.id
+            else:
+                join_condition = property_alias.task_id == model_class.id
+
+            if search_input.property_definition_ids:
+                property_filter = and_(
+                    property_alias.text_value.ilike(search_pattern),
+                    property_alias.definition_id.in_(
+                        search_input.property_definition_ids
+                    ),
+                )
+            else:
+                property_filter = (
+                    property_alias.text_value.ilike(search_pattern)
+                )
+
+            query = query.outerjoin(property_alias, join_condition)
+            search_conditions.append(property_filter)
+
+    if not search_conditions:
+        return query
+
+    combined_condition = or_(*search_conditions)
+    query = query.where(combined_condition)
+
+    if search_input.include_properties:
+        query = query.distinct()
+
+    return query
+
+
+def full_text_search_query(search_param: str = "search"):
+    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+        @wraps(func)
+        async def wrapper(*args: Any, **kwargs: Any) -> Any:
+            search_input: FullTextSearchInput | None = kwargs.get(search_param)
+
+            result = await func(*args, **kwargs)
+
+            if not isinstance(result, Select):
+                return result
+
+            if not search_input or search_input is strawberry.UNSET:
+                return result
+
+            model_class = result.column_descriptions[0]["entity"]
+            if not model_class:
+                return result
+
+            result = apply_full_text_search(result, search_input, model_class)
+
+            return result
+
+        return wrapper
+
+    return decorator
diff --git a/backend/api/inputs.py b/backend/api/inputs.py
index d5f326a3..1962ae09 100644
--- a/backend/api/inputs.py
+++ b/backend/api/inputs.py
@@ -170,3 +170,117 @@ class UpdatePropertyDefinitionInput:
 @strawberry.input
 class UpdateProfilePictureInput:
     avatar_url: str
+
+
+@strawberry.enum
+class SortDirection(Enum):
+    ASC = "ASC"
+    DESC = "DESC"
+
+
+@strawberry.enum
+class FilterOperator(Enum):
+    TEXT_EQUALS = "TEXT_EQUALS"
+    TEXT_NOT_EQUALS = "TEXT_NOT_EQUALS"
+    TEXT_NOT_WHITESPACE = "TEXT_NOT_WHITESPACE"
+    TEXT_CONTAINS = "TEXT_CONTAINS"
+    TEXT_NOT_CONTAINS = "TEXT_NOT_CONTAINS"
+    TEXT_STARTS_WITH = "TEXT_STARTS_WITH"
+    TEXT_ENDS_WITH = "TEXT_ENDS_WITH"
+    NUMBER_EQUALS = "NUMBER_EQUALS"
+    NUMBER_NOT_EQUALS = "NUMBER_NOT_EQUALS"
+    NUMBER_GREATER_THAN = "NUMBER_GREATER_THAN"
+    NUMBER_GREATER_THAN_OR_EQUAL = "NUMBER_GREATER_THAN_OR_EQUAL"
+    NUMBER_LESS_THAN = "NUMBER_LESS_THAN"
+    NUMBER_LESS_THAN_OR_EQUAL = "NUMBER_LESS_THAN_OR_EQUAL"
+    NUMBER_BETWEEN = "NUMBER_BETWEEN"
+    NUMBER_NOT_BETWEEN = "NUMBER_NOT_BETWEEN"
+    DATE_EQUALS = "DATE_EQUALS"
+    DATE_NOT_EQUALS = "DATE_NOT_EQUALS"
+    DATE_GREATER_THAN = "DATE_GREATER_THAN"
+    DATE_GREATER_THAN_OR_EQUAL = "DATE_GREATER_THAN_OR_EQUAL"
+    DATE_LESS_THAN = "DATE_LESS_THAN"
+    DATE_LESS_THAN_OR_EQUAL = "DATE_LESS_THAN_OR_EQUAL"
+    DATE_BETWEEN = "DATE_BETWEEN"
+    DATE_NOT_BETWEEN = "DATE_NOT_BETWEEN"
+    DATETIME_EQUALS = "DATETIME_EQUALS"
+    DATETIME_NOT_EQUALS = "DATETIME_NOT_EQUALS"
+    DATETIME_GREATER_THAN = "DATETIME_GREATER_THAN"
+    DATETIME_GREATER_THAN_OR_EQUAL = "DATETIME_GREATER_THAN_OR_EQUAL"
+    DATETIME_LESS_THAN = "DATETIME_LESS_THAN"
+    DATETIME_LESS_THAN_OR_EQUAL = "DATETIME_LESS_THAN_OR_EQUAL"
+    DATETIME_BETWEEN = "DATETIME_BETWEEN"
+    DATETIME_NOT_BETWEEN = "DATETIME_NOT_BETWEEN"
+    BOOLEAN_IS_TRUE = "BOOLEAN_IS_TRUE"
+    BOOLEAN_IS_FALSE = "BOOLEAN_IS_FALSE"
+    TAGS_EQUALS = "TAGS_EQUALS"
+    TAGS_NOT_EQUALS = "TAGS_NOT_EQUALS"
+    TAGS_CONTAINS = "TAGS_CONTAINS"
+    TAGS_NOT_CONTAINS = "TAGS_NOT_CONTAINS"
+    TAGS_SINGLE_EQUALS = "TAGS_SINGLE_EQUALS"
+    TAGS_SINGLE_NOT_EQUALS = "TAGS_SINGLE_NOT_EQUALS"
+    TAGS_SINGLE_CONTAINS = "TAGS_SINGLE_CONTAINS"
+    TAGS_SINGLE_NOT_CONTAINS = "TAGS_SINGLE_NOT_CONTAINS"
+    IS_NULL = "IS_NULL"
+    IS_NOT_NULL = "IS_NOT_NULL"
+
+
+@strawberry.enum
+class ColumnType(Enum):
+    DIRECT_ATTRIBUTE = "DIRECT_ATTRIBUTE"
+    PROPERTY = "PROPERTY"
+
+
+@strawberry.input
+class FilterParameter:
+    search_text: str | None = None
+    is_case_sensitive: bool = False
+    compare_value: float | None = None
+    min: float | None = None
+    max: float | None = None
+    compare_date: date | None = None
+    min_date: date | None = None
+    max_date: date | None = None
+    compare_date_time: datetime | None = None
+    min_date_time: datetime | None = None
+    max_date_time: datetime | None = None
+    search_tags: list[str] | None = None
+    property_definition_id: str | None = None
+
+
+@strawberry.input
+class SortInput:
+    column: str
+    direction: SortDirection
+    column_type: ColumnType = ColumnType.DIRECT_ATTRIBUTE
+    property_definition_id: str | None = None
+
+
+@strawberry.input
+class FilterInput:
+    column: str
+    operator: FilterOperator
+    parameter: FilterParameter
+    column_type: ColumnType = ColumnType.DIRECT_ATTRIBUTE
+    property_definition_id: str | None = None
+
+
+@strawberry.input
+class PaginationInput:
+    page_index: int = 0
+    page_size: int | None = None
+
+
+@strawberry.input
+class QueryOptionsInput:
+    sorting: list[SortInput] | None = None
+    filtering: list[FilterInput] | None = None
+    pagination: PaginationInput | None = None
+
+
+@strawberry.input
+class FullTextSearchInput:
+    search_text: str
+    search_columns: list[str] | None = None
+    include_properties: bool = False
+    property_definition_ids: list[str] | None = None
diff --git a/backend/api/resolvers/patient.py b/backend/api/resolvers/patient.py
index c8e9d404..cb018e20 100644
--- a/backend/api/resolvers/patient.py
+++ b/backend/api/resolvers/patient.py
@@ -3,7 +3,22 @@
 import strawberry
 from api.audit import audit_log
 from api.context import Info
-from api.decorators.pagination import apply_pagination
+from api.decorators.filter_sort import (
+    apply_filtering,
+    apply_sorting,
+    filtered_and_sorted_query,
+)
+from api.decorators.full_text_search import (
+    apply_full_text_search,
+    full_text_search_query,
+)
+from api.inputs import (
+    ColumnType,
+    FilterInput,
+    FullTextSearchInput,
+    PaginationInput,
+    SortInput,
+)
 from api.inputs import CreatePatientInput, PatientState, UpdatePatientInput
 from api.resolvers.base import BaseMutationResolver, BaseSubscriptionResolver
 from api.services.authorization import AuthorizationService
@@ -14,48 +29,20 @@
 from api.types.patient import PatientType
 from database import models
 from graphql import GraphQLError
-from sqlalchemy import desc, func, select
+from sqlalchemy import func, select
 from sqlalchemy.orm import aliased, selectinload
+from sqlalchemy.sql import Select
 
 
 @strawberry.type
 class PatientQuery:
-    @strawberry.field
-    async def patient(
-        self,
-        info: Info,
-        id: strawberry.ID,
-    ) -> PatientType | None:
-        result = await info.context.db.execute(
-            select(models.Patient)
-            .where(models.Patient.id == id)
-            .where(models.Patient.deleted.is_(False))
-            .options(
-                selectinload(models.Patient.assigned_locations),
-                selectinload(models.Patient.tasks),
-                selectinload(models.Patient.teams),
-            ),
-        )
-        patient = result.scalars().first()
-        if patient:
-            auth_service = AuthorizationService(info.context.db)
-            if not await auth_service.can_access_patient(info.context.user, patient, info.context):
-                raise GraphQLError(
-                    "Insufficient permission. Please contact an administrator if you believe this is an error.",
-                    extensions={"code": "FORBIDDEN"},
-                )
-        return patient
-
-    @strawberry.field
-    async def patients(
-        self,
+    @staticmethod
+    async def _build_patients_base_query(
         info: Info,
         location_node_id: strawberry.ID | None = None,
         root_location_ids: list[strawberry.ID] | None = None,
         states: list[PatientState] | None = None,
-        limit: int | None = None,
-        offset: int | None = None,
-    ) -> list[PatientType]:
+    ) -> tuple[Select, list[strawberry.ID]]:
         query = select(models.Patient).options(
             selectinload(models.Patient.assigned_locations),
             selectinload(models.Patient.tasks),
@@ -70,12 +57,14 @@ async def patients(
                 models.Patient.state == PatientState.ADMITTED.value
             )
         auth_service = AuthorizationService(info.context.db)
-        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
-            info.context.user, info.context
+        accessible_location_ids = (
+            await auth_service.get_user_accessible_location_ids(
+                info.context.user, info.context
+            )
         )
 
         if not accessible_location_ids:
-            return []
+            return query.where(False), []
 
         query = auth_service.filter_patients_by_access(
             info.context.user, query, accessible_location_ids
@@ -85,7 +74,10 @@ async def patients(
         if location_node_id:
             if location_node_id not in accessible_location_ids:
                 raise GraphQLError(
-                    "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                    (
+                        "Insufficient permission. Please contact an administrator "
+                        "if you believe this is an error."
+                    ),
                     extensions={"code": "FORBIDDEN"},
                 )
             filter_cte = (
@@ -99,9 +91,11 @@ async def patients(
             )
             filter_cte = filter_cte.union_all(children)
         elif root_location_ids:
-            valid_root_location_ids = [lid for lid in root_location_ids if lid in accessible_location_ids]
+            valid_root_location_ids = [
+                lid for lid in root_location_ids if lid in accessible_location_ids
+            ]
             if not valid_root_location_ids:
-                return []
+                return query.where(False), []
             root_location_ids = valid_root_location_ids
             filter_cte = (
                 select(models.LocationNode.id)
@@ -130,32 +124,170 @@ async def patients(
                     (models.Patient.clinic_id.in_(select(filter_cte.c.id)))
                     | (
                         models.Patient.position_id.isnot(None)
-                        & models.Patient.position_id.in_(select(filter_cte.c.id))
+                        & models.Patient.position_id.in_(
+                            select(filter_cte.c.id)
+                        )
                     )
                     | (
                         models.Patient.assigned_location_id.isnot(None)
-                        & models.Patient.assigned_location_id.in_(select(filter_cte.c.id))
+                        & models.Patient.assigned_location_id.in_(
+                            select(filter_cte.c.id)
+                        )
+                    )
+                    | (
+                        patient_locations_filter.c.location_id.in_(
+                            select(filter_cte.c.id)
+                        )
+                    )
+                    | (
+                        patient_teams_filter.c.location_id.in_(
+                            select(filter_cte.c.id)
+                        )
                     )
-                    | (patient_locations_filter.c.location_id.in_(select(filter_cte.c.id)))
-                    | (patient_teams_filter.c.location_id.in_(select(filter_cte.c.id)))
                 )
                 .distinct()
             )
 
-        query = apply_pagination(query, limit=limit, offset=offset)
+        return query, accessible_location_ids
+
+    @strawberry.field
+    async def patient(
+        self,
+        info: Info,
+        id: strawberry.ID,
+    ) -> PatientType | None:
+        result = await info.context.db.execute(
+            select(models.Patient)
+            .where(models.Patient.id == id)
+            .where(models.Patient.deleted.is_(False))
+            .options(
+                selectinload(models.Patient.assigned_locations),
+                selectinload(models.Patient.tasks),
+                selectinload(models.Patient.teams),
+            ),
+        )
+        patient = result.scalars().first()
+        if patient:
+            auth_service = AuthorizationService(info.context.db)
+            if not await auth_service.can_access_patient(
+                info.context.user, patient, info.context
+            ):
+                raise GraphQLError(
+                    (
+                        "Insufficient permission. Please contact an administrator "
+                        "if you believe this is an error."
+                    ),
+                    extensions={"code": "FORBIDDEN"},
+                )
+        return patient
+
+    @strawberry.field
+    @filtered_and_sorted_query()
+    @full_text_search_query()
+    async def patients(
+        self,
+        info: Info,
+        location_node_id: strawberry.ID | None = None,
+        root_location_ids: list[strawberry.ID] | None = None,
+        states: list[PatientState] | None = None,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        pagination: PaginationInput | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> list[PatientType]:
+        query, _ = await PatientQuery._build_patients_base_query(
+            info, location_node_id, root_location_ids, states
+        )
+        return query
+
+    @strawberry.field
+    async def patientsTotal(
+        self,
+        info: Info,
+        location_node_id: strawberry.ID | None = None,
+        root_location_ids: list[strawberry.ID] | None = None,
+        states: list[PatientState] | None = None,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> int:
+        query, _ = await PatientQuery._build_patients_base_query(
+            info, location_node_id, root_location_ids, states
+        )
+
+        if search and search is not strawberry.UNSET:
+            query = apply_full_text_search(query, search, models.Patient)
+
+        if filtering:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for f in filtering:
+                if (
+                    f.column_type == ColumnType.PROPERTY
+                    and f.property_definition_id
+                ):
+                    property_def_ids.add(f.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type
+                    for prop_def in prop_defs
+                }
+
+            query = apply_filtering(
+                query, filtering, models.Patient, property_field_types
+            )
+
+        if sorting:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for s in sorting:
+                if (
+                    s.column_type == ColumnType.PROPERTY
+                    and s.property_definition_id
+                ):
+                    property_def_ids.add(s.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
 
-        result = await info.context.db.execute(query)
-        return result.scalars().all()
+            query = apply_sorting(query, sorting, models.Patient, property_field_types)
+
+        subquery = query.subquery()
+        count_query = select(func.count(func.distinct(subquery.c.id)))
+        result = await info.context.db.execute(count_query)
+        return result.scalar() or 0
 
     @strawberry.field
+    @filtered_and_sorted_query()
+    @full_text_search_query()
     async def recent_patients(
         self,
         info: Info,
-        limit: int = 5,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        pagination: PaginationInput | None = None,
+        search: FullTextSearchInput | None = None,
     ) -> list[PatientType]:
         auth_service = AuthorizationService(info.context.db)
-        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
-            info.context.user, info.context
+        accessible_location_ids = (
+            await auth_service.get_user_accessible_location_ids(
+                info.context.user, info.context
+            )
         )
 
         if not accessible_location_ids:
@@ -171,7 +303,7 @@ async def recent_patients(
         )
 
         query = (
-            select(models.Patient, max_task_update_date.c.max_update_date)
+            select(models.Patient)
             .options(
                 selectinload(models.Patient.assigned_locations),
                 selectinload(models.Patient.tasks),
@@ -182,14 +314,108 @@ async def recent_patients(
                 models.Patient.id == max_task_update_date.c.patient_id,
             )
             .where(models.Patient.deleted.is_(False))
-            .order_by(desc(max_task_update_date.c.max_update_date), desc(models.Patient.id))
-            .limit(limit)
         )
         query = auth_service.filter_patients_by_access(
             info.context.user, query, accessible_location_ids
         )
-        result = await info.context.db.execute(query)
-        return [row[0] for row in result.all()]
+
+        return query
+
+    @strawberry.field
+    async def recentPatientsTotal(
+        self,
+        info: Info,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> int:
+        auth_service = AuthorizationService(info.context.db)
+        accessible_location_ids = (
+            await auth_service.get_user_accessible_location_ids(
+                info.context.user, info.context
+            )
+        )
+
+        if not accessible_location_ids:
+            return 0
+
+        max_task_update_date = (
+            select(
+                func.max(models.Task.update_date).label("max_update_date"),
+                models.Task.patient_id.label("patient_id"),
+            )
+            .group_by(models.Task.patient_id)
+            .subquery()
+        )
+
+        query = (
+            select(models.Patient)
+            .outerjoin(
+                max_task_update_date,
+                models.Patient.id == max_task_update_date.c.patient_id,
+            )
+            .where(models.Patient.deleted.is_(False))
+        )
+        query = auth_service.filter_patients_by_access(
+            info.context.user, query, accessible_location_ids
+        )
+
+        if search and search is not strawberry.UNSET:
+            query = apply_full_text_search(query, search, models.Patient)
+
+        if filtering:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for f in filtering:
+                if (
+                    f.column_type == ColumnType.PROPERTY
+                    and f.property_definition_id
+                ):
+                    property_def_ids.add(f.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type
+                    for prop_def in prop_defs
+                }
+
+            query = apply_filtering(
+                query, filtering, models.Patient, property_field_types
+            )
+
+        if sorting:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for s in sorting:
+                if (
+                    s.column_type == ColumnType.PROPERTY
+                    and s.property_definition_id
+                ):
+                    property_def_ids.add(s.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
+
+            query = apply_sorting(query, sorting, models.Patient, property_field_types)
+
+        subquery = query.subquery()
+        count_query = select(func.count(func.distinct(subquery.c.id)))
+        result = await info.context.db.execute(count_query)
+        return result.scalar() or 0
 
 
 @strawberry.type
@@ -216,19 +442,27 @@ async def create_patient(
         )
 
         auth_service = AuthorizationService(db)
-        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
-            info.context.user, info.context
+        accessible_location_ids = (
+            await auth_service.get_user_accessible_location_ids(
+                info.context.user, info.context
+            )
         )
 
         if not accessible_location_ids:
             raise GraphQLError(
-                "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                (
+                    "Insufficient permission. Please contact an "
+                    "administrator if you believe this is an error."
+                ),
                 extensions={"code": "FORBIDDEN"},
             )
 
         if data.clinic_id not in accessible_location_ids:
             raise GraphQLError(
-                "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                (
+                    "Insufficient permission. Please contact an administrator "
+                    "if you believe this is an error."
+                ),
                 extensions={"code": "FORBIDDEN"},
             )
 
@@ -247,7 +481,10 @@ async def create_patient(
             for team_id in data.team_ids:
                 if team_id not in accessible_location_ids:
                     raise GraphQLError(
-                        "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                        (
+                            "Insufficient permission. Please contact an "
+                            "administrator if you believe this is an error."
+                        ),
                         extensions={"code": "FORBIDDEN"},
                     )
             teams = await location_service.validate_and_get_teams(
@@ -281,9 +518,15 @@ async def create_patient(
             )
             new_patient.assigned_locations = locations
         elif data.assigned_location_id:
-            if data.assigned_location_id not in accessible_location_ids:
+            if (
+                data.assigned_location_id
+                not in accessible_location_ids
+            ):
                 raise GraphQLError(
-                    "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                    (
+                        "Insufficient permission. Please contact an "
+                        "administrator if you believe this is an error."
+                    ),
                     extensions={"code": "FORBIDDEN"},
                 )
             location = await location_service.get_location_by_id(
@@ -327,7 +570,9 @@ async def update_patient(
             raise Exception("Patient not found")
 
         auth_service = AuthorizationService(db)
-        if not await auth_service.can_access_patient(info.context.user, patient, info.context):
+        if not await auth_service.can_access_patient(
+            info.context.user, patient, info.context
+        ):
             raise GraphQLError(
                 "Forbidden: You do not have access to this patient",
                 extensions={"code": "FORBIDDEN"},
@@ -348,8 +593,10 @@ async def update_patient(
             patient.description = data.description
 
         location_service = PatientMutation._get_location_service(db)
-        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
-            info.context.user
+        accessible_location_ids = (
+            await auth_service.get_user_accessible_location_ids(
+                info.context.user
+            )
         )
 
         if data.clinic_id is not None:
@@ -367,7 +614,10 @@ async def update_patient(
             else:
                 if data.position_id not in accessible_location_ids:
                     raise GraphQLError(
-                        "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                        (
+                            "Insufficient permission. Please contact an "
+                            "administrator if you believe this is an error."
+                        ),
                         extensions={"code": "FORBIDDEN"},
                     )
                 await location_service.validate_and_get_position(
@@ -401,9 +651,15 @@ async def update_patient(
             )
             patient.assigned_locations = locations
         elif data.assigned_location_id is not None:
-            if data.assigned_location_id not in accessible_location_ids:
+            if (
+                data.assigned_location_id
+                not in accessible_location_ids
+            ):
                 raise GraphQLError(
-                    "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                    (
+                        "Insufficient permission. Please contact an "
+                        "administrator if you believe this is an error."
+                    ),
                     extensions={"code": "FORBIDDEN"},
                 )
             location = await location_service.get_location_by_id(
@@ -441,7 +697,9 @@ async def delete_patient(self, info: Info, id: strawberry.ID) -> bool:
             return False
 
         auth_service = AuthorizationService(db)
-        if not await auth_service.can_access_patient(info.context.user, patient, info.context):
+        if not await auth_service.can_access_patient(
+            info.context.user, patient, info.context
+        ):
             raise GraphQLError(
                 "Forbidden: You do not have access to this patient",
                 extensions={"code": "FORBIDDEN"},
@@ -475,7 +733,9 @@ async def _update_patient_state(
             raise Exception("Patient not found")
 
         auth_service = AuthorizationService(db)
-        if not await auth_service.can_access_patient(info.context.user, patient, info.context):
+        if not await auth_service.can_access_patient(
+            info.context.user, patient, info.context
+        ):
             raise GraphQLError(
                 "Forbidden: You do not have access to this patient",
                 extensions={"code": "FORBIDDEN"},
diff --git a/backend/api/resolvers/task.py b/backend/api/resolvers/task.py
index 03189a48..b2bb58f1 100644
--- a/backend/api/resolvers/task.py
+++ b/backend/api/resolvers/task.py
@@ -3,7 +3,22 @@
 import strawberry
 from api.audit import audit_log
 from api.context import Info
-from api.decorators.pagination import apply_pagination
+from api.decorators.filter_sort import (
+    apply_filtering,
+    apply_sorting,
+    filtered_and_sorted_query,
+)
+from api.decorators.full_text_search import (
+    apply_full_text_search,
+    full_text_search_query,
+)
+from api.inputs import (
+    ColumnType,
+    FilterInput,
+    FullTextSearchInput,
+    PaginationInput,
+    SortInput,
+)
 from api.inputs import CreateTaskInput, UpdateTaskInput
 from api.resolvers.base import BaseMutationResolver, BaseSubscriptionResolver
 from api.services.authorization import AuthorizationService
@@ -13,7 +28,7 @@
 from api.types.task import TaskType
 from database import models
 from graphql import GraphQLError
-from sqlalchemy import desc, select
+from sqlalchemy import desc, func, select
 from sqlalchemy.orm import aliased, selectinload
 
 
@@ -37,6 +52,8 @@ async def task(self, info: Info, id: strawberry.ID) -> TaskType | None:
         return task
 
     @strawberry.field
+    @filtered_and_sorted_query()
+    @full_text_search_query()
     async def tasks(
         self,
         info: Info,
@@ -44,8 +61,10 @@ async def tasks(
         assignee_id: strawberry.ID | None = None,
         assignee_team_id: strawberry.ID | None = None,
         root_location_ids: list[strawberry.ID] | None = None,
-        limit: int | None = None,
-        offset: int | None = None,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        pagination: PaginationInput | None = None,
+        search: FullTextSearchInput | None = None,
     ) -> list[TaskType]:
         auth_service = AuthorizationService(info.context.db)
 
@@ -65,10 +84,7 @@ async def tasks(
             if assignee_team_id:
                 query = query.where(models.Task.assignee_team_id == assignee_team_id)
 
-            query = apply_pagination(query, limit=limit, offset=offset)
-
-            result = await info.context.db.execute(query)
-            return result.scalars().all()
+            return query
 
         accessible_location_ids = await auth_service.get_user_accessible_location_ids(
             info.context.user, info.context
@@ -164,16 +180,185 @@ async def tasks(
                 models.Task.assignee_team_id.in_(select(team_location_cte.c.id))
             )
 
-        query = apply_pagination(query, limit=limit, offset=offset)
+        return query
+
+    @strawberry.field
+    async def tasksTotal(
+        self,
+        info: Info,
+        patient_id: strawberry.ID | None = None,
+        assignee_id: strawberry.ID | None = None,
+        assignee_team_id: strawberry.ID | None = None,
+        root_location_ids: list[strawberry.ID] | None = None,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> int:
+        auth_service = AuthorizationService(info.context.db)
 
-        result = await info.context.db.execute(query)
-        return result.scalars().all()
+        if patient_id:
+            if not await auth_service.can_access_patient_id(info.context.user, patient_id, info.context):
+                raise GraphQLError(
+                    "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                    extensions={"code": "FORBIDDEN"},
+                )
+
+            query = select(models.Task).where(models.Task.patient_id == patient_id)
+
+            if assignee_id:
+                query = query.where(models.Task.assignee_id == assignee_id)
+            if assignee_team_id:
+                query = query.where(models.Task.assignee_team_id == assignee_team_id)
+        else:
+            accessible_location_ids = await auth_service.get_user_accessible_location_ids(
+                info.context.user, info.context
+            )
+
+            if not accessible_location_ids:
+                return 0
+
+            patient_locations = aliased(models.patient_locations)
+            patient_teams = aliased(models.patient_teams)
+
+            cte = (
+                select(models.LocationNode.id)
+                .where(models.LocationNode.id.in_(accessible_location_ids))
+                .cte(name="accessible_locations", recursive=True)
+            )
+
+            children = select(models.LocationNode.id).join(
+                cte, models.LocationNode.parent_id == cte.c.id
+            )
+            cte = cte.union_all(children)
+
+            if root_location_ids:
+                invalid_ids = [lid for lid in root_location_ids if lid not in accessible_location_ids]
+                if invalid_ids:
+                    raise GraphQLError(
+                        "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                        extensions={"code": "FORBIDDEN"},
+                    )
+                root_cte = (
+                    select(models.LocationNode.id)
+                    .where(models.LocationNode.id.in_(root_location_ids))
+                    .cte(name="root_location_descendants", recursive=True)
+                )
+                root_children = select(models.LocationNode.id).join(
+                    root_cte, models.LocationNode.parent_id == root_cte.c.id
+                )
+                root_cte = root_cte.union_all(root_children)
+            else:
+                root_cte = cte
+
+            team_location_cte = None
+            if assignee_team_id:
+                if assignee_team_id not in accessible_location_ids:
+                    raise GraphQLError(
+                        "Insufficient permission. Please contact an administrator if you believe this is an error.",
+                        extensions={"code": "FORBIDDEN"},
+                    )
+                team_location_cte = (
+                    select(models.LocationNode.id)
+                    .where(models.LocationNode.id == assignee_team_id)
+                    .cte(name="team_location_descendants", recursive=True)
+                )
+                team_children = select(models.LocationNode.id).join(
+                    team_location_cte, models.LocationNode.parent_id == team_location_cte.c.id
+                )
+                team_location_cte = team_location_cte.union_all(team_children)
+
+            query = (
+                select(models.Task)
+                .join(models.Patient, models.Task.patient_id == models.Patient.id)
+                .outerjoin(
+                    patient_locations,
+                    models.Patient.id == patient_locations.c.patient_id,
+                )
+                .outerjoin(
+                    patient_teams,
+                    models.Patient.id == patient_teams.c.patient_id,
+                )
+                .where(
+                    (models.Patient.clinic_id.in_(select(root_cte.c.id)))
+                    | (
+                        models.Patient.position_id.isnot(None)
+                        & models.Patient.position_id.in_(select(root_cte.c.id))
+                    )
+                    | (
+                        models.Patient.assigned_location_id.isnot(None)
+                        & models.Patient.assigned_location_id.in_(select(root_cte.c.id))
+                    )
+                    | (patient_locations.c.location_id.in_(select(root_cte.c.id)))
+                    | (patient_teams.c.location_id.in_(select(root_cte.c.id)))
+                )
+                .distinct()
+            )
+
+            if assignee_id:
+                query = query.where(models.Task.assignee_id == assignee_id)
+            if assignee_team_id:
+                query = query.where(
+                    models.Task.assignee_team_id.in_(select(team_location_cte.c.id))
+                )
+
+        if search and search is not strawberry.UNSET:
+            query = apply_full_text_search(query, search, models.Task)
+
+        if filtering:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for f in filtering:
+                if f.column_type == ColumnType.PROPERTY and f.property_definition_id:
+                    property_def_ids.add(f.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
+
+            query = apply_filtering(query, filtering, models.Task, property_field_types)
+
+        if sorting:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for s in sorting:
+                if s.column_type == ColumnType.PROPERTY and s.property_definition_id:
+                    property_def_ids.add(s.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
+
+            query = apply_sorting(query, sorting, models.Task, property_field_types)
+
+        subquery = query.subquery()
+        count_query = select(func.count(func.distinct(subquery.c.id)))
+        result = await info.context.db.execute(count_query)
+        return result.scalar() or 0
 
     @strawberry.field
+    @filtered_and_sorted_query()
+    @full_text_search_query()
     async def recent_tasks(
         self,
         info: Info,
-        limit: int = 10,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        pagination: PaginationInput | None = None,
+        search: FullTextSearchInput | None = None,
     ) -> list[TaskType]:
         auth_service = AuthorizationService(info.context.db)
         accessible_location_ids = await auth_service.get_user_accessible_location_ids(
@@ -224,13 +409,119 @@ async def recent_tasks(
                 | (patient_locations.c.location_id.in_(select(cte.c.id)))
                 | (patient_teams.c.location_id.in_(select(cte.c.id)))
             )
-            .order_by(desc(models.Task.update_date))
-            .limit(limit)
             .distinct()
         )
 
-        result = await info.context.db.execute(query)
-        return result.scalars().all()
+        default_sorting = sorting is None or len(sorting) == 0
+        if default_sorting:
+            query = query.order_by(desc(models.Task.update_date))
+
+        return query
+
+    @strawberry.field
+    async def recentTasksTotal(
+        self,
+        info: Info,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> int:
+        auth_service = AuthorizationService(info.context.db)
+        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
+            info.context.user, info.context
+        )
+
+        if not accessible_location_ids:
+            return 0
+
+        patient_locations = aliased(models.patient_locations)
+        patient_teams = aliased(models.patient_teams)
+
+        cte = (
+            select(models.LocationNode.id)
+            .where(models.LocationNode.id.in_(accessible_location_ids))
+            .cte(name="accessible_locations", recursive=True)
+        )
+
+        children = select(models.LocationNode.id).join(
+            cte, models.LocationNode.parent_id == cte.c.id
+        )
+        cte = cte.union_all(children)
+
+        query = (
+            select(models.Task)
+            .join(models.Patient, models.Task.patient_id == models.Patient.id)
+            .outerjoin(
+                patient_locations,
+                models.Patient.id == patient_locations.c.patient_id,
+            )
+            .outerjoin(
+                patient_teams,
+                models.Patient.id == patient_teams.c.patient_id,
+            )
+            .where(
+                (models.Patient.clinic_id.in_(select(cte.c.id)))
+                | (
+                    models.Patient.position_id.isnot(None)
+                    & models.Patient.position_id.in_(select(cte.c.id))
+                )
+                | (
+                    models.Patient.assigned_location_id.isnot(None)
+                    & models.Patient.assigned_location_id.in_(select(cte.c.id))
+                )
+                | (patient_locations.c.location_id.in_(select(cte.c.id)))
+                | (patient_teams.c.location_id.in_(select(cte.c.id)))
+            )
+            .distinct()
+        )
+
+        if search and search is not strawberry.UNSET:
+            query = apply_full_text_search(query, search, models.Task)
+
+        if filtering:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for f in filtering:
+                if f.column_type == ColumnType.PROPERTY and f.property_definition_id:
+                    property_def_ids.add(f.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
+
+            query = apply_filtering(query, filtering, models.Task, property_field_types)
+
+        if sorting:
+            property_field_types: dict[str, str] = {}
+            property_def_ids = set()
+            for s in sorting:
+                if s.column_type == ColumnType.PROPERTY and s.property_definition_id:
+                    property_def_ids.add(s.property_definition_id)
+
+            if property_def_ids:
+                prop_defs_result = await info.context.db.execute(
+                    select(models.PropertyDefinition).where(
+                        models.PropertyDefinition.id.in_(property_def_ids)
+                    )
+                )
+                prop_defs = prop_defs_result.scalars().all()
+                property_field_types = {
+                    str(prop_def.id): prop_def.field_type for prop_def in prop_defs
+                }
+
+            query = apply_sorting(query, sorting, models.Task, property_field_types)
+
+        subquery = query.subquery()
+        count_query = select(func.count(func.distinct(subquery.c.id)))
+        result = await info.context.db.execute(count_query)
+        return result.scalar() or 0
 
 
 @strawberry.type
@@ -339,7 +630,11 @@ async def update_task(
         if data.estimated_time is not strawberry.UNSET:
             task.estimated_time = data.estimated_time
 
-        if data.assignee_id is not None and data.assignee_team_id is not strawberry.UNSET and data.assignee_team_id is not None:
+        if (
+            data.assignee_id is not None
+            and data.assignee_team_id is not strawberry.UNSET
+            and data.assignee_team_id is not None
+        ):
             raise GraphQLError(
                 "Cannot assign both a user and a team. Please assign either a user or a team.",
                 extensions={"code": "BAD_REQUEST"},
diff --git a/backend/api/resolvers/user.py b/backend/api/resolvers/user.py
index e9879676..e4d97525 100644
--- a/backend/api/resolvers/user.py
+++ b/backend/api/resolvers/user.py
@@ -1,6 +1,14 @@
 import strawberry
 from api.context import Info
-from api.inputs import UpdateProfilePictureInput
+from api.decorators.filter_sort import filtered_and_sorted_query
+from api.decorators.full_text_search import full_text_search_query
+from api.inputs import (
+    FilterInput,
+    FullTextSearchInput,
+    PaginationInput,
+    SortInput,
+    UpdateProfilePictureInput,
+)
 from api.resolvers.base import BaseMutationResolver
 from api.types.user import UserType
 from database import models
@@ -18,9 +26,18 @@ async def user(self, info: Info, id: strawberry.ID) -> UserType | None:
         return result.scalars().first()
 
     @strawberry.field
-    async def users(self, info: Info) -> list[UserType]:
-        result = await info.context.db.execute(select(models.User))
-        return result.scalars().all()
+    @filtered_and_sorted_query()
+    @full_text_search_query()
+    async def users(
+        self,
+        info: Info,
+        filtering: list[FilterInput] | None = None,
+        sorting: list[SortInput] | None = None,
+        pagination: PaginationInput | None = None,
+        search: FullTextSearchInput | None = None,
+    ) -> list[UserType]:
+        query = select(models.User)
+        return query
 
     @strawberry.field
     def me(self, info: Info) -> UserType | None:
diff --git a/backend/api/types/pagination.py b/backend/api/types/pagination.py
new file mode 100644
index 00000000..5acc30c4
--- /dev/null
+++ b/backend/api/types/pagination.py
@@ -0,0 +1,19 @@
+from typing import TYPE_CHECKING, Annotated
+
+import strawberry
+
+if TYPE_CHECKING:
+    from api.types.patient import PatientType
+    from api.types.task import TaskType
+
+
+@strawberry.type
+class PaginatedPatientResult:
+    items: list[Annotated["PatientType", strawberry.lazy("api.types.patient")]]
+    total_count: int
+
+
+@strawberry.type
+class PaginatedTaskResult:
+    items: list[Annotated["TaskType", strawberry.lazy("api.types.task")]]
+    total_count: int
diff --git a/backend/main.py b/backend/main.py
index d8890d92..6b755093 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -7,10 +7,12 @@
 from api.router import AuthedGraphQLRouter
 from auth import UnauthenticatedRedirect, unauthenticated_redirect_handler
 from config import ALLOWED_ORIGINS, IS_DEV, LOGGER
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 from routers import auth
 from scaffold import load_scaffold_data
+from starlette.requests import ClientDisconnect
 from strawberry import Schema
 
 logger = logging.getLogger(LOGGER)
@@ -50,6 +52,14 @@ async def lifespan(app: FastAPI):
     unauthenticated_redirect_handler,
 )
 
+
+@app.exception_handler(ClientDisconnect)
+async def client_disconnect_handler(request: Request, exc: ClientDisconnect):
+    logger.debug(f"Client disconnected: {request.url}")
+    return JSONResponse(
+        status_code=499, content={"detail": "Client disconnected"}
+    )
+
 app.include_router(auth.router)
 app.include_router(graphql_app, prefix="/graphql")
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..b08734ba
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "tasks",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/web/api/gql/generated.ts b/web/api/gql/generated.ts
index ce8c5933..5ae37a3e 100644
--- a/web/api/gql/generated.ts
+++ b/web/api/gql/generated.ts
@@ -27,6 +27,11 @@ export type AuditLogType = {
   userId?: Maybe<Scalars['String']['output']>;
 };
 
+export enum ColumnType {
+  DirectAttribute = 'DIRECT_ATTRIBUTE',
+  Property = 'PROPERTY'
+}
+
 export type CreateLocationNodeInput = {
   kind: LocationType;
   parentId?: InputMaybe<Scalars['ID']['input']>;
@@ -81,6 +86,83 @@ export enum FieldType {
   FieldTypeUnspecified = 'FIELD_TYPE_UNSPECIFIED'
 }
 
+export type FilterInput = {
+  column: Scalars['String']['input'];
+  columnType?: ColumnType;
+  operator: FilterOperator;
+  parameter: FilterParameter;
+  propertyDefinitionId?: InputMaybe<Scalars['String']['input']>;
+};
+
+export enum FilterOperator {
+  BooleanIsFalse = 'BOOLEAN_IS_FALSE',
+  BooleanIsTrue = 'BOOLEAN_IS_TRUE',
+  DatetimeBetween = 'DATETIME_BETWEEN',
+  DatetimeEquals = 'DATETIME_EQUALS',
+  DatetimeGreaterThan = 'DATETIME_GREATER_THAN',
+  DatetimeGreaterThanOrEqual = 'DATETIME_GREATER_THAN_OR_EQUAL',
+  DatetimeLessThan = 'DATETIME_LESS_THAN',
+  DatetimeLessThanOrEqual = 'DATETIME_LESS_THAN_OR_EQUAL',
+  DatetimeNotBetween = 'DATETIME_NOT_BETWEEN',
+  DatetimeNotEquals = 'DATETIME_NOT_EQUALS',
+  DateBetween = 'DATE_BETWEEN',
+  DateEquals = 'DATE_EQUALS',
+  DateGreaterThan = 'DATE_GREATER_THAN',
+  DateGreaterThanOrEqual = 'DATE_GREATER_THAN_OR_EQUAL',
+  DateLessThan = 'DATE_LESS_THAN',
+  DateLessThanOrEqual = 'DATE_LESS_THAN_OR_EQUAL',
+  DateNotBetween = 'DATE_NOT_BETWEEN',
+  DateNotEquals = 'DATE_NOT_EQUALS',
+  IsNotNull = 'IS_NOT_NULL',
+  IsNull = 'IS_NULL',
+  NumberBetween = 'NUMBER_BETWEEN',
+  NumberEquals = 'NUMBER_EQUALS',
+  NumberGreaterThan = 'NUMBER_GREATER_THAN',
+  NumberGreaterThanOrEqual = 'NUMBER_GREATER_THAN_OR_EQUAL',
+  NumberLessThan = 'NUMBER_LESS_THAN',
+  NumberLessThanOrEqual = 'NUMBER_LESS_THAN_OR_EQUAL',
+  NumberNotBetween = 'NUMBER_NOT_BETWEEN',
+  NumberNotEquals = 'NUMBER_NOT_EQUALS',
+  TagsContains = 'TAGS_CONTAINS',
+  TagsEquals = 'TAGS_EQUALS',
+  TagsNotContains = 'TAGS_NOT_CONTAINS',
+  TagsNotEquals = 'TAGS_NOT_EQUALS',
+  TagsSingleContains = 'TAGS_SINGLE_CONTAINS',
+  TagsSingleEquals = 'TAGS_SINGLE_EQUALS',
+  TagsSingleNotContains = 'TAGS_SINGLE_NOT_CONTAINS',
+  TagsSingleNotEquals = 'TAGS_SINGLE_NOT_EQUALS',
+  TextContains = 'TEXT_CONTAINS',
+  TextEndsWith = 'TEXT_ENDS_WITH',
+  TextEquals = 'TEXT_EQUALS',
+  TextNotContains = 'TEXT_NOT_CONTAINS',
+  TextNotEquals = 'TEXT_NOT_EQUALS',
+  TextNotWhitespace = 'TEXT_NOT_WHITESPACE',
+  TextStartsWith = 'TEXT_STARTS_WITH'
+}
+
+export type FilterParameter = {
+  compareDate?: InputMaybe<Scalars['Date']['input']>;
+  compareDateTime?: InputMaybe<Scalars['DateTime']['input']>;
+  compareValue?: InputMaybe<Scalars['Float']['input']>;
+  isCaseSensitive?: Scalars['Boolean']['input'];
+  max?: InputMaybe<Scalars['Float']['input']>;
+  maxDate?: InputMaybe<Scalars['Date']['input']>;
+  maxDateTime?: InputMaybe<Scalars['DateTime']['input']>;
+  min?: InputMaybe<Scalars['Float']['input']>;
+  minDate?: InputMaybe<Scalars['Date']['input']>;
+  minDateTime?: InputMaybe<Scalars['DateTime']['input']>;
+  propertyDefinitionId?: InputMaybe<Scalars['String']['input']>;
+  searchTags?: InputMaybe<Array<Scalars['String']['input']>>;
+  searchText?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type FullTextSearchInput = {
+  includeProperties?: Scalars['Boolean']['input'];
+  propertyDefinitionIds?: InputMaybe<Array<Scalars['String']['input']>>;
+  searchColumns?: InputMaybe<Array<Scalars['String']['input']>>;
+  searchText: Scalars['String']['input'];
+};
+
 export type LocationNodeType = {
   __typename?: 'LocationNodeType';
   children: Array<LocationNodeType>;
@@ -252,6 +334,11 @@ export type MutationWaitPatientArgs = {
   id: Scalars['ID']['input'];
 };
 
+export type PaginationInput = {
+  pageIndex?: Scalars['Int']['input'];
+  pageSize?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export enum PatientState {
   Admitted = 'ADMITTED',
   Dead = 'DEAD',
@@ -336,11 +423,15 @@ export type Query = {
   me?: Maybe<UserType>;
   patient?: Maybe<PatientType>;
   patients: Array<PatientType>;
+  patientsTotal: Scalars['Int']['output'];
   propertyDefinitions: Array<PropertyDefinitionType>;
   recentPatients: Array<PatientType>;
+  recentPatientsTotal: Scalars['Int']['output'];
   recentTasks: Array<TaskType>;
+  recentTasksTotal: Scalars['Int']['output'];
   task?: Maybe<TaskType>;
   tasks: Array<TaskType>;
+  tasksTotal: Scalars['Int']['output'];
   user?: Maybe<UserType>;
   users: Array<UserType>;
 };
@@ -375,21 +466,53 @@ export type QueryPatientArgs = {
 
 
 export type QueryPatientsArgs = {
-  limit?: InputMaybe<Scalars['Int']['input']>;
+  filtering?: InputMaybe<Array<FilterInput>>;
+  locationNodeId?: InputMaybe<Scalars['ID']['input']>;
+  pagination?: InputMaybe<PaginationInput>;
+  rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
+  states?: InputMaybe<Array<PatientState>>;
+};
+
+
+export type QueryPatientsTotalArgs = {
+  filtering?: InputMaybe<Array<FilterInput>>;
   locationNodeId?: InputMaybe<Scalars['ID']['input']>;
-  offset?: InputMaybe<Scalars['Int']['input']>;
   rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
   states?: InputMaybe<Array<PatientState>>;
 };
 
 
 export type QueryRecentPatientsArgs = {
-  limit?: Scalars['Int']['input'];
+  filtering?: InputMaybe<Array<FilterInput>>;
+  pagination?: InputMaybe<PaginationInput>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
+};
+
+
+export type QueryRecentPatientsTotalArgs = {
+  filtering?: InputMaybe<Array<FilterInput>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
 };
 
 
 export type QueryRecentTasksArgs = {
-  limit?: Scalars['Int']['input'];
+  filtering?: InputMaybe<Array<FilterInput>>;
+  pagination?: InputMaybe<PaginationInput>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
+};
+
+
+export type QueryRecentTasksTotalArgs = {
+  filtering?: InputMaybe<Array<FilterInput>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
 };
 
 
@@ -401,10 +524,23 @@ export type QueryTaskArgs = {
 export type QueryTasksArgs = {
   assigneeId?: InputMaybe<Scalars['ID']['input']>;
   assigneeTeamId?: InputMaybe<Scalars['ID']['input']>;
-  limit?: InputMaybe<Scalars['Int']['input']>;
-  offset?: InputMaybe<Scalars['Int']['input']>;
+  filtering?: InputMaybe<Array<FilterInput>>;
+  pagination?: InputMaybe<PaginationInput>;
   patientId?: InputMaybe<Scalars['ID']['input']>;
   rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
+};
+
+
+export type QueryTasksTotalArgs = {
+  assigneeId?: InputMaybe<Scalars['ID']['input']>;
+  assigneeTeamId?: InputMaybe<Scalars['ID']['input']>;
+  filtering?: InputMaybe<Array<FilterInput>>;
+  patientId?: InputMaybe<Scalars['ID']['input']>;
+  rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']>>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
 };
 
 
@@ -412,12 +548,32 @@ export type QueryUserArgs = {
   id: Scalars['ID']['input'];
 };
 
+
+export type QueryUsersArgs = {
+  filtering?: InputMaybe<Array<FilterInput>>;
+  pagination?: InputMaybe<PaginationInput>;
+  search?: InputMaybe<FullTextSearchInput>;
+  sorting?: InputMaybe<Array<SortInput>>;
+};
+
 export enum Sex {
   Female = 'FEMALE',
   Male = 'MALE',
   Unknown = 'UNKNOWN'
 }
 
+export enum SortDirection {
+  Asc = 'ASC',
+  Desc = 'DESC'
+}
+
+export type SortInput = {
+  column: Scalars['String']['input'];
+  columnType?: ColumnType;
+  direction: SortDirection;
+  propertyDefinitionId?: InputMaybe<Scalars['String']['input']>;
+};
+
 export type Subscription = {
   __typename?: 'Subscription';
   locationNodeCreated: Scalars['ID']['output'];
@@ -601,10 +757,19 @@ export type GetMyTasksQueryVariables = Exact<{ [key: string]: never; }>;
 
 export type GetMyTasksQuery = { __typename?: 'Query', me?: { __typename?: 'UserType', id: string, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null }> } | null };
 
-export type GetOverviewDataQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetOverviewDataQueryVariables = Exact<{
+  recentPatientsFiltering?: InputMaybe<Array<FilterInput> | FilterInput>;
+  recentPatientsSorting?: InputMaybe<Array<SortInput> | SortInput>;
+  recentPatientsPagination?: InputMaybe<PaginationInput>;
+  recentPatientsSearch?: InputMaybe<FullTextSearchInput>;
+  recentTasksFiltering?: InputMaybe<Array<FilterInput> | FilterInput>;
+  recentTasksSorting?: InputMaybe<Array<SortInput> | SortInput>;
+  recentTasksPagination?: InputMaybe<PaginationInput>;
+  recentTasksSearch?: InputMaybe<FullTextSearchInput>;
+}>;
 
 
-export type GetOverviewDataQuery = { __typename?: 'Query', recentPatients: Array<{ __typename?: 'PatientType', id: string, name: string, sex: Sex, birthdate: any, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, tasks: Array<{ __typename?: 'TaskType', updateDate?: any | null }> }>, recentTasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, patient: { __typename?: 'PatientType', id: string, name: string, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } }> };
+export type GetOverviewDataQuery = { __typename?: 'Query', recentPatientsTotal: number, recentTasksTotal: number, recentPatients: Array<{ __typename?: 'PatientType', id: string, name: string, sex: Sex, birthdate: any, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, tasks: Array<{ __typename?: 'TaskType', updateDate?: any | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> }>, recentTasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, updateDate?: any | null, priority?: string | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, patient: { __typename?: 'PatientType', id: string, name: string, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> }> };
 
 export type GetPatientQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -617,12 +782,14 @@ export type GetPatientsQueryVariables = Exact<{
   locationId?: InputMaybe<Scalars['ID']['input']>;
   rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']> | Scalars['ID']['input']>;
   states?: InputMaybe<Array<PatientState> | PatientState>;
-  limit?: InputMaybe<Scalars['Int']['input']>;
-  offset?: InputMaybe<Scalars['Int']['input']>;
+  filtering?: InputMaybe<Array<FilterInput> | FilterInput>;
+  sorting?: InputMaybe<Array<SortInput> | SortInput>;
+  pagination?: InputMaybe<PaginationInput>;
+  search?: InputMaybe<FullTextSearchInput>;
 }>;
 
 
-export type GetPatientsQuery = { __typename?: 'Query', patients: Array<{ __typename?: 'PatientType', id: string, name: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, assigneeTeam?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, definition: { __typename?: 'PropertyDefinitionType', name: string } }> }> };
+export type GetPatientsQuery = { __typename?: 'Query', patientsTotal: number, patients: Array<{ __typename?: 'PatientType', id: string, name: string, firstname: string, lastname: string, birthdate: any, sex: Sex, state: PatientState, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null }>, clinic: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }, position?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null } | null, teams: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null } | null } | null }>, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, assigneeTeam?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType } | null }>, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> }> };
 
 export type GetTaskQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -635,12 +802,14 @@ export type GetTasksQueryVariables = Exact<{
   rootLocationIds?: InputMaybe<Array<Scalars['ID']['input']> | Scalars['ID']['input']>;
   assigneeId?: InputMaybe<Scalars['ID']['input']>;
   assigneeTeamId?: InputMaybe<Scalars['ID']['input']>;
-  limit?: InputMaybe<Scalars['Int']['input']>;
-  offset?: InputMaybe<Scalars['Int']['input']>;
+  filtering?: InputMaybe<Array<FilterInput> | FilterInput>;
+  sorting?: InputMaybe<Array<SortInput> | SortInput>;
+  pagination?: InputMaybe<PaginationInput>;
+  search?: InputMaybe<FullTextSearchInput>;
 }>;
 
 
-export type GetTasksQuery = { __typename?: 'Query', tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, assigneeTeam?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType } | null }> };
+export type GetTasksQuery = { __typename?: 'Query', tasksTotal: number, tasks: Array<{ __typename?: 'TaskType', id: string, title: string, description?: string | null, done: boolean, dueDate?: any | null, priority?: string | null, estimatedTime?: number | null, creationDate: any, updateDate?: any | null, patient: { __typename?: 'PatientType', id: string, name: string, assignedLocation?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null, assignedLocations: Array<{ __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType, parent?: { __typename?: 'LocationNodeType', id: string, title: string, parent?: { __typename?: 'LocationNodeType', id: string, title: string } | null } | null }> }, assignee?: { __typename?: 'UserType', id: string, name: string, avatarUrl?: string | null, lastOnline?: any | null, isOnline: boolean } | null, assigneeTeam?: { __typename?: 'LocationNodeType', id: string, title: string, kind: LocationType } | null, properties: Array<{ __typename?: 'PropertyValueType', textValue?: string | null, numberValue?: number | null, booleanValue?: boolean | null, dateValue?: any | null, dateTimeValue?: any | null, selectValue?: string | null, multiSelectValues?: Array<string> | null, definition: { __typename?: 'PropertyDefinitionType', id: string, name: string, description?: string | null, fieldType: FieldType, isActive: boolean, allowedEntities: Array<PropertyEntity>, options: Array<string> } }> }> };
 
 export type GetUserQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1057,8 +1226,13 @@ export const useGetMyTasksQuery = <
     )};
 
 export const GetOverviewDataDocument = `
-    query GetOverviewData {
-  recentPatients(limit: 5) {
+    query GetOverviewData($recentPatientsFiltering: [FilterInput!], $recentPatientsSorting: [SortInput!], $recentPatientsPagination: PaginationInput, $recentPatientsSearch: FullTextSearchInput, $recentTasksFiltering: [FilterInput!], $recentTasksSorting: [SortInput!], $recentTasksPagination: PaginationInput, $recentTasksSearch: FullTextSearchInput) {
+  recentPatients(
+    filtering: $recentPatientsFiltering
+    sorting: $recentPatientsSorting
+    pagination: $recentPatientsPagination
+    search: $recentPatientsSearch
+  ) {
     id
     name
     sex
@@ -1075,14 +1249,43 @@ export const GetOverviewDataDocument = `
     tasks {
       updateDate
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
-  recentTasks(limit: 10) {
+  recentPatientsTotal(
+    filtering: $recentPatientsFiltering
+    sorting: $recentPatientsSorting
+    search: $recentPatientsSearch
+  )
+  recentTasks(
+    filtering: $recentTasksFiltering
+    sorting: $recentTasksSorting
+    pagination: $recentTasksPagination
+    search: $recentTasksSearch
+  ) {
     id
     title
     description
     done
     dueDate
     updateDate
+    priority
     assignee {
       id
       name
@@ -1103,7 +1306,30 @@ export const GetOverviewDataDocument = `
         }
       }
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
+  recentTasksTotal(
+    filtering: $recentTasksFiltering
+    sorting: $recentTasksSorting
+    search: $recentTasksSearch
+  )
 }
     `;
 
@@ -1266,13 +1492,15 @@ export const useGetPatientQuery = <
     )};
 
 export const GetPatientsDocument = `
-    query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientState!], $limit: Int, $offset: Int) {
+    query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientState!], $filtering: [FilterInput!], $sorting: [SortInput!], $pagination: PaginationInput, $search: FullTextSearchInput) {
   patients(
     locationNodeId: $locationId
     rootLocationIds: $rootLocationIds
     states: $states
-    limit: $limit
-    offset: $offset
+    filtering: $filtering
+    sorting: $sorting
+    pagination: $pagination
+    search: $search
   ) {
     id
     name
@@ -1394,11 +1622,31 @@ export const GetPatientsDocument = `
     }
     properties {
       definition {
+        id
         name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
       }
       textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
     }
   }
+  patientsTotal(
+    locationNodeId: $locationId
+    rootLocationIds: $rootLocationIds
+    states: $states
+    filtering: $filtering
+    sorting: $sorting
+    search: $search
+  )
 }
     `;
 
@@ -1484,13 +1732,15 @@ export const useGetTaskQuery = <
     )};
 
 export const GetTasksDocument = `
-    query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $limit: Int, $offset: Int) {
+    query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $filtering: [FilterInput!], $sorting: [SortInput!], $pagination: PaginationInput, $search: FullTextSearchInput) {
   tasks(
     rootLocationIds: $rootLocationIds
     assigneeId: $assigneeId
     assigneeTeamId: $assigneeTeamId
-    limit: $limit
-    offset: $offset
+    filtering: $filtering
+    sorting: $sorting
+    pagination: $pagination
+    search: $search
   ) {
     id
     title
@@ -1538,7 +1788,33 @@ export const GetTasksDocument = `
       title
       kind
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
+  tasksTotal(
+    rootLocationIds: $rootLocationIds
+    assigneeId: $assigneeId
+    assigneeTeamId: $assigneeTeamId
+    filtering: $filtering
+    sorting: $sorting
+    search: $search
+  )
 }
     `;
 
diff --git a/web/api/graphql/GetOverviewData.graphql b/web/api/graphql/GetOverviewData.graphql
index 77b8c5e0..1680b377 100644
--- a/web/api/graphql/GetOverviewData.graphql
+++ b/web/api/graphql/GetOverviewData.graphql
@@ -1,5 +1,5 @@
-query GetOverviewData {
-  recentPatients(limit: 5) {
+query GetOverviewData($recentPatientsFiltering: [FilterInput!], $recentPatientsSorting: [SortInput!], $recentPatientsPagination: PaginationInput, $recentPatientsSearch: FullTextSearchInput, $recentTasksFiltering: [FilterInput!], $recentTasksSorting: [SortInput!], $recentTasksPagination: PaginationInput, $recentTasksSearch: FullTextSearchInput) {
+  recentPatients(filtering: $recentPatientsFiltering, sorting: $recentPatientsSorting, pagination: $recentPatientsPagination, search: $recentPatientsSearch) {
     id
     name
     sex
@@ -16,14 +16,34 @@ query GetOverviewData {
     tasks {
       updateDate
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
-  recentTasks(limit: 10) {
+  recentPatientsTotal(filtering: $recentPatientsFiltering, sorting: $recentPatientsSorting, search: $recentPatientsSearch)
+  recentTasks(filtering: $recentTasksFiltering, sorting: $recentTasksSorting, pagination: $recentTasksPagination, search: $recentTasksSearch) {
     id
     title
     description
     done
     dueDate
     updateDate
+    priority
     assignee {
       id
       name
@@ -44,5 +64,24 @@ query GetOverviewData {
         }
       }
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
+  recentTasksTotal(filtering: $recentTasksFiltering, sorting: $recentTasksSorting, search: $recentTasksSearch)
 }
diff --git a/web/api/graphql/GetPatients.graphql b/web/api/graphql/GetPatients.graphql
index 68435959..7bae64ec 100644
--- a/web/api/graphql/GetPatients.graphql
+++ b/web/api/graphql/GetPatients.graphql
@@ -1,5 +1,5 @@
-query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientState!], $limit: Int, $offset: Int) {
-  patients(locationNodeId: $locationId, rootLocationIds: $rootLocationIds, states: $states, limit: $limit, offset: $offset) {
+query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientState!], $filtering: [FilterInput!], $sorting: [SortInput!], $pagination: PaginationInput, $search: FullTextSearchInput) {
+  patients(locationNodeId: $locationId, rootLocationIds: $rootLocationIds, states: $states, filtering: $filtering, sorting: $sorting, pagination: $pagination, search: $search) {
     id
     name
     firstname
@@ -120,9 +120,22 @@ query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientSta
     }
     properties {
       definition {
+        id
         name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
       }
       textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
     }
   }
+  patientsTotal(locationNodeId: $locationId, rootLocationIds: $rootLocationIds, states: $states, filtering: $filtering, sorting: $sorting, search: $search)
 }
diff --git a/web/api/graphql/GetTasks.graphql b/web/api/graphql/GetTasks.graphql
index 50c6a0ab..b431d06e 100644
--- a/web/api/graphql/GetTasks.graphql
+++ b/web/api/graphql/GetTasks.graphql
@@ -1,5 +1,5 @@
-query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $limit: Int, $offset: Int) {
-  tasks(rootLocationIds: $rootLocationIds, assigneeId: $assigneeId, assigneeTeamId: $assigneeTeamId, limit: $limit, offset: $offset) {
+query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $filtering: [FilterInput!], $sorting: [SortInput!], $pagination: PaginationInput, $search: FullTextSearchInput) {
+  tasks(rootLocationIds: $rootLocationIds, assigneeId: $assigneeId, assigneeTeamId: $assigneeTeamId, filtering: $filtering, sorting: $sorting, pagination: $pagination, search: $search) {
     id
     title
     description
@@ -46,6 +46,25 @@ query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $l
       title
       kind
     }
+    properties {
+      definition {
+        id
+        name
+        description
+        fieldType
+        isActive
+        allowedEntities
+        options
+      }
+      textValue
+      numberValue
+      booleanValue
+      dateValue
+      dateTimeValue
+      selectValue
+      multiSelectValues
+    }
   }
+  tasksTotal(rootLocationIds: $rootLocationIds, assigneeId: $assigneeId, assigneeTeamId: $assigneeTeamId, filtering: $filtering, sorting: $sorting, search: $search)
 }
 
diff --git a/web/api/optimistic-updates/GetPatient.ts b/web/api/optimistic-updates/GetPatient.ts
new file mode 100644
index 00000000..b4549d11
--- /dev/null
+++ b/web/api/optimistic-updates/GetPatient.ts
@@ -0,0 +1,784 @@
+import { useSafeMutation } from '@/hooks/useSafeMutation'
+import { fetcher } from '@/api/gql/fetcher'
+import { CompleteTaskDocument, ReopenTaskDocument, CreatePatientDocument, AdmitPatientDocument, DischargePatientDocument, DeletePatientDocument, WaitPatientDocument, MarkPatientDeadDocument, UpdatePatientDocument, type CompleteTaskMutation, type CompleteTaskMutationVariables, type ReopenTaskMutation, type ReopenTaskMutationVariables, type CreatePatientMutation, type CreatePatientMutationVariables, type AdmitPatientMutation, type DischargePatientMutation, type DeletePatientMutation, type DeletePatientMutationVariables, type WaitPatientMutation, type MarkPatientDeadMutation, type UpdatePatientMutation, type UpdatePatientMutationVariables, type UpdatePatientInput, PatientState, type FieldType } from '@/api/gql/generated'
+import type { GetPatientQuery, GetPatientsQuery, GetGlobalDataQuery } from '@/api/gql/generated'
+import { useTasksContext } from '@/hooks/useTasksContext'
+import { useQueryClient } from '@tanstack/react-query'
+
+interface UseOptimisticCompleteTaskMutationParams {
+  id: string,
+  onSuccess?: (data: CompleteTaskMutation, variables: CompleteTaskMutationVariables) => void,
+  onError?: (error: Error, variables: CompleteTaskMutationVariables) => void,
+}
+
+export function useOptimisticCompleteTaskMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticCompleteTaskMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<CompleteTaskMutation, CompleteTaskMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<CompleteTaskMutation, CompleteTaskMutationVariables>(CompleteTaskDocument, variables)()
+    },
+    optimisticUpdate: (variables) => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              tasks: data.patient.tasks?.map(task => (
+                task.id === variables.id ? { ...task, done: true } : task
+              )) || []
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(patient => {
+              if (patient.id === id && patient.tasks) {
+                return {
+                  ...patient,
+                  tasks: patient.tasks.map(task => task.id === variables.id ? { ...task, done: true } : task)
+                }
+              }
+              return patient
+            })
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data?.me?.tasks) return oldData
+          return {
+            ...data,
+            me: data.me ? {
+              ...data.me,
+              tasks: data.me.tasks.map(task => task.id === variables.id ? { ...task, done: true } : task)
+            } : null
+          }
+        }
+      },
+    ],
+    affectedQueryKeys: [['GetPatient', { id }], ['GetTasks'], ['GetPatients'], ['GetOverviewData'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticReopenTaskMutationParams {
+  id: string,
+  onSuccess?: (data: ReopenTaskMutation, variables: ReopenTaskMutationVariables) => void,
+  onError?: (error: Error, variables: ReopenTaskMutationVariables) => void,
+}
+
+export function useOptimisticReopenTaskMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticReopenTaskMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<ReopenTaskMutation, ReopenTaskMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<ReopenTaskMutation, ReopenTaskMutationVariables>(ReopenTaskDocument, variables)()
+    },
+    optimisticUpdate: (variables) => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              tasks: data.patient.tasks?.map(task => (
+                task.id === variables.id ? { ...task, done: false } : task
+              )) || []
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(patient => {
+              if (patient.id === id && patient.tasks) {
+                return {
+                  ...patient,
+                  tasks: patient.tasks.map(task => task.id === variables.id ? { ...task, done: false } : task)
+                }
+              }
+              return patient
+            })
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data?.me?.tasks) return oldData
+          return {
+            ...data,
+            me: data.me ? {
+              ...data.me,
+              tasks: data.me.tasks.map(task => task.id === variables.id ? { ...task, done: false } : task)
+            } : null
+          }
+        }
+      },
+    ],
+    affectedQueryKeys: [['GetPatient', { id }], ['GetTasks'], ['GetPatients'], ['GetOverviewData'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticCreatePatientMutationParams {
+  onSuccess?: (data: CreatePatientMutation, variables: CreatePatientMutationVariables) => void,
+  onError?: (error: Error, variables: CreatePatientMutationVariables) => void,
+  onMutate?: () => void,
+  onSettled?: () => void,
+}
+
+export function useOptimisticCreatePatientMutation({
+  onMutate,
+  onSettled,
+  onSuccess,
+  onError,
+}: UseOptimisticCreatePatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<CreatePatientMutation, CreatePatientMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<CreatePatientMutation, CreatePatientMutationVariables>(CreatePatientDocument, variables)()
+    },
+    optimisticUpdate: (variables) => [
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const newPatient = {
+            __typename: 'PatientType' as const,
+            id: `temp-${Date.now()}`,
+            name: `${variables.data.firstname} ${variables.data.lastname}`.trim(),
+            firstname: variables.data.firstname,
+            lastname: variables.data.lastname,
+            birthdate: variables.data.birthdate,
+            sex: variables.data.sex,
+            state: variables.data.state || PatientState.Admitted,
+            assignedLocation: null,
+            assignedLocations: [],
+            clinic: null,
+            position: null,
+            teams: [],
+            properties: [],
+            tasks: [],
+          }
+          return {
+            ...data,
+            patients: [...(data.patients || []), newPatient],
+            waitingPatients: variables.data.state === PatientState.Wait
+              ? [...(data.waitingPatients || []), newPatient]
+              : data.waitingPatients || [],
+          }
+        }
+      }
+    ],
+    affectedQueryKeys: [['GetGlobalData'], ['GetPatients'], ['GetOverviewData']],
+    onSuccess,
+    onError,
+    onMutate,
+    onSettled,
+  })
+}
+
+interface UseOptimisticAdmitPatientMutationParams {
+  id: string,
+  onSuccess?: (data: AdmitPatientMutation, variables: { id: string }) => void,
+  onError?: (error: Error, variables: { id: string }) => void,
+}
+
+export function useOptimisticAdmitPatientMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticAdmitPatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<AdmitPatientMutation, { id: string }>({
+    mutationFn: async (variables) => {
+      return fetcher<AdmitPatientMutation, { id: string }>(AdmitPatientDocument, variables)()
+    },
+    optimisticUpdate: () => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              state: PatientState.Admitted
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(p =>
+              p.id === id ? { ...p, state: PatientState.Admitted } : p)
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingPatient = data.patients.find(p => p.id === id)
+          const updatedPatient = existingPatient
+            ? { ...existingPatient, state: PatientState.Admitted }
+            : { __typename: 'PatientType' as const, id, state: PatientState.Admitted, assignedLocation: null }
+          return {
+            ...data,
+            patients: existingPatient
+              ? data.patients.map(p => p.id === id ? updatedPatient : p)
+              : [...data.patients, updatedPatient],
+            waitingPatients: data.waitingPatients.filter(p => p.id !== id)
+          }
+        }
+      }
+    ],
+    affectedQueryKeys: [['GetPatients'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticDischargePatientMutationParams {
+  id: string,
+  onSuccess?: (data: DischargePatientMutation, variables: { id: string }) => void,
+  onError?: (error: Error, variables: { id: string }) => void,
+}
+
+export function useOptimisticDischargePatientMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticDischargePatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<DischargePatientMutation, { id: string }>({
+    mutationFn: async (variables) => {
+      return fetcher<DischargePatientMutation, { id: string }>(DischargePatientDocument, variables)()
+    },
+    optimisticUpdate: () => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              state: PatientState.Discharged
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(p =>
+              p.id === id ? { ...p, state: PatientState.Discharged } : p)
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingPatient = data.patients.find(p => p.id === id)
+          const updatedPatient = existingPatient
+            ? { ...existingPatient, state: PatientState.Discharged }
+            : { __typename: 'PatientType' as const, id, state: PatientState.Discharged, assignedLocation: null }
+          return {
+            ...data,
+            patients: existingPatient
+              ? data.patients.map(p => p.id === id ? updatedPatient : p)
+              : [...data.patients, updatedPatient],
+            waitingPatients: data.waitingPatients.filter(p => p.id !== id)
+          }
+        }
+      }
+    ],
+    affectedQueryKeys: [['GetPatients'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticDeletePatientMutationParams {
+  onSuccess?: (data: DeletePatientMutation, variables: DeletePatientMutationVariables) => void,
+  onError?: (error: Error, variables: DeletePatientMutationVariables) => void,
+}
+
+export function useOptimisticDeletePatientMutation({
+  onSuccess,
+  onError,
+}: UseOptimisticDeletePatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<DeletePatientMutation, DeletePatientMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<DeletePatientMutation, DeletePatientMutationVariables>(DeletePatientDocument, variables)()
+    },
+    optimisticUpdate: (variables) => [
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          return {
+            ...data,
+            patients: (data.patients || []).filter(p => p.id !== variables.id),
+            waitingPatients: (data.waitingPatients || []).filter(p => p.id !== variables.id),
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.filter(p => p.id !== variables.id),
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatient', { id: variables.id }],
+        updateFn: () => undefined,
+      }
+    ],
+    affectedQueryKeys: [['GetGlobalData'], ['GetPatients'], ['GetOverviewData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticWaitPatientMutationParams {
+  id: string,
+  onSuccess?: (data: WaitPatientMutation, variables: { id: string }) => void,
+  onError?: (error: Error, variables: { id: string }) => void,
+}
+
+export function useOptimisticWaitPatientMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticWaitPatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<WaitPatientMutation, { id: string }>({
+    mutationFn: async (variables) => {
+      return fetcher<WaitPatientMutation, { id: string }>(WaitPatientDocument, variables)()
+    },
+    optimisticUpdate: () => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              state: PatientState.Wait
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(p =>
+              p.id === id ? { ...p, state: PatientState.Wait } : p)
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingPatient = data.patients.find(p => p.id === id)
+          const isAlreadyWaiting = data.waitingPatients.some(p => p.id === id)
+          const updatedPatient = existingPatient
+            ? { ...existingPatient, state: PatientState.Wait }
+            : { __typename: 'PatientType' as const, id, state: PatientState.Wait, assignedLocation: null }
+          return {
+            ...data,
+            patients: existingPatient
+              ? data.patients.map(p => p.id === id ? updatedPatient : p)
+              : [...data.patients, updatedPatient],
+            waitingPatients: isAlreadyWaiting
+              ? data.waitingPatients
+              : [...data.waitingPatients, updatedPatient]
+          }
+        }
+      }
+    ],
+    affectedQueryKeys: [['GetPatients'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticMarkPatientDeadMutationParams {
+  id: string,
+  onSuccess?: (data: MarkPatientDeadMutation, variables: { id: string }) => void,
+  onError?: (error: Error, variables: { id: string }) => void,
+}
+
+export function useOptimisticMarkPatientDeadMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticMarkPatientDeadMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  return useSafeMutation<MarkPatientDeadMutation, { id: string }>({
+    mutationFn: async (variables) => {
+      return fetcher<MarkPatientDeadMutation, { id: string }>(MarkPatientDeadDocument, variables)()
+    },
+    optimisticUpdate: () => [
+      {
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          return {
+            ...data,
+            patient: {
+              ...data.patient,
+              state: PatientState.Dead
+            }
+          }
+        }
+      },
+      {
+        queryKey: ['GetPatients'],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientsQuery | undefined
+          if (!data?.patients) return oldData
+          return {
+            ...data,
+            patients: data.patients.map(p =>
+              p.id === id ? { ...p, state: PatientState.Dead } : p)
+          }
+        }
+      },
+      {
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingPatient = data.patients.find(p => p.id === id)
+          const updatedPatient = existingPatient
+            ? { ...existingPatient, state: PatientState.Dead }
+            : { __typename: 'PatientType' as const, id, state: PatientState.Dead, assignedLocation: null }
+          return {
+            ...data,
+            patients: existingPatient
+              ? data.patients.map(p => p.id === id ? updatedPatient : p)
+              : [...data.patients, updatedPatient],
+            waitingPatients: data.waitingPatients.filter(p => p.id !== id)
+          }
+        }
+      }
+    ],
+    affectedQueryKeys: [['GetPatients'], ['GetGlobalData']],
+    onSuccess,
+    onError,
+  })
+}
+
+interface UseOptimisticUpdatePatientMutationParams {
+  id: string,
+  onSuccess?: (data: UpdatePatientMutation, variables: UpdatePatientMutationVariables) => void,
+  onError?: (error: Error, variables: UpdatePatientMutationVariables) => void,
+}
+
+export function useOptimisticUpdatePatientMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticUpdatePatientMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  const queryClient = useQueryClient()
+
+  return useSafeMutation<UpdatePatientMutation, UpdatePatientMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<UpdatePatientMutation, UpdatePatientMutationVariables>(UpdatePatientDocument, variables)()
+    },
+    optimisticUpdate: (variables) => {
+      const updateData = variables.data || {}
+      const locationsData = queryClient.getQueryData(['GetLocations']) as { locationNodes?: Array<{ id: string, title: string, kind: string, parentId?: string | null }> } | undefined
+      type PatientType = NonNullable<NonNullable<ReturnType<typeof queryClient.getQueryData<GetPatientQuery>>>['patient']>
+
+      const updatePatientInQuery = (patient: PatientType, updateData: Partial<UpdatePatientInput>) => {
+        if (!patient) return patient
+
+        const updated: typeof patient = { ...patient }
+
+        if (updateData.firstname !== undefined) {
+          updated.firstname = updateData.firstname || ''
+        }
+        if (updateData.lastname !== undefined) {
+          updated.lastname = updateData.lastname || ''
+        }
+        if (updateData.sex !== undefined && updateData.sex !== null) {
+          updated.sex = updateData.sex
+        }
+        if (updateData.birthdate !== undefined) {
+          updated.birthdate = updateData.birthdate || null
+        }
+        if (updateData.description !== undefined) {
+          updated.description = updateData.description
+        }
+        if (updateData.clinicId !== undefined) {
+          if (updateData.clinicId === null || updateData.clinicId === undefined) {
+            updated.clinic = null as unknown as typeof patient.clinic
+          } else {
+            const clinicLocation = locationsData?.locationNodes?.find(loc => loc.id === updateData.clinicId)
+            if (clinicLocation) {
+              updated.clinic = {
+                ...clinicLocation,
+                __typename: 'LocationNodeType' as const,
+              } as typeof patient.clinic
+            }
+          }
+        }
+        if (updateData.positionId !== undefined) {
+          if (updateData.positionId === null) {
+            updated.position = null as typeof patient.position
+          } else {
+            const positionLocation = locationsData?.locationNodes?.find(loc => loc.id === updateData.positionId)
+            if (positionLocation) {
+              updated.position = {
+                ...positionLocation,
+                __typename: 'LocationNodeType' as const,
+              } as typeof patient.position
+            }
+          }
+        }
+        if (updateData.teamIds !== undefined) {
+          const teamLocations = locationsData?.locationNodes?.filter(loc => updateData.teamIds?.includes(loc.id)) || []
+          updated.teams = teamLocations.map(team => ({
+            ...team,
+            __typename: 'LocationNodeType' as const,
+          })) as typeof patient.teams
+        }
+        if (updateData.properties !== undefined && updateData.properties !== null) {
+          const propertyMap = new Map(updateData.properties.map(p => [p.definitionId, p]))
+          const existingPropertyIds = new Set(
+            patient.properties?.map(p => p.definition?.id).filter(Boolean) || []
+          )
+          const newPropertyIds = new Set(updateData.properties.map(p => p.definitionId))
+
+          const existingProperties = patient.properties
+            ? patient.properties
+              .filter(p => newPropertyIds.has(p.definition?.id))
+              .map(p => {
+                const newProp = propertyMap.get(p.definition?.id)
+                if (!newProp) return p
+                return {
+                  ...p,
+                  textValue: newProp.textValue ?? p.textValue,
+                  numberValue: newProp.numberValue ?? p.numberValue,
+                  booleanValue: newProp.booleanValue ?? p.booleanValue,
+                  dateValue: newProp.dateValue ?? p.dateValue,
+                  dateTimeValue: newProp.dateTimeValue ?? p.dateTimeValue,
+                  selectValue: newProp.selectValue ?? p.selectValue,
+                  multiSelectValues: newProp.multiSelectValues ?? p.multiSelectValues,
+                }
+              })
+            : []
+          const newProperties = updateData.properties
+            .filter(p => !existingPropertyIds.has(p.definitionId))
+            .map(p => {
+              const existingProperty = patient?.properties?.find(ep => ep.definition?.id === p.definitionId)
+              return {
+                __typename: 'PropertyValueType' as const,
+                definition: existingProperty?.definition || {
+                  __typename: 'PropertyDefinitionType' as const,
+                  id: p.definitionId,
+                  name: '',
+                  description: null,
+                  fieldType: 'TEXT' as FieldType,
+                  isActive: true,
+                  allowedEntities: [],
+                  options: [],
+                },
+                textValue: p.textValue,
+                numberValue: p.numberValue,
+                booleanValue: p.booleanValue,
+                dateValue: p.dateValue,
+                dateTimeValue: p.dateTimeValue,
+                selectValue: p.selectValue,
+                multiSelectValues: p.multiSelectValues,
+              }
+            })
+          updated.properties = [...existingProperties, ...newProperties]
+        }
+
+        return updated
+      }
+
+      const updates: Array<{ queryKey: unknown[], updateFn: (oldData: unknown) => unknown }> = []
+
+      updates.push({
+        queryKey: ['GetPatient', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetPatientQuery | undefined
+          if (!data?.patient) return oldData
+          const updatedPatient = updatePatientInQuery(data.patient, updateData)
+          return {
+            ...data,
+            patient: updatedPatient
+          }
+        }
+      })
+
+      const allGetPatientsQueries = queryClient.getQueryCache().getAll()
+        .filter(query => {
+          const key = query.queryKey
+          return Array.isArray(key) && key[0] === 'GetPatients'
+        })
+
+      for (const query of allGetPatientsQueries) {
+        updates.push({
+          queryKey: [...query.queryKey] as unknown[],
+          updateFn: (oldData: unknown) => {
+            const data = oldData as GetPatientsQuery | undefined
+            if (!data?.patients) return oldData
+            const patientIndex = data.patients.findIndex(p => p.id === id)
+            if (patientIndex === -1) return oldData
+            const patient = data.patients[patientIndex]
+            if (!patient) return oldData
+            const updatedPatient = updatePatientInQuery(patient as unknown as PatientType, updateData)
+            if (!updatedPatient) return oldData
+            const updatedName = updatedPatient.firstname && updatedPatient.lastname
+              ? `${updatedPatient.firstname} ${updatedPatient.lastname}`.trim()
+              : updatedPatient.firstname || updatedPatient.lastname || patient.name || ''
+            const updatedPatientForList: typeof data.patients[0] = {
+              ...patient,
+              firstname: updateData.firstname !== undefined ? (updateData.firstname || '') : patient.firstname,
+              lastname: updateData.lastname !== undefined ? (updateData.lastname || '') : patient.lastname,
+              name: updatedName,
+              sex: updateData.sex !== undefined && updateData.sex !== null ? updateData.sex : patient.sex,
+              birthdate: updateData.birthdate !== undefined ? (updateData.birthdate || null) : patient.birthdate,
+              ...('description' in patient && { description: updateData.description !== undefined ? updateData.description : (patient as unknown as PatientType & { description?: string | null }).description }),
+              clinic: updateData.clinicId !== undefined
+                ? (updateData.clinicId
+                  ? (locationsData?.locationNodes?.find(loc => loc.id === updateData.clinicId) as typeof patient.clinic || patient.clinic)
+                  : (null as unknown as typeof patient.clinic))
+                : patient.clinic,
+              position: updateData.positionId !== undefined
+                ? (updateData.positionId
+                  ? (locationsData?.locationNodes?.find(loc => loc.id === updateData.positionId) as typeof patient.position || patient.position)
+                  : (null as unknown as typeof patient.position))
+                : patient.position,
+              teams: updateData.teamIds !== undefined
+                ? (locationsData?.locationNodes?.filter(loc => updateData.teamIds?.includes(loc.id)).map(team => team as typeof patient.teams[0]) || patient.teams)
+                : patient.teams,
+              properties: updateData.properties !== undefined && updateData.properties !== null
+                ? (updatedPatient.properties || patient.properties)
+                : patient.properties,
+            }
+            return {
+              ...data,
+              patients: [
+                ...data.patients.slice(0, patientIndex),
+                updatedPatientForList,
+                ...data.patients.slice(patientIndex + 1)
+              ]
+            }
+          }
+        })
+      }
+
+      updates.push({
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingPatient = data.patients.find(p => p.id === id)
+          if (!existingPatient) return oldData
+          const updatedPatient = updatePatientInQuery(existingPatient as unknown as PatientType, updateData)
+          return {
+            ...data,
+            patients: data.patients.map(p => p.id === id ? updatedPatient as typeof existingPatient : p)
+          }
+        }
+      })
+
+      updates.push({
+        queryKey: ['GetOverviewData'],
+        updateFn: (oldData: unknown) => {
+          return oldData
+        }
+      })
+
+      return updates
+    },
+    affectedQueryKeys: [
+      ['GetPatient', { id }],
+      ['GetPatients'],
+      ['GetOverviewData'],
+      ['GetGlobalData']
+    ],
+    onSuccess,
+    onError,
+  })
+}
diff --git a/web/api/optimistic-updates/GetTask.ts b/web/api/optimistic-updates/GetTask.ts
new file mode 100644
index 00000000..21739b71
--- /dev/null
+++ b/web/api/optimistic-updates/GetTask.ts
@@ -0,0 +1,254 @@
+import { useSafeMutation } from '@/hooks/useSafeMutation'
+import { fetcher } from '@/api/gql/fetcher'
+import { UpdateTaskDocument, type UpdateTaskMutation, type UpdateTaskMutationVariables, type UpdateTaskInput, type FieldType } from '@/api/gql/generated'
+import type { GetTaskQuery, GetTasksQuery, GetGlobalDataQuery } from '@/api/gql/generated'
+import { useTasksContext } from '@/hooks/useTasksContext'
+import { useQueryClient } from '@tanstack/react-query'
+
+interface UseOptimisticUpdateTaskMutationParams {
+  id: string,
+  onSuccess?: (data: UpdateTaskMutation, variables: UpdateTaskMutationVariables) => void,
+  onError?: (error: Error, variables: UpdateTaskMutationVariables) => void,
+}
+
+export function useOptimisticUpdateTaskMutation({
+  id,
+  onSuccess,
+  onError,
+}: UseOptimisticUpdateTaskMutationParams) {
+  const { selectedRootLocationIds } = useTasksContext()
+  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
+  const queryClient = useQueryClient()
+
+  return useSafeMutation<UpdateTaskMutation, UpdateTaskMutationVariables>({
+    mutationFn: async (variables) => {
+      return fetcher<UpdateTaskMutation, UpdateTaskMutationVariables>(UpdateTaskDocument, variables)()
+    },
+    optimisticUpdate: (variables) => {
+      const updateData = variables.data || {}
+      const locationsData = queryClient.getQueryData(['GetLocations']) as { locationNodes?: Array<{ id: string, title: string, kind: string, parentId?: string | null }> } | undefined
+      const usersData = queryClient.getQueryData(['GetUsers']) as { users?: Array<{ id: string, name: string, avatarUrl?: string | null, lastOnline?: unknown, isOnline?: boolean }> } | undefined
+      type TaskType = NonNullable<NonNullable<ReturnType<typeof queryClient.getQueryData<GetTaskQuery>>>['task']>
+
+      const updateTaskInQuery = (task: TaskType, updateData: Partial<UpdateTaskInput>) => {
+        if (!task) return task
+
+        const updated: typeof task = { ...task }
+
+        if (updateData.title !== undefined) {
+          updated.title = updateData.title || ''
+        }
+        if (updateData.description !== undefined) {
+          updated.description = updateData.description
+        }
+        if (updateData.done !== undefined) {
+          updated.done = updateData.done ?? false
+        }
+        if (updateData.dueDate !== undefined) {
+          updated.dueDate = updateData.dueDate || null
+        }
+        if (updateData.priority !== undefined) {
+          updated.priority = updateData.priority
+        }
+        if (updateData.estimatedTime !== undefined) {
+          updated.estimatedTime = updateData.estimatedTime
+        }
+        if (updateData.assigneeId !== undefined) {
+          if (updateData.assigneeId === null || updateData.assigneeId === undefined) {
+            updated.assignee = null as typeof task.assignee
+          } else {
+            const user = usersData?.users?.find(u => u.id === updateData.assigneeId)
+            if (user) {
+              updated.assignee = {
+                __typename: 'UserType' as const,
+                id: user.id,
+                name: user.name,
+                avatarUrl: user.avatarUrl,
+                lastOnline: user.lastOnline,
+                isOnline: user.isOnline ?? false,
+              } as typeof task.assignee
+            }
+          }
+        }
+        if (updateData.assigneeTeamId !== undefined) {
+          if (updateData.assigneeTeamId === null || updateData.assigneeTeamId === undefined) {
+            updated.assigneeTeam = null as typeof task.assigneeTeam
+          } else {
+            const teamLocation = locationsData?.locationNodes?.find(loc => loc.id === updateData.assigneeTeamId)
+            if (teamLocation) {
+              updated.assigneeTeam = {
+                ...teamLocation,
+                __typename: 'LocationNodeType' as const,
+              } as typeof task.assigneeTeam
+            }
+          }
+        }
+        if (updateData.properties !== undefined && updateData.properties !== null) {
+          const propertyMap = new Map(updateData.properties.map(p => [p.definitionId, p]))
+          const existingPropertyIds = new Set(
+            task.properties?.map(p => p.definition?.id).filter(Boolean) || []
+          )
+          const newPropertyIds = new Set(updateData.properties.map(p => p.definitionId))
+
+          const existingProperties = task.properties
+            ? task.properties
+              .filter(p => newPropertyIds.has(p.definition?.id))
+              .map(p => {
+                const newProp = propertyMap.get(p.definition?.id)
+                if (!newProp) return p
+                return {
+                  ...p,
+                  textValue: newProp.textValue ?? p.textValue,
+                  numberValue: newProp.numberValue ?? p.numberValue,
+                  booleanValue: newProp.booleanValue ?? p.booleanValue,
+                  dateValue: newProp.dateValue ?? p.dateValue,
+                  dateTimeValue: newProp.dateTimeValue ?? p.dateTimeValue,
+                  selectValue: newProp.selectValue ?? p.selectValue,
+                  multiSelectValues: newProp.multiSelectValues ?? p.multiSelectValues,
+                }
+              })
+            : []
+          const newProperties = updateData.properties
+            .filter(p => !existingPropertyIds.has(p.definitionId))
+            .map(p => {
+              const existingProperty = task?.properties?.find(ep => ep.definition?.id === p.definitionId)
+              return {
+                __typename: 'PropertyValueType' as const,
+                definition: existingProperty?.definition || {
+                  __typename: 'PropertyDefinitionType' as const,
+                  id: p.definitionId,
+                  name: '',
+                  description: null,
+                  fieldType: 'TEXT' as FieldType,
+                  isActive: true,
+                  allowedEntities: [],
+                  options: [],
+                },
+                textValue: p.textValue,
+                numberValue: p.numberValue,
+                booleanValue: p.booleanValue,
+                dateValue: p.dateValue,
+                dateTimeValue: p.dateTimeValue,
+                selectValue: p.selectValue,
+                multiSelectValues: p.multiSelectValues,
+              }
+            })
+          updated.properties = [...existingProperties, ...newProperties]
+        }
+
+        return updated
+      }
+
+      const updates: Array<{ queryKey: unknown[], updateFn: (oldData: unknown) => unknown }> = []
+
+      updates.push({
+        queryKey: ['GetTask', { id }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetTaskQuery | undefined
+          if (!data?.task) return oldData
+          const updatedTask = updateTaskInQuery(data.task, updateData)
+          return {
+            ...data,
+            task: updatedTask
+          }
+        }
+      })
+
+      const allGetTasksQueries = queryClient.getQueryCache().getAll()
+        .filter(query => {
+          const key = query.queryKey
+          return Array.isArray(key) && key[0] === 'GetTasks'
+        })
+
+      for (const query of allGetTasksQueries) {
+        updates.push({
+          queryKey: [...query.queryKey] as unknown[],
+          updateFn: (oldData: unknown) => {
+            const data = oldData as GetTasksQuery | undefined
+            if (!data?.tasks) return oldData
+            const taskIndex = data.tasks.findIndex(t => t.id === id)
+            if (taskIndex === -1) return oldData
+            const task = data.tasks[taskIndex]
+            if (!task) return oldData
+            const updatedTask = updateTaskInQuery(task as unknown as TaskType, updateData)
+            if (!updatedTask) return oldData
+            const updatedTaskForList: typeof data.tasks[0] = {
+              ...task,
+              title: updateData.title !== undefined ? (updateData.title || '') : task.title,
+              description: updateData.description !== undefined ? updateData.description : task.description,
+              done: updateData.done !== undefined ? (updateData.done ?? false) : task.done,
+              dueDate: updateData.dueDate !== undefined ? (updateData.dueDate || null) : task.dueDate,
+              priority: updateData.priority !== undefined ? updateData.priority : task.priority,
+              estimatedTime: updateData.estimatedTime !== undefined ? updateData.estimatedTime : task.estimatedTime,
+              assignee: updateData.assigneeId !== undefined
+                ? (updateData.assigneeId
+                  ? (usersData?.users?.find(u => u.id === updateData.assigneeId) ? {
+                    __typename: 'UserType' as const,
+                    id: updateData.assigneeId,
+                    name: usersData.users.find(u => u.id === updateData.assigneeId)!.name,
+                    avatarUrl: usersData.users.find(u => u.id === updateData.assigneeId)!.avatarUrl,
+                    lastOnline: usersData.users.find(u => u.id === updateData.assigneeId)!.lastOnline,
+                    isOnline: usersData.users.find(u => u.id === updateData.assigneeId)!.isOnline ?? false,
+                  } as typeof task.assignee : task.assignee)
+                  : (null as typeof task.assignee))
+                : task.assignee,
+              assigneeTeam: updateData.assigneeTeamId !== undefined
+                ? (updateData.assigneeTeamId
+                  ? (locationsData?.locationNodes?.find(loc => loc.id === updateData.assigneeTeamId) ? {
+                    __typename: 'LocationNodeType' as const,
+                    id: updateData.assigneeTeamId,
+                    title: locationsData.locationNodes!.find(loc => loc.id === updateData.assigneeTeamId)!.title,
+                    kind: locationsData.locationNodes!.find(loc => loc.id === updateData.assigneeTeamId)!.kind,
+                  } as typeof task.assigneeTeam : task.assigneeTeam)
+                  : (null as typeof task.assigneeTeam))
+                : task.assigneeTeam,
+            }
+            return {
+              ...data,
+              tasks: [
+                ...data.tasks.slice(0, taskIndex),
+                updatedTaskForList,
+                ...data.tasks.slice(taskIndex + 1)
+              ]
+            }
+          }
+        })
+      }
+
+      updates.push({
+        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
+        updateFn: (oldData: unknown) => {
+          const data = oldData as GetGlobalDataQuery | undefined
+          if (!data) return oldData
+          const existingTask = data.me?.tasks?.find(t => t.id === id)
+          if (!existingTask) return oldData
+          const updatedTask = updateTaskInQuery(existingTask as unknown as TaskType, updateData)
+          return {
+            ...data,
+            me: data.me ? {
+              ...data.me,
+              tasks: data.me.tasks?.map(t => t.id === id ? updatedTask as typeof existingTask : t) || []
+            } : null
+          }
+        }
+      })
+
+      updates.push({
+        queryKey: ['GetOverviewData'],
+        updateFn: (oldData: unknown) => {
+          return oldData
+        }
+      })
+
+      return updates
+    },
+    affectedQueryKeys: [
+      ['GetTask', { id }],
+      ['GetTasks'],
+      ['GetOverviewData'],
+      ['GetGlobalData']
+    ],
+    onSuccess,
+    onError,
+  })
+}
diff --git a/web/components/AuditLogTimeline.tsx b/web/components/AuditLogTimeline.tsx
index 61aab981..98850a3a 100644
--- a/web/components/AuditLogTimeline.tsx
+++ b/web/components/AuditLogTimeline.tsx
@@ -173,7 +173,7 @@ export const AuditLogTimeline: React.FC<AuditLogTimelineProps> = ({ caseId, clas
                 onClick={(e) => handleCardClick(index, e)}
                 className={clsx(
                   'p-4 rounded-lg border-2 transition-all',
-                  'bg-[rgba(255,255,255,1)] dark:bg-[rgba(55,65,81,1)]',
+                  'bg-surface-variant text-on-surface',
                   'border-gray-300 dark:border-gray-600',
                   'hover:border-primary hover:shadow-md',
                   hasDetails && 'cursor-pointer'
@@ -189,7 +189,6 @@ export const AuditLogTimeline: React.FC<AuditLogTimelineProps> = ({ caseId, clas
                         <>
                           <AvatarStatusComponent
                             size="sm"
-                            fullyRounded={true}
                             isOnline={userInfo.isOnline}
                             image={userInfo.avatarUrl ? {
                               avatarUrl: userInfo.avatarUrl,
diff --git a/web/components/AvatarComponent.tsx b/web/components/AvatarComponent.tsx
index 7a2b3632..0a07a112 100644
--- a/web/components/AvatarComponent.tsx
+++ b/web/components/AvatarComponent.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import type { AvatarSize } from '@helpwave/hightide'
 import { Avatar, type AvatarProps } from '@helpwave/hightide'
 import clsx from 'clsx'
 
@@ -11,26 +12,26 @@ export const AvatarStatusComponent: React.FC<AvatarStatusComponentProps> = ({
   className,
   ...avatarProps
 }) => {
-  const size = avatarProps.size || 'md'
-  const dotSizeClasses = {
-    sm: 'w-3 h-3',
-    md: 'w-3.5 h-3.5',
-    lg: 'w-4 h-4',
-    xl: 'w-5 h-5',
+  const size = avatarProps.size || 'sm'
+  const dotSizeClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'w-3 h-3',
+    sm: 'w-3.5 h-3.5',
+    md: 'w-4 h-4',
+    lg: 'w-5 h-5',
   }
 
-  const dotPositionClasses = {
+  const dotPositionClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'bottom-0 right-0',
     sm: 'bottom-0 right-0',
     md: 'bottom-0 right-0',
     lg: 'bottom-0 right-0',
-    xl: 'bottom-0 right-0',
   }
 
-  const dotBorderClasses = {
-    sm: 'border-[1.5px]',
+  const dotBorderClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'border-[1.5px]',
+    sm: 'border-2',
     md: 'border-2',
     lg: 'border-2',
-    xl: 'border-2',
   }
 
   const showOnline = isOnline === true
diff --git a/web/components/AvatarStatusComponent.tsx b/web/components/AvatarStatusComponent.tsx
index e94ba135..a39e670a 100644
--- a/web/components/AvatarStatusComponent.tsx
+++ b/web/components/AvatarStatusComponent.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import type { AvatarSize } from '@helpwave/hightide'
 import { Avatar, type AvatarProps } from '@helpwave/hightide'
 import clsx from 'clsx'
 
@@ -11,26 +12,26 @@ export const AvatarStatusComponent: React.FC<AvatarStatusComponentProps> = ({
   className,
   ...avatarProps
 }) => {
-  const size = avatarProps.size || 'md'
-  const dotSizeClasses = {
-    sm: 'w-3 h-3',
-    md: 'w-3.5 h-3.5',
-    lg: 'w-4 h-4',
-    xl: 'w-5 h-5',
+  const size = avatarProps.size || 'sm'
+  const dotSizeClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'w-3 h-3',
+    sm: 'w-3.5 h-3.5',
+    md: 'w-4 h-4',
+    lg: 'w-5 h-5',
   }
 
-  const dotPositionClasses = {
+  const dotPositionClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'bottom-0 right-0',
     sm: 'bottom-0 right-0',
     md: 'bottom-0 right-0',
     lg: 'bottom-0 right-0',
-    xl: 'bottom-0 right-0',
   }
 
-  const dotBorderClasses = {
-    sm: 'border-[1.5px]',
+  const dotBorderClasses: Record<NonNullable<AvatarSize>, string> = {
+    xs: 'border-[1.5px]',
+    sm: 'border-2',
     md: 'border-2',
     lg: 'border-2',
-    xl: 'border-2',
   }
 
   const showOnline = isOnline === true
@@ -40,7 +41,7 @@ export const AvatarStatusComponent: React.FC<AvatarStatusComponentProps> = ({
       <Avatar {...avatarProps} />
       <div
         className={clsx(
-          'absolute rounded-full border-white dark:border-gray-800',
+          'absolute right-0 bottom-0  z-1 rounded-full border-white dark:border-gray-800',
           dotSizeClasses[size],
           dotPositionClasses[size],
           dotBorderClasses[size],
diff --git a/web/components/ConflictResolutionDialog.tsx b/web/components/ConflictResolutionDialog.tsx
index 06f55649..e66196a5 100644
--- a/web/components/ConflictResolutionDialog.tsx
+++ b/web/components/ConflictResolutionDialog.tsx
@@ -50,10 +50,10 @@ export const ConflictResolutionDialog = ({
     ? fields
     : localData && serverData
       ? Object.keys({ ...localData, ...serverData }).map(field => ({
-          field,
-          localValue: localData[field],
-          serverValue: serverData[field],
-        })).filter(f => JSON.stringify(f.localValue) !== JSON.stringify(f.serverValue))
+        field,
+        localValue: localData[field],
+        serverValue: serverData[field],
+      })).filter(f => JSON.stringify(f.localValue) !== JSON.stringify(f.serverValue))
       : []
 
   return (
diff --git a/web/components/FeedbackDialog.tsx b/web/components/FeedbackDialog.tsx
index b48566d5..a2c97679 100644
--- a/web/components/FeedbackDialog.tsx
+++ b/web/components/FeedbackDialog.tsx
@@ -1,9 +1,8 @@
-import { useState, useEffect, useRef } from 'react'
-import { Dialog, Button, Textarea, FormElementWrapper, Checkbox } from '@helpwave/hightide'
+import { useState, useEffect, useRef, useMemo } from 'react'
+import { Dialog, Button, Textarea, FormField, FormProvider, Checkbox, useCreateForm, useTranslatedValidators, useFormObserverKey } from '@helpwave/hightide'
 import { useTasksTranslation, useLocale } from '@/i18n/useTasksTranslation'
 import { useTasksContext } from '@/hooks/useTasksContext'
 import { Mic, Pause } from 'lucide-react'
-import clsx from 'clsx'
 
 interface FeedbackDialogProps {
   isOpen: boolean,
@@ -11,6 +10,12 @@ interface FeedbackDialogProps {
   hideUrl?: boolean,
 }
 
+type FeedbackFormValues = {
+  url?: string,
+  feedback: string,
+  isAnonymous: boolean,
+}
+
 interface SpeechRecognitionEvent {
   resultIndex: number,
   results: Array<Array<{ transcript: string, isFinal?: boolean }>>,
@@ -35,14 +40,78 @@ export const FeedbackDialog = ({ isOpen, onClose, hideUrl = false }: FeedbackDia
   const translation = useTasksTranslation()
   const { locale } = useLocale()
   const { user } = useTasksContext()
-  const [feedback, setFeedback] = useState('')
   const [isRecording, setIsRecording] = useState(false)
   const [isSupported, setIsSupported] = useState(false)
-  const [isAnonymous, setIsAnonymous] = useState(false)
   const recognitionRef = useRef<SpeechRecognitionInstance | null>(null)
   const isRecordingRef = useRef(false)
   const finalTranscriptRef = useRef('')
   const lastFinalLengthRef = useRef(0)
+  const validators = useTranslatedValidators()
+
+
+
+  const form = useCreateForm<FeedbackFormValues>({
+    initialValues: {
+      url: typeof window !== 'undefined' ? window.location.href : '',
+      feedback: '',
+      isAnonymous: false,
+    },
+    validators:{
+      feedback: validators.notEmpty
+    },
+    onFormSubmit: async (values) => {
+      if (!values.feedback.trim()) return
+
+      const feedbackData: {
+        url?: string,
+        feedback: string,
+        timestamp: string,
+        username: string,
+        userId?: string,
+      } = {
+        feedback: values.feedback.trim(),
+        timestamp: new Date().toISOString(),
+        username: values.isAnonymous ? 'Anonymous' : (user?.name || 'Unknown User'),
+        userId: values.isAnonymous ? undefined : user?.id,
+      }
+
+      if (!hideUrl) {
+        feedbackData.url = values.url || (typeof window !== 'undefined' ? window.location.href : '')
+      }
+
+      try {
+        const response = await fetch('/api/feedback', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(feedbackData),
+        })
+
+        if (response.ok) {
+          form.update(prev => ({
+            ...prev,
+            feedback: '',
+            isAnonymous: false,
+          }))
+          onClose()
+        }
+      } catch {
+        void 0
+      }
+    },
+  })
+
+  const { update: updateForm } = form
+
+  const isAnonymous = useFormObserverKey({ formStore: form.store, formKey: 'isAnonymous' })?.value ?? false
+
+  const submissionName = useMemo(() => {
+    if(isAnonymous) {
+      return translation('anonymous')
+    }
+    return user?.name || 'Unknown User'
+  }, [isAnonymous, translation, user?.name])
 
   useEffect(() => {
     if (typeof window !== 'undefined') {
@@ -91,7 +160,7 @@ export const FeedbackDialog = ({ isOpen, onClose, hideUrl = false }: FeedbackDia
             ? finalTranscriptRef.current.trim() + '\n\n' + interimTranscript
             : (finalTranscriptRef.current + interimTranscript).trim()
 
-          setFeedback(displayText)
+          updateForm(prev => ({ ...prev, feedback: displayText }))
         }
 
         recognition.onerror = (event: SpeechRecognitionErrorEvent) => {
@@ -117,13 +186,13 @@ export const FeedbackDialog = ({ isOpen, onClose, hideUrl = false }: FeedbackDia
             setIsRecording(false)
           }
           lastFinalLengthRef.current = finalTranscriptRef.current.length
-          setFeedback(finalTranscriptRef.current.trim())
+          updateForm(prev => ({ ...prev, feedback: finalTranscriptRef.current.trim() }))
         }
 
         recognitionRef.current = recognition
       }
     }
-  }, [locale])
+  }, [locale, updateForm])
 
   const handleToggleRecording = () => {
     if (!recognitionRef.current) return
@@ -143,8 +212,10 @@ export const FeedbackDialog = ({ isOpen, onClose, hideUrl = false }: FeedbackDia
 
   useEffect(() => {
     if (!isOpen) {
-      setFeedback('')
-      setIsAnonymous(false)
+      updateForm(prev => ({
+        ...prev,
+        feedback: '',
+      }))
       finalTranscriptRef.current = ''
       lastFinalLengthRef.current = 0
       if (recognitionRef.current && isRecording) {
@@ -153,123 +224,111 @@ export const FeedbackDialog = ({ isOpen, onClose, hideUrl = false }: FeedbackDia
         setIsRecording(false)
       }
     }
-  }, [isOpen, isRecording])
-
-  const handleSubmit = async () => {
-    if (!feedback.trim()) return
-
-    const feedbackData: {
-      url?: string,
-      feedback: string,
-      timestamp: string,
-      username: string,
-      userId?: string,
-    } = {
-      feedback: feedback.trim(),
-      timestamp: new Date().toISOString(),
-      username: isAnonymous ? 'Anonymous' : (user?.name || 'Unknown User'),
-      userId: user?.id,
-    }
+  }, [isOpen, isRecording, updateForm])
 
-    if (!hideUrl) {
-      feedbackData.url = typeof window !== 'undefined' ? window.location.href : ''
-    }
-
-    try {
-      const response = await fetch('/api/feedback', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(feedbackData),
-      })
-
-      if (response.ok) {
-        setFeedback('')
-        setIsAnonymous(false)
-        onClose()
-      }
-    } catch {
-      void 0
+  useEffect(() => {
+    if (isOpen && user) {
+      updateForm(prev => ({
+        ...prev,
+        username: isAnonymous ? 'Anonymous' : (user.name || 'Unknown User'),
+        userId: isAnonymous ? undefined : user.id,
+      }))
     }
-  }
+  }, [isOpen, user, updateForm, isAnonymous])
 
   return (
-    <Dialog
-      isOpen={isOpen}
-      onClose={onClose}
-      titleElement={translation('feedback') ?? 'Feedback'}
-      description={translation('feedbackDescription') ?? 'Share your feedback, report bugs, or suggest improvements.'}
-    >
-      <div className="flex flex-col gap-4">
-        {!hideUrl && (
-          <FormElementWrapper label={translation('url') ?? 'URL'}>
-            {() => (
-              <div className="text-description text-sm break-all">
-                {typeof window !== 'undefined' ? window.location.href : ''}
-              </div>
+    <FormProvider state={form}>
+      <Dialog
+        isOpen={isOpen}
+        onClose={onClose}
+        titleElement={translation('feedback') ?? 'Feedback'}
+        description={translation('feedbackDescription') ?? 'Share your feedback, report bugs, or suggest improvements.'}
+      >
+        <form onSubmit={event => { event.preventDefault(); form.submit() }}>
+          <div className="flex flex-col gap-4">
+            {!hideUrl && (
+              <FormField<FeedbackFormValues, 'url'>
+                name="url"
+                label={translation('url')}
+              >
+                {({ dataProps }) => (
+                  <div className="text-description text-sm break-all">
+                    {dataProps.value || (typeof window !== 'undefined' ? window.location.href : '')}
+                  </div>
+                )}
+              </FormField>
             )}
-          </FormElementWrapper>
-        )}
-
-        <FormElementWrapper label="">
-          {() => (
-            <div className="flex items-center gap-2">
-              <Checkbox
-                checked={isAnonymous}
-                onCheckedChange={setIsAnonymous}
-              />
-              <span className="text-sm text-description">
-                {translation('submitAnonymously') ?? 'Submit anonymously'}
-              </span>
-            </div>
-          )}
-        </FormElementWrapper>
-
-        <FormElementWrapper label={translation('feedback') ?? 'Feedback'}>
-          {() => (
-            <div className="relative">
-              <Textarea
-                value={feedback}
-                onChange={(e) => setFeedback(e.target.value)}
-                placeholder={translation('enterFeedback') ?? 'Enter your feedback here...'}
-                rows={6}
-                className="pr-12 pb-3"
-              />
-              {isSupported && (
-                <button
-                  type="button"
-                  onClick={handleToggleRecording}
-                  className={clsx(
-                    'absolute bottom-3 right-3 flex items-center justify-center w-8 h-8 rounded-full hover:rounded-full transition-all',
-                    isRecording ? 'text-negative hover:text-negative hover:bg-negative/10' : 'text-description hover:text-on-background hover:bg-surface-subdued'
+
+            <FormField<FeedbackFormValues, 'isAnonymous'>
+              name="isAnonymous"
+              label={translation('submissionDetails')}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => (
+                <div className="flex-col-2 gap-2">
+                  <span className="text-description">
+                    {translation('submittingAs', { name: submissionName })}
+                  </span>
+                  <div className="flex items-center gap-1">
+                    <Checkbox
+                      {...dataProps}
+                      {...focusableElementProps}
+                      {...interactionStates}
+                      size="sm"
+                    />
+                    <span className="text-description">
+                      {translation('anonymousSubmission')}
+                    </span>
+                  </div>
+                </div>
+              )}
+            </FormField>
+
+            <FormField<FeedbackFormValues, 'feedback'>
+              name="feedback"
+              label={translation('feedback')}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => (
+                <div className="relative">
+                  <Textarea
+                    {...dataProps} {...focusableElementProps} {...interactionStates}
+                    value={dataProps.value || ''}
+                    placeholder={translation('enterFeedback')}
+                    rows={6}
+                    className="pr-12 pb-3"
+                  />
+                  {isSupported && (
+                    <Button
+                      color={isRecording ? 'negative' : 'primary'}
+                      coloringStyle={isRecording ? 'solid' : 'tonal'}
+                      onClick={handleToggleRecording}
+                      className="absolute bottom-3 right-3 rounded-full"
+                      title={isRecording ? translation('stopRecording') : translation('startRecording')}
+                    >
+                      {isRecording ? <Pause className="size-4" /> : <Mic className="size-4" />}
+                    </Button>
                   )}
-                  title={isRecording ? translation('stopRecording') ?? 'Stop Recording' : translation('startRecording') ?? 'Start Recording'}
-                >
-                  {isRecording ? <Pause className="size-4" /> : <Mic className="size-4" />}
-                </button>
+                </div>
               )}
+            </FormField>
+
+            <div className="flex-row-2 justify-end gap-2">
+              <Button
+                color="neutral"
+                coloringStyle="outline"
+                onClick={onClose}
+              >
+                {translation('cancel')}
+              </Button>
+              <Button
+                color="primary"
+                onClick={() => form.submit()}
+              >
+                {translation('submit')}
+              </Button>
             </div>
-          )}
-        </FormElementWrapper>
-
-        <div className="flex-row-2 justify-end gap-2">
-          <Button
-            color="neutral"
-            coloringStyle="outline"
-            onClick={onClose}
-          >
-            {translation('cancel') ?? 'Cancel'}
-          </Button>
-          <Button
-            color="primary"
-            onClick={handleSubmit}
-            disabled={!feedback.trim()}
-          >
-            {translation('submit') ?? 'Submit'}
-          </Button>
-        </div>
-      </div>
-    </Dialog>
+          </div>
+        </form>
+      </Dialog>
+    </FormProvider>
   )
 }
diff --git a/web/components/Notifications.tsx b/web/components/Notifications.tsx
index 76e86361..60447b41 100644
--- a/web/components/Notifications.tsx
+++ b/web/components/Notifications.tsx
@@ -1,5 +1,5 @@
-import { useEffect, useMemo, useState, useRef } from 'react'
-import { Button, Chip, useLocalStorage } from '@helpwave/hightide'
+import { useEffect, useMemo } from 'react'
+import { Button, Chip, PopUp, PopUpContext, PopUpOpener, PopUpRoot, Tooltip, useLocalStorage, Visibility } from '@helpwave/hightide'
 import { Bell } from 'lucide-react'
 import { useGetOverviewDataQuery } from '@/api/gql/generated'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
@@ -21,8 +21,6 @@ export const Notifications = () => {
   const translation = useTasksTranslation()
   const router = useRouter()
   const { user } = useTasksContext()
-  const [isOpen, setIsOpen] = useState(false)
-  const containerRef = useRef<HTMLDivElement>(null)
   const { data, refetch } = useGetOverviewDataQuery(undefined, {
     refetchOnWindowFocus: true,
   })
@@ -60,21 +58,6 @@ export const Notifications = () => {
     return () => clearInterval(interval)
   }, [refetch])
 
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (containerRef.current && !containerRef.current.contains(event.target as Node)) {
-        setIsOpen(false)
-      }
-    }
-
-    if (isOpen) {
-      document.addEventListener('mousedown', handleClickOutside)
-      return () => {
-        document.removeEventListener('mousedown', handleClickOutside)
-      }
-    }
-  }, [isOpen])
-
   const notifications: NotificationItem[] = useMemo(() => {
     const items: NotificationItem[] = []
 
@@ -148,102 +131,102 @@ export const Notifications = () => {
     setReadNotifications(newReadSet)
   }
 
-  if (notifications.length === 0) {
-    return null
-  }
-
   return (
-    <div className="relative" ref={containerRef}>
-      <Button
-        coloringStyle="text"
-        layout="icon"
-        color="neutral"
-        onClick={() => setIsOpen(!isOpen)}
-        className="relative"
-      >
-        <Bell className="size-5" />
-        {unreadCount > 0 && (
-          <span className="absolute -top-1 -right-1 flex min-w-[18px] h-[18px] px-1 items-center justify-center rounded-full bg-primary text-on-primary text-[10px] font-bold leading-none">
-            {unreadCount > 9 ? '9+' : unreadCount}
-          </span>
-        )}
-      </Button>
-      {isOpen && (
-        <div className="absolute left-1/2 -translate-x-1/2 top-full mt-2 z-[300]">
-          <div className="max-h-96 overflow-y-auto w-80 border border-divider rounded-lg bg-surface relative">
-            <div className="absolute -top-2 right-4 w-4 h-4 bg-surface border-l border-t border-divider rotate-45"></div>
-            {notifications.length > 0 && (
-              <div className="px-4 py-2 border-b border-divider flex-row-2 justify-between items-center bg-surface">
-                <span className="typography-label-lg font-semibold">
-                  {translation('notifications') || 'Notifications'}
-                </span>
+    <PopUpRoot>
+      <PopUpContext.Consumer>
+        {({ isOpen }) => (
+          <Tooltip tooltip={translation('notifications')} disabled={isOpen}>
+            <PopUpOpener>
+              {({ props }) => (
                 <Button
-                  size="small"
+                  {...props}
                   coloringStyle="text"
+                  layout="icon"
                   color="neutral"
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    handleDismissAll()
-                  }}
                 >
-                  {translation('dismissAll') || 'Dismiss All'}
+                  <Bell className="size-5" />
+                  {unreadCount > 0 && (
+                    <span className="absolute -top-0.5 -right-0.5 flex-row-0 min-w-4.5 h-4.5 items-center justify-center rounded-full bg-primary text-on-primary text-xs font-bold leading-none">
+                      {unreadCount > 9 ? '9+' : unreadCount}
+                    </span>
+                  )}
                 </Button>
-              </div>
-            )}
-            <div>
-              {notifications.length > 0 ? (
-                notifications.map((notification, index) => {
-                  const isRead = readNotifications.has(notification.id)
-                  return (
-                    <div key={notification.id}>
-                      <div
-                        onClick={() => {
-                          handleNotificationClick(notification)
-                          setIsOpen(false)
-                        }}
-                        className={`block px-3 py-1.5 first:rounded-t-md last:rounded-b-md text-sm font-semibold text-nowrap text-left cursor-pointer hover:bg-primary/20 ${isRead ? 'opacity-60' : ''}`}
-                      >
-                        <div className="flex-row-2 items-start w-full">
-                          <div className="flex-col-1 flex-1 min-w-0">
-                            <div className="flex-row-2 items-center gap-2">
-                              <span className="typography-body-sm font-medium truncate">{notification.title}</span>
-                              <Chip
-                                size="small"
-                                color={notification.type === 'patient' ? 'primary' : 'neutral'}
-                              >
-                                {notification.type === 'patient'
-                                  ? (translation('patient') || 'Patient')
-                                  : (translation('task') || 'Task')}
-                              </Chip>
-                            </div>
-                            <span className="typography-body-xs text-description truncate">
-                              {notification.subtitle}
-                              {notification.date && (
-                                <> • <SmartDate date={notification.date} showTime={true} /></>
-                              )}
-                            </span>
-                          </div>
-                          {!isRead && (
-                            <div className="w-2 h-2 rounded-full bg-primary flex-shrink-0 mt-1.5" />
-                          )}
+              )}
+            </PopUpOpener>
+          </Tooltip>
+        )}
+      </PopUpContext.Consumer>
+      <PopUp
+        options={{
+          horizontalAlignment: 'center'
+        }}
+        className="p-2"
+      >
+        <div className="flex-row-2 justify-between items-center">
+          <span className="typography-label-lg font-semibold">
+            {translation('notifications') || 'Notifications'}
+          </span>
+          <Button
+            size="sm"
+            coloringStyle="text"
+            color="neutral"
+            onClick={() => handleDismissAll()}
+            className="text-nowrap"
+            disabled={notifications.length === 0}
+          >
+            {translation('dismissAll') || 'Dismiss All'}
+          </Button>
+        </div>
+        <Visibility isVisible={notifications.length === 0}>
+          <div className="px-4 py-8 text-center text-description">
+            {translation('noNotifications') || 'No recent updates'}
+          </div>
+        </Visibility>
+        <Visibility isVisible={notifications.length > 0}>
+          {notifications.map((notification) => {
+            const isRead = readNotifications.has(notification.id)
+            return (
+              <PopUpContext.Consumer key={notification.id}>
+                {({ setIsOpen }) => (
+                  <div
+                    onClick={() => {
+                      handleNotificationClick(notification)
+                      setIsOpen(false)
+                    }}
+                    className={`block px-3 py-1.5 text-sm font-semibold text-nowrap text-left cursor-pointer hover:bg-primary/20 ${isRead ? 'opacity-60' : ''} border-b last:border-b-0 border-divider last:rounded-b-md`}
+                  >
+                    <div className="flex-row-2 items-start w-full">
+                      <div className="flex-col-1 flex-1 min-w-0">
+                        <div className="flex-row-2 items-center gap-2">
+                          <Chip
+                            size="xs"
+                            color={notification.type === 'patient' ? 'primary' : 'neutral'}
+                          >
+                            {notification.type === 'patient'
+                              ? (translation('patient') || 'Patient')
+                              : (translation('task') || 'Task')}
+                          </Chip>
+                          <span className="typography-body-sm font-medium truncate">{notification.title}</span>
                         </div>
+                        <span className="typography-body-xs text-description truncate">
+                          {notification.subtitle}
+                          {notification.date && (
+                            <> • <SmartDate date={notification.date} showTime={true} /></>
+                          )}
+                        </span>
                       </div>
-                      {index < notifications.length - 1 && (
-                        <div className="border-b border-divider" />
+                      {!isRead && (
+                        <div className="w-2 h-2 rounded-full bg-primary flex-shrink-0 mt-1.5" />
                       )}
                     </div>
-                  )
-                })
-              ) : (
-                <div className="px-4 py-8 text-center text-description">
-                  {translation('noNotifications') || 'No recent updates'}
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
+                  </div>
+                )}
+              </PopUpContext.Consumer>
+            )
+          })}
+        </Visibility>
+      </PopUp>
+    </PopUpRoot>
   )
 }
 
diff --git a/web/components/PropertyEntry.tsx b/web/components/PropertyEntry.tsx
deleted file mode 100644
index 3d45d325..00000000
--- a/web/components/PropertyEntry.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-  CheckboxProperty,
-  DateProperty,
-  MultiSelectProperty,
-  NumberProperty,
-  SelectOption,
-  SingleSelectProperty,
-  TextProperty
-} from '@helpwave/hightide'
-import type { PropertyFieldType, PropertySelectOption, PropertyValue } from '@/components/PropertyList'
-
-type PropertyEntrySelectProps = {
-  onAddOption?: (name: string) => void,
-  options: PropertySelectOption[],
-}
-
-type PropertyEntryProps = {
-  value: PropertyValue,
-  name: string,
-  fieldType: PropertyFieldType,
-  onChange: (value: PropertyValue) => void,
-  onEditComplete: (value: PropertyValue) => void,
-  selectData?: PropertyEntrySelectProps,
-  onRemove?: () => void,
-  readOnly?: boolean,
-}
-
-// TODO move to hightide
-export const PropertyEntry = ({
-                                value,
-                                name,
-                                fieldType,
-                                onChange,
-                                onEditComplete,
-                                selectData,
-                                onRemove,
-                                readOnly,
-                              }: PropertyEntryProps) => {
-  const commonProps = {
-    name,
-    onRemove,
-    readOnly,
-  }
-
-  if (['singleSelect', 'multiSelect'].includes(fieldType) && !selectData) {
-    throw new Error('PropertyEntry: When using a SingleSelect or MultiSelect field type selectData must be provided')
-  }
-
-  switch (fieldType) {
-    case 'text':
-      return (
-        <TextProperty
-          name={commonProps.name}
-          readOnly={commonProps.readOnly}
-          value={value.textValue ?? ''}
-          onChange={textValue => onChange({ ...value, textValue: textValue ?? '' })}
-          onEditComplete={textValue => onEditComplete({ ...value, textValue: textValue ?? '' })}
-          onRemove={onRemove}
-        />
-      )
-    case 'number':
-      return (
-        <NumberProperty
-          {...commonProps}
-          value={value.numberValue}
-          onChange={numberValue => onChange({ ...value, numberValue })}
-          onEditComplete={numberValue => onEditComplete({ ...value, numberValue })}
-        />
-      )
-    case 'date':
-      return (
-        <DateProperty
-          {...commonProps}
-          value={value.dateValue}
-          onChange={dateValue => onChange({ ...value, dateValue })}
-          onEditComplete={dateValue => onEditComplete({ ...value, dateValue })}
-        />
-      )
-    case 'dateTime':
-      return (
-        <DateProperty
-          {...commonProps}
-          value={value.dateTimeValue}
-          onChange={dateTimeValue => onChange({ ...value, dateTimeValue })}
-          onEditComplete={dateTimeValue => onEditComplete({ ...value, dateTimeValue })}
-        />
-      )
-    case 'checkbox':
-      return (
-        <CheckboxProperty
-          {...commonProps}
-          value={value.boolValue}
-          onChange={boolValue => onChange({ ...value, boolValue })}
-        />
-      )
-    case 'singleSelect':
-      return (
-        <SingleSelectProperty
-          {...commonProps}
-          value={value.singleSelectValue}
-          onValueChanged={singleSelectValue => {
-            const newProperty = { ...value, singleSelectValue }
-            onChange(newProperty)
-            onEditComplete(newProperty)
-          }}
-          onAddNew={selectData?.onAddOption}
-        >
-          {selectData?.options.map(option => (
-              <SelectOption key={option.id} value={option.id}>
-                {option.name}
-              </SelectOption>
-            ))
-          }
-        </SingleSelectProperty>
-      )
-    case 'multiSelect':
-      return (
-        <MultiSelectProperty
-          {...commonProps}
-          values={value.multiSelectValue ?? []}
-          onValuesChanged={multiSelectValue => {
-            const newProperty = { ...value, multiSelectValue }
-            onChange(newProperty)
-            onEditComplete(newProperty)
-          }}
-        >
-          {selectData?.options.map(option => (
-            <SelectOption key={option.id} value={option.id}>
-              {option.name}
-            </SelectOption>
-          ))
-          }
-        </MultiSelectProperty>
-      )
-    default:
-
-      return <></>
-  }
-}
diff --git a/web/components/UserInfoPopup.tsx b/web/components/UserInfoPopup.tsx
index 081ded46..4e7beb8b 100644
--- a/web/components/UserInfoPopup.tsx
+++ b/web/components/UserInfoPopup.tsx
@@ -51,7 +51,7 @@ export const UserInfoPopup: React.FC<UserInfoPopupProps> = ({ userId, isOpen, on
       GET_USER_QUERY,
       { id: userId! }
     )(),
-    enabled: isOpen && !!userId,
+    enabled: !!userId,
   })
 
   const user = data?.user
@@ -62,8 +62,7 @@ export const UserInfoPopup: React.FC<UserInfoPopupProps> = ({ userId, isOpen, on
       onClose={onClose}
       titleElement={translation('userInformation')}
       description=""
-      className={clsx('w-96 z-50')}
-      backgroundClassName="z-40"
+      className={clsx('w-96')}
       isModal={true}
     >
       <div onClick={(e) => e.stopPropagation()} onMouseDown={(e) => e.stopPropagation()}>
@@ -74,8 +73,7 @@ export const UserInfoPopup: React.FC<UserInfoPopupProps> = ({ userId, isOpen, on
             <div className="flex-col-4">
               <div className="flex items-center gap-3">
                 <AvatarStatusComponent
-                  size="xl"
-                  fullyRounded={true}
+                  size="lg"
                   isOnline={user.isOnline}
                   image={user.avatarUrl ? {
                     avatarUrl: user.avatarUrl,
diff --git a/web/components/layout/Page.tsx b/web/components/layout/Page.tsx
index 68d6daab..b76aa457 100644
--- a/web/components/layout/Page.tsx
+++ b/web/components/layout/Page.tsx
@@ -8,7 +8,9 @@ import Link from 'next/link'
 import {
   Button,
   Dialog,
-  Expandable,
+  ExpandableContent,
+  ExpandableHeader,
+  ExpandableRoot,
   MarkdownInterpreter,
   Tooltip,
   useLocalStorage
@@ -320,8 +322,9 @@ type HeaderProps = HTMLAttributes<HTMLHeadElement> & {
 export const Header = ({ onMenuClick, isMenuOpen, ...props }: HeaderProps) => {
   const router = useRouter()
   const { user } = useTasksContext()
+  const translation = useTasksTranslation()
   const [isFeedbackOpen, setIsFeedbackOpen] = useState(false)
-  const [selectedUserId, setSelectedUserId] = useState<string | null>(null)
+  const [isUserInfoOpen, setIsUserInfoOpen] = useState(false)
 
   return (
     <>
@@ -345,43 +348,41 @@ export const Header = ({ onMenuClick, isMenuOpen, ...props }: HeaderProps) => {
         </div>
         <div className="flex-row-2 justify-end items-center gap-x-2">
           <RootLocationSelector className="hidden sm:flex" />
-          <div className="flex-row-0">
-            <Notifications />
-          </div>
-          <div className="flex-row-0">
+          <Notifications />
+          <Tooltip tooltip={translation('feedback')}>
             <Button coloringStyle="text" layout="icon" color="neutral" onClick={() => setIsFeedbackOpen(true)}>
               <MessageSquare />
             </Button>
-          </div>
-          <div className="flex-row-0">
+          </Tooltip>
+          <Tooltip tooltip={translation('settings')}>
             <Button coloringStyle="text" layout="icon" color="neutral" onClick={() => router.push('/settings')}>
               <SettingsIcon />
             </Button>
-          </div>
+          </Tooltip>
           <Tooltip tooltip={user?.isOnline ? 'Online' : 'Offline'}>
-            <button
-              onClick={() => user?.id && setSelectedUserId(user.id)}
-              className="flex-row-1.5 items-center gap-x-1.75 hover:opacity-75 transition-opacity"
+            <Button
+              onClick={() => setIsUserInfoOpen(!!user?.id)}
+              coloringStyle="text"
+              color="neutral"
             >
               <span className="hidden sm:inline typography-title-sm">{user?.name}</span>
               <AvatarStatusComponent
-                size="lg"
-                fullyRounded={true}
+                size="sm"
                 isOnline={user?.isOnline ?? null}
                 image={user?.avatarUrl ? {
                   avatarUrl: user.avatarUrl,
                   alt: user.name
                 } : undefined}
               />
-            </button>
+            </Button>
           </Tooltip>
         </div>
       </header>
       <FeedbackDialog isOpen={isFeedbackOpen} onClose={() => setIsFeedbackOpen(false)} />
       <UserInfoPopup
-        userId={selectedUserId}
-        isOpen={!!selectedUserId}
-        onClose={() => setSelectedUserId(null)}
+        userId={user?.id ?? null}
+        isOpen={isUserInfoOpen}
+        onClose={() => setIsUserInfoOpen(false)}
       />
     </>
   )
@@ -398,7 +399,7 @@ const SidebarLink = ({ children, ...props }: SidebarLinkProps) => {
     <Link
       {...props}
       className={clsx(
-        'flex-row-1.5 w-full px-2.5 py-1.5 items-center rounded-md hover:bg-black/30',
+        'flex-row-1.5 w-full px-2.5 py-1.5 items-center rounded-md hover:bg-surface-hover',
         { 'text-primary font-bold': route === props.href },
         props.className
       )}
@@ -429,7 +430,7 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
       <aside
         {...props}
         className={clsx(
-          'flex-col-4 w-50 min-w-56 rounded-lg bg-surface text-on-surface overflow-hidden p-2.5 shadow-md',
+          'flex-col-4 w-50 min-w-56 rounded-lg bg-surface text-on-surface overflow-hidden shadow-md',
           'fixed lg:relative inset-y-0 z-50 lg:z-auto',
           'w-screen max-w-sm lg:w-50 lg:min-w-56',
           'transform transition-transform duration-300 ease-out',
@@ -441,7 +442,7 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
           props.className
         )}
       >
-        <nav className="flex-col-2 overflow-auto flex-1">
+        <nav className="flex-col-2 overflow-auto flex-1 p-2.5">
           <div className="flex items-center justify-between mb-8">
             <Link href="/" className="flex-row-1 text-primary items-center rounded-lg p-2" onClick={onClose}>
               <TasksLogo />
@@ -480,18 +481,10 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
           </SidebarLink>
 
           {context?.teams && context.teams.length > 0 && (
-            <Expandable
-              label={(
-                <div className="flex-row-2">
-                  <Users className="size-5" />
-                  {translation('teams')}
-                </div>
-              )}
-              headerClassName="!px-2.5 !py-1.5 hover:bg-black/30"
-              contentClassName="!px-0 !pb-0 gap-y-0"
-              className="!shadow-none"
+            <ExpandableRoot
+              className="shadow-none"
               isExpanded={context.sidebar.isShowingTeams}
-              onChange={isExpanded => context.update(prevState => ({
+              onExpandedChange={isExpanded => context.update(prevState => ({
                 ...prevState,
                 sidebar: {
                   ...prevState.sidebar,
@@ -499,27 +492,27 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
                 }
               }))}
             >
-              {context.teams.map(team => (
-                <SidebarLink key={team.id} href={`${locationRoute}/${team.id}`} className="pl-9.5" onClick={onClose}>
-                  {team.title}
-                </SidebarLink>
-              ))}
-            </Expandable>
+              <ExpandableHeader className="px-2.5 py-1.5">
+                <div className="flex-row-2">
+                  <Users className="size-5" />
+                  {translation('teams')}
+                </div>
+              </ExpandableHeader>
+              <ExpandableContent className="gap-y-0 pl-4 p-0">
+                {context.teams.map(team => (
+                  <SidebarLink key={team.id} href={`${locationRoute}/${team.id}`} onClick={onClose}>
+                    {team.title}
+                  </SidebarLink>
+                ))}
+              </ExpandableContent>
+            </ExpandableRoot>
           )}
 
           {context?.wards && context.wards.length > 0 && (
-            <Expandable
-              label={(
-                <div className="flex-row-2">
-                  <Building2 className="size-5" />
-                  {translation('wards')}
-                </div>
-              )}
-              headerClassName="!px-2.5 !py-1.5 hover:bg-black/30"
-              contentClassName="!px-0 !pb-0 gap-y-0"
-              className="!shadow-none"
+            <ExpandableRoot
+              className="shadow-none"
               isExpanded={context.sidebar.isShowingWards}
-              onChange={isExpanded => context.update(prevState => ({
+              onExpandedChange={isExpanded => context.update(prevState => ({
                 ...prevState,
                 sidebar: {
                   ...prevState.sidebar,
@@ -527,27 +520,27 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
                 }
               }))}
             >
-              {context.wards.map(ward => (
-                <SidebarLink key={ward.id} href={`${locationRoute}/${ward.id}`} className="pl-9.5" onClick={onClose}>
-                  {ward.title}
-                </SidebarLink>
-              ))}
-            </Expandable>
+              <ExpandableHeader className="px-2.5 py-1.5">
+                <div className="flex-row-2">
+                  <Building2 className="size-5" />
+                  {translation('wards')}
+                </div>
+              </ExpandableHeader>
+              <ExpandableContent className="gap-y-0 pl-4 p-0">
+                {context.wards.map(ward => (
+                  <SidebarLink key={ward.id} href={`${locationRoute}/${ward.id}`} onClick={onClose}>
+                    {ward.title}
+                  </SidebarLink>
+                ))}
+              </ExpandableContent>
+            </ExpandableRoot>
           )}
 
           {context?.clinics && context.clinics.length > 0 && (
-            <Expandable
-              label={(
-                <div className="flex-row-2">
-                  <Hospital className="size-5" />
-                  {translation('clinics')}
-                </div>
-              )}
-              headerClassName="!px-2.5 !py-1.5 hover:bg-black/30"
-              contentClassName="!px-0 !pb-0 gap-y-0"
-              className="!shadow-none"
+            <ExpandableRoot
+              className="shadow-none"
               isExpanded={context.sidebar.isShowingClinics}
-              onChange={isExpanded => context.update(prevState => ({
+              onExpandedChange={isExpanded => context.update(prevState => ({
                 ...prevState,
                 sidebar: {
                   ...prevState.sidebar,
@@ -555,12 +548,20 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
                 }
               }))}
             >
-              {context.clinics.map(clinic => (
-                <SidebarLink key={clinic.id} href={`${locationRoute}/${clinic.id}`} className="pl-9.5" onClick={onClose}>
-                  {clinic.title}
-                </SidebarLink>
-              ))}
-            </Expandable>
+              <ExpandableHeader className="px-2.5 py-1.5">
+                <div className="flex-row-2">
+                  <Hospital className="size-5" />
+                  {translation('clinics')}
+                </div>
+              </ExpandableHeader>
+              <ExpandableContent className="gap-y-0 pl-4 p-0">
+                {context.clinics.map(clinic => (
+                  <SidebarLink key={clinic.id} href={`${locationRoute}/${clinic.id}`} onClick={onClose}>
+                    {clinic.title}
+                  </SidebarLink>
+                ))}
+              </ExpandableContent>
+            </ExpandableRoot>
           )}
         </nav>
         <div className="mt-auto pt-4 border-t border-on-surface/20 sm:hidden">
@@ -587,7 +588,7 @@ export const Page = ({
   })
 
   return (
-    <div className="flex-row-8 h-screen w-screen overflow-hidden overflow-x-hidden">
+    <div className="flex-row-0 h-screen w-screen overflow-hidden overflow-x-hidden">
       <Head>
         <title>{titleWrapper(pageTitle)}</title>
       </Head>
@@ -600,14 +601,14 @@ export const Page = ({
       />
       <div
         ref={mainContentRef as React.RefObject<HTMLDivElement>}
-        className="flex-col-4 grow overflow-y-scroll"
+        className="flex-col-4 pl-8 grow overflow-y-scroll"
       >
         <Header
-          className="sticky top-0 right-0 py-4 pr-4 bg-background text-on-background"
+          className="sticky top-0 right-0 p-4 bg-background text-on-background"
           onMenuClick={() => setIsSidebarOpen(!isSidebarOpen)}
           isMenuOpen={isSidebarOpen}
         />
-        <main className="flex-col-2 grow pr-4 px-4 lg:px-0">
+        <main className="flex-col-2 grow pr-4 px-4">
           {children}
           <div className="min-h-16" />
         </main>
diff --git a/web/components/layout/SidePanel.tsx b/web/components/layout/SidePanel.tsx
deleted file mode 100644
index 7adbe085..00000000
--- a/web/components/layout/SidePanel.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import type { ReactNode } from 'react'
-import { useRef } from 'react'
-import { useEffect, useState } from 'react'
-import { createPortal } from 'react-dom'
-import { X } from 'lucide-react'
-import clsx from 'clsx'
-import { Button, useFocusTrap, useZIndexRegister } from '@helpwave/hightide'
-
-interface SidePanelProps {
-  isOpen: boolean,
-  onClose: () => void,
-  title: ReactNode,
-  children: ReactNode,
-}
-
-export const SidePanel = ({ isOpen, onClose, title, children }: SidePanelProps) => {
-  const [isVisible, setIsVisible] = useState(isOpen)
-  const ref = useRef<HTMLDivElement | null>(null)
-
-  useEffect(() => {
-    if (isOpen) setIsVisible(true)
-  }, [isOpen])
-
-  const handleAnimationEnd = () => {
-    if (!isOpen) setIsVisible(false)
-  }
-  const zIndex = useZIndexRegister(isOpen)
-
-  useFocusTrap({
-    active: isOpen,
-    container: ref,
-  })
-
-  return createPortal(
-    <div
-      ref={ref}
-      className="fixed inset-0 overflow-hidden"
-      style={{ zIndex }}
-      hidden={!isVisible}
-    >
-      <div
-        className={clsx(
-          'absolute inset-0 bg-overlay-shadow transition-opacity duration-300',
-          isOpen ? 'opacity-100' : 'opacity-0'
-        )}
-        onClick={onClose}
-      />
-      <div
-        className={clsx(
-          'absolute inset-y-0 right-0 flex max-w-full lg:pl-10 pointer-events-none'
-        )}
-      >
-        <div
-          className={clsx(
-            'pointer-events-auto w-screen lg:w-[60vw] transform transition-transform duration-300 ease-in-out',
-            isOpen ? 'translate-x-0' : 'translate-x-full'
-          )}
-          onTransitionEnd={handleAnimationEnd}
-        >
-          <div className="flex h-full flex-col bg-surface text-on-surface shadow-xl">
-            <div className="flex items-center justify-between px-4 py-3 sm:px-6 border-b border-divider min-h-[56px]">
-              {title && <div className="text-lg font-medium flex-1">{title}</div>}
-              <div className="ml-auto">
-                <Button color="neutral" layout="icon" coloringStyle="text" onClick={onClose}>
-                  <X className="h-6 w-6" />
-                </Button>
-              </div>
-            </div>
-            <div className="relative flex-1 px-4 py-6 sm:px-6 overflow-y-auto flex flex-col">
-              {isVisible && children}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>,
-    document.body
-  )
-}
diff --git a/web/components/locations/LocationSelectionDialog.tsx b/web/components/locations/LocationSelectionDialog.tsx
index 26403ce3..c454eb6c 100644
--- a/web/components/locations/LocationSelectionDialog.tsx
+++ b/web/components/locations/LocationSelectionDialog.tsx
@@ -104,9 +104,9 @@ const LocationTreeItem = ({
           className="flex-shrink-0"
         >
           <Checkbox
-            checked={isSelected}
+            value={isSelected}
             indeterminate={isIndeterminate}
-            onCheckedChange={handleCheck}
+            onValueChange={handleCheck}
             onClick={(e) => e.stopPropagation()}
             onMouseDown={(e) => e.stopPropagation()}
           />
@@ -457,18 +457,18 @@ export const LocationSelectionDialog = ({
         <div className="flex items-center gap-2">
           <MapPin className="size-6 text-primary" />
           {useCase === 'clinic' ? translation('pickClinic') :
-           useCase === 'position' ? translation('pickPosition') :
-           useCase === 'teams' ? translation('pickTeams') :
-           useCase === 'root' ? translation('selectRootLocation') :
-           translation('selectLocation')}
+            useCase === 'position' ? translation('pickPosition') :
+              useCase === 'teams' ? translation('pickTeams') :
+                useCase === 'root' ? translation('selectRootLocation') :
+                  translation('selectLocation')}
         </div>
       )}
       description={
         useCase === 'clinic' ? translation('pickClinicDescription') :
-        useCase === 'position' ? translation('pickPositionDescription') :
-        useCase === 'teams' ? translation('pickTeamsDescription') :
-        useCase === 'root' ? translation('selectRootLocationDescription') :
-        translation('selectLocationDescription')
+          useCase === 'position' ? translation('pickPositionDescription') :
+            useCase === 'teams' ? translation('pickTeamsDescription') :
+              useCase === 'root' ? translation('selectRootLocationDescription') :
+                translation('selectLocationDescription')
       }
       className="w-[600px] h-[80vh] flex flex-col max-w-full"
     >
@@ -485,20 +485,20 @@ export const LocationSelectionDialog = ({
           </div>
 
           <div className="flex gap-1 border-l border-divider pl-2 ml-1">
-            <Button layout="icon" size="small" onClick={handleExpandAll} title={translation('expandAll')}>
+            <Button layout="icon" size="sm" onClick={handleExpandAll} title={translation('expandAll')}>
               <ChevronsDown className="size-4" />
             </Button>
-            <Button layout="icon" size="small" onClick={handleCollapseAll} title={translation('collapseAll')}>
+            <Button layout="icon" size="sm" onClick={handleCollapseAll} title={translation('collapseAll')}>
               <ChevronsUp className="size-4" />
             </Button>
           </div>
 
           {multiSelect && useCase !== 'root' && (
             <div className="flex gap-1 border-l border-divider pl-2">
-              <Button layout="icon" size="small" onClick={handleSelectAll} title={translation('selectAll')}>
+              <Button layout="icon" size="sm" onClick={handleSelectAll} title={translation('selectAll')}>
                 <CheckSquare className="size-4" />
               </Button>
-              <Button layout="icon" size="small" onClick={handleDeselectAll} title={translation('deselectAll')}>
+              <Button layout="icon" size="sm" onClick={handleDeselectAll} title={translation('deselectAll')}>
                 <Square className="size-4" />
               </Button>
             </div>
diff --git a/web/components/patients/LocationChips.tsx b/web/components/patients/LocationChips.tsx
index 513eacba..78613150 100644
--- a/web/components/patients/LocationChips.tsx
+++ b/web/components/patients/LocationChips.tsx
@@ -4,6 +4,8 @@ import { formatLocationPath } from '@/utils/location'
 import Link from 'next/link'
 import type { LocationType } from '@/api/gql/generated'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import type { HTMLAttributes } from 'react'
+import clsx from 'clsx'
 
 type PartialLocationNode = {
   id: string,
@@ -12,41 +14,32 @@ type PartialLocationNode = {
   parent?: PartialLocationNode | null,
 }
 
-interface LocationChipsProps {
+interface LocationChipsProps extends HTMLAttributes<HTMLDivElement> {
   locations: PartialLocationNode[],
   disableLink?: boolean,
   small?: boolean,
+  placeholderProps?: HTMLAttributes<HTMLSpanElement>,
 }
 
-const getKindStyles = (kind: string | undefined) => {
-  if (!kind) return 'bg-surface-subdued text-text-tertiary'
-  const k = kind.toUpperCase()
-  if (k === 'HOSPITAL') return 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300'
-  if (k === 'PRACTICE') return 'bg-indigo-100 text-indigo-700 dark:bg-indigo-900/30 dark:text-indigo-300'
-  if (k === 'CLINIC') return 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-300'
-  if (k === 'TEAM') return 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-300'
-  if (k === 'WARD') return 'bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-300'
-  if (k === 'ROOM') return 'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300'
-  if (k === 'BED') return 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-300'
-  return 'bg-surface-subdued text-text-tertiary'
+const getKindStyles = (kind: LocationType | undefined) => {
+  if (kind === 'HOSPITAL') return 'not-print:location-hospital not-print:coloring-solid'
+  if (kind === 'PRACTICE') return 'not-print:location-practice not-print:coloring-solid'
+  if (kind === 'CLINIC') return 'not-print:location-clinic not-print:coloring-solid'
+  if (kind === 'TEAM') return 'not-print:location-team not-print:coloring-solid'
+  if (kind === 'WARD') return 'not-print:location-ward not-print:coloring-solid'
+  if (kind === 'ROOM') return 'not-print:location-room not-print:coloring-solid'
+  if (kind === 'BED') return 'not-print:location-bed not-print:coloring-solid'
+  return ''
 }
 
-export const LocationChips = ({ locations, disableLink = false, small = false }: LocationChipsProps) => {
+export const LocationChips = ({ locations, disableLink = false, small = false, placeholderProps, ...props }: LocationChipsProps) => {
   const translation = useTasksTranslation()
 
-  if (locations.length === 0) {
-    return (
-      <span className="text-description text-sm">
-        Not assigned
-      </span>
-    )
-  }
-
   const firstLocation = locations[0]
-  if (!firstLocation) {
+  if (locations.length === 0 || !firstLocation) {
     return (
-      <span className="text-description text-sm">
-        Not assigned
+      <span  {...placeholderProps} className={clsx('text-description text-sm', placeholderProps?.className)}>
+        {translation('notAssigned')}
       </span>
     )
   }
@@ -56,12 +49,12 @@ export const LocationChips = ({ locations, disableLink = false, small = false }:
 
   const chipContent = (
     <Chip
-      size="small"
+      size="sm"
       color="neutral"
       className={`cursor-pointer hover:opacity-80 transition-opacity ${small ? 'text-xs' : ''}`}
     >
       <div className="flex items-center gap-1">
-        <MapPin className="size-3" />
+        <MapPin className="size-force-3 print:hidden" />
         <span>{firstLocation?.title}</span>
         {firstLocation?.kind && (
           <span className={`text-[10px] font-bold px-1.5 py-0.5 rounded uppercase tracking-wider ${getKindStyles(firstLocation.kind)}`}>
@@ -73,7 +66,14 @@ export const LocationChips = ({ locations, disableLink = false, small = false }:
   )
 
   return (
-    <div className="flex flex-wrap items-center gap-1.5" onClick={(e) => e.stopPropagation()}>
+    <div
+      {...props}
+      className={clsx('flex flex-wrap items-center gap-1.5', props.className)}
+      onClick={(e) => {
+        e.stopPropagation()
+        props.onClick?.(e)
+      }}
+    >
       <Tooltip
         tooltip={formatLocationPath(firstLocation)}
         position="top"
@@ -94,7 +94,7 @@ export const LocationChips = ({ locations, disableLink = false, small = false }:
           position="top"
         >
           <Chip
-            size="small"
+            size="sm"
             color="neutral"
             className={`cursor-help whitespace-pre-line ${small ? 'text-xs' : ''}`}
             onClick={(e) => e.stopPropagation()}
diff --git a/web/components/patients/PatientCardView.tsx b/web/components/patients/PatientCardView.tsx
index c0302320..13a8847b 100644
--- a/web/components/patients/PatientCardView.tsx
+++ b/web/components/patients/PatientCardView.tsx
@@ -4,7 +4,7 @@ import { LocationChips } from '@/components/patients/LocationChips'
 import { PatientStateChip } from '@/components/patients/PatientStateChip'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { Sex } from '@/api/gql/generated'
-import type { PatientViewModel } from './PatientList'
+import type { PatientViewModel } from '../tables/PatientList'
 
 type PatientCardViewProps = {
   patient: PatientViewModel,
@@ -60,8 +60,8 @@ export const PatientCardView = ({ patient, onClick }: PatientCardViewProps) => {
 
         <div className="flex flex-wrap items-center gap-2">
           <Chip
-            color={sex === Sex.Unknown ? 'neutral' : 'none'}
-            size="small"
+            color={sex === Sex.Unknown ? 'neutral' : undefined}
+            size="sm"
             className={`${colorClass} font-[var(--font-space-grotesk)] uppercase text-xs`}
           >
             <span>{label}</span>
diff --git a/web/components/patients/PatientDataEditor.tsx b/web/components/patients/PatientDataEditor.tsx
new file mode 100644
index 00000000..1960b72c
--- /dev/null
+++ b/web/components/patients/PatientDataEditor.tsx
@@ -0,0 +1,678 @@
+import { useState, useMemo, useEffect } from 'react'
+import type { FormFieldDataHandling } from '@helpwave/hightide'
+import { FormProvider, Input, DateTimeInput, Select, SelectOption, Textarea, Checkbox, Button, ConfirmDialog, LoadingContainer, useCreateForm, FormField, Visibility, useFormObserverKey } from '@helpwave/hightide'
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import type { CreatePatientInput, LocationNodeType, UpdatePatientInput, GetPatientQuery } from '@/api/gql/generated'
+import { Sex, PatientState, useGetLocationsQuery, useGetPatientQuery } from '@/api/gql/generated'
+import { Building2, CheckIcon, Locate, Users, XIcon } from 'lucide-react'
+import { formatLocationPath, formatLocationPathFromId } from '@/utils/location'
+import { toISODate } from './PatientDetailView'
+import { LocationSelectionDialog } from '@/components/locations/LocationSelectionDialog'
+import { useOptimisticCreatePatientMutation, useOptimisticAdmitPatientMutation, useOptimisticDischargePatientMutation, useOptimisticDeletePatientMutation, useOptimisticWaitPatientMutation, useOptimisticMarkPatientDeadMutation, useOptimisticUpdatePatientMutation } from '@/api/optimistic-updates/GetPatient'
+import { useTasksContext } from '@/hooks/useTasksContext'
+import { ErrorDialog } from '@/components/ErrorDialog'
+
+type PatientFormValues = Omit<CreatePatientInput, 'clinicId' | 'teamIds' | 'positionId'> & {
+  clinic: NonNullable<GetPatientQuery['patient']>['clinic'] | null,
+  teams?: NonNullable<GetPatientQuery['patient']>['teams'] | null,
+  position?: NonNullable<GetPatientQuery['patient']>['position'] | null,
+}
+
+interface PatientDataEditorProps {
+  id: null | string,
+  initialCreateData?: Partial<CreatePatientInput>,
+  onSuccess?: () => void,
+  onClose?: () => void,
+}
+
+const getDefaultBirthdate = () => {
+  const d = new Date()
+  d.setFullYear(d.getFullYear() - 18)
+  return toISODate(d)
+}
+
+const convertBirthdateStringToDate = (birthdate: string | null | undefined): Date | null => {
+  if (!birthdate) return null
+  return new Date(birthdate)
+}
+
+export const PatientDataEditor = ({
+  id,
+  initialCreateData = {},
+  onSuccess,
+  onClose,
+}: PatientDataEditorProps) => {
+  const translation = useTasksTranslation()
+  const { selectedLocationId, selectedRootLocationIds, rootLocations } = useTasksContext()
+  const firstSelectedRootLocationId = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds[0] : undefined
+
+  const [errorDialog, setErrorDialog] = useState<{ isOpen: boolean, message?: string }>({ isOpen: false })
+  const [isClinicDialogOpen, setIsClinicDialogOpen] = useState(false)
+  const [isPositionDialogOpen, setIsPositionDialogOpen] = useState(false)
+  const [isTeamsDialogOpen, setIsTeamsDialogOpen] = useState(false)
+  const [isMarkDeadDialogOpen, setIsMarkDeadDialogOpen] = useState(false)
+  const [isDischargeDialogOpen, setIsDischargeDialogOpen] = useState(false)
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
+
+  const isEditMode = id !== null
+  const patientId = id
+
+  const { data: patientData, isLoading: isLoadingPatient } = useGetPatientQuery(
+    { id: patientId! },
+    { enabled: isEditMode }
+  )
+
+  const { data: locationsData } = useGetLocationsQuery(undefined)
+
+  const locationsMap = useMemo(() => {
+    if (!locationsData?.locationNodes) return new Map()
+    const map = new Map<string, { id: string, title: string, parentId?: string | null }>()
+    locationsData.locationNodes.forEach(loc => {
+      map.set(loc.id, { id: loc.id, title: loc.title, parentId: loc.parentId || null })
+    })
+    return map
+  }, [locationsData])
+
+  const [isCreating, setIsCreating] = useState<boolean>(false)
+  const { mutate: createPatient } = useOptimisticCreatePatientMutation({
+    onMutate: () => {
+      setIsCreating(true)
+    },
+    onSettled: () => {
+      setIsCreating(false)
+    },
+    onSuccess: async () => {
+      onSuccess?.()
+      onClose?.()
+    },
+    onError: (error) => {
+      setErrorDialog({ isOpen: true, message: error instanceof Error ? error.message : 'Failed to create patient' })
+    },
+  })
+
+  const { mutate: admitPatient } = useOptimisticAdmitPatientMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+  const { mutate: dischargePatient } = useOptimisticDischargePatientMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+  const { mutate: deletePatient } = useOptimisticDeletePatientMutation({
+    onSuccess: async () => {
+      onSuccess?.()
+      onClose?.()
+    },
+  })
+
+
+  const { mutate: waitPatient } = useOptimisticWaitPatientMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+  const { mutate: markPatientDead } = useOptimisticMarkPatientDeadMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+  const { mutate: updatePatient } = useOptimisticUpdatePatientMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+
+  const form = useCreateForm<PatientFormValues>({
+    initialValues: {
+      firstname: '',
+      lastname: '',
+      sex: Sex.Female,
+      assignedLocationIds: selectedLocationId ? [selectedLocationId] : [],
+      birthdate: getDefaultBirthdate(),
+      state: PatientState.Wait,
+      description: null,
+      clinic: null,
+      teams: null,
+      position: null,
+      ...initialCreateData,
+    },
+    onFormSubmit: (values) => {
+      const data: CreatePatientInput = {
+        firstname: values.firstname,
+        lastname: values.lastname,
+        birthdate: values.birthdate,
+        sex: values.sex,
+        assignedLocationIds: values.assignedLocationIds,
+        clinicId: values.clinic!.id,
+        teamIds: values.teams?.filter(Boolean).map(t => t.id) || undefined,
+        positionId: values.position?.id,
+        state: values.state,
+        description: values.description,
+      }
+      createPatient({ data })
+    },
+    validators: {
+      firstname: (value) => {
+        if (!value || !value.trim()) {
+          return translation('firstName') + ' is required'
+        }
+        return null
+      },
+      lastname: (value) => {
+        if (!value || !value.trim()) {
+          return translation('lastName') + ' is required'
+        }
+        return null
+      },
+      birthdate: (value) => {
+        if (!value || !value.trim()) {
+          return translation('birthdate') + ' is required'
+        }
+        return null
+      },
+
+      sex: (value) => {
+        if (!value) {
+          return translation('sex') + ' is required'
+        }
+        return null
+      },
+      clinic: (value) => {
+        if (!value) {
+          return translation('clinic') + ' is required'
+        }
+        return null
+      },
+    },
+    onValidUpdate: (_, updates) => {
+      if (isEditMode && patientId) {
+        const data: UpdatePatientInput = {
+          firstname: updates?.firstname,
+          lastname: updates.lastname,
+          birthdate: updates.birthdate,
+          sex: updates.sex,
+          assignedLocationIds: updates.assignedLocationIds,
+          clinicId: updates.clinic?.id,
+          teamIds: updates.teams?.map(t => t.id),
+          positionId: updates.position?.id,
+          description: updates.description,
+        }
+        updatePatient({ id: patientId, data })
+      }
+    }
+  })
+
+  const { store, update: updateForm } = form
+
+  useEffect(() => {
+    if (patientData?.patient) {
+      const patient = patientData.patient
+      const { firstname, lastname, sex, birthdate, assignedLocations, clinic, position, teams, description } = patient
+      const value: PatientFormValues = {
+        firstname,
+        lastname,
+        sex,
+        birthdate: toISODate(birthdate),
+        assignedLocationIds: assignedLocations.map(loc => loc.id),
+        clinic: clinic || null,
+        position: position || null,
+        teams: teams || null,
+        description: description,
+      }
+      updateForm(prev => ({
+        ...prev,
+        ...value,
+      }))
+    }
+  }, [updateForm, patientData])
+
+  const startDate = useMemo(() => {
+    const year = new Date()
+    year.setFullYear(year.getFullYear() - 100)
+    return year
+  }, [])
+
+  const endDate = useMemo(() => {
+    return new Date()
+  }, [])
+
+  const clinic = useFormObserverKey({ formStore: form.store, formKey: 'clinic' })?.value ?? null
+  const position = useFormObserverKey({ formStore: form.store, formKey: 'position' })?.value ?? null
+  const teams = useFormObserverKey({ formStore: form.store, formKey: 'teams' })?.value ?? []
+
+  useEffect(() => {
+    if (!isEditMode && locationsData?.locationNodes && !clinic) {
+      let clinicLocation: LocationNodeType | undefined
+      if (firstSelectedRootLocationId) {
+        const selectedRootLocation = locationsData.locationNodes.find(
+          loc => loc.id === firstSelectedRootLocationId && loc.kind === 'CLINIC'
+        )
+        if (selectedRootLocation) {
+          clinicLocation = selectedRootLocation as LocationNodeType
+        }
+      }
+      if (!clinicLocation && rootLocations && rootLocations.length > 0) {
+        const firstClinic = rootLocations.find(loc => loc.kind === 'CLINIC')
+        if (firstClinic) {
+          clinicLocation = firstClinic as LocationNodeType
+        }
+      }
+      if (clinicLocation) {
+        updateForm({ clinic: clinicLocation })
+      }
+    }
+  }, [isEditMode, firstSelectedRootLocationId, locationsData, rootLocations, clinic, updateForm])
+
+  if (isEditMode && isLoadingPatient) {
+    return <LoadingContainer />
+  }
+
+  const sexOptions = [
+    { label: translation('male'), value: Sex.Male },
+    { label: translation('female'), value: Sex.Female },
+    { label: translation('diverse'), value: Sex.Unknown }
+  ]
+
+
+  return (
+    <FormProvider state={form}>
+      <form onSubmit={event => {event.preventDefault(); form.submit() }} className="flex-col-4">
+        <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+          <FormField<PatientFormValues, 'firstname'>
+            name="firstname"
+            label={translation('firstName')}
+            required
+            showRequiredIndicator={!isEditMode}
+          >
+            {({ dataProps, focusableElementProps, interactionStates  }) => (
+              <Input
+                {...dataProps} {...focusableElementProps} {...interactionStates}
+                placeholder={translation('firstName')}
+              />
+            )}
+          </FormField>
+          <FormField<PatientFormValues, 'lastname'>
+            name="lastname"
+            label={translation('lastName')}
+            required
+            showRequiredIndicator={!isEditMode}
+          >
+            {({ dataProps, focusableElementProps, interactionStates  }) => (
+              <Input
+                {...dataProps} {...focusableElementProps} {...interactionStates}
+                placeholder={translation('lastName')}
+              />
+            )}
+          </FormField>
+        </div>
+
+        <FormField<PatientFormValues, 'birthdate'>
+          name="birthdate"
+          label={translation('birthdate')}
+          required
+          showRequiredIndicator={!isEditMode}
+        >
+          {({ dataProps, focusableElementProps, interactionStates  }) => (
+            <DateTimeInput
+              {...focusableElementProps} {...interactionStates}
+              value={convertBirthdateStringToDate(dataProps.value) ?? undefined}
+              onValueChange={(value) => dataProps.onValueChange(value ? toISODate(value) : undefined)}
+              onEditComplete={(value) => dataProps.onEditComplete(value ? toISODate(value) : undefined)}
+              pickerProps={{
+                start: startDate,
+                end: endDate
+              }}
+              mode="date"
+            />
+          )}
+        </FormField>
+
+        <FormField<PatientFormValues, 'sex'>
+          name="sex"
+          label={translation('sex')}
+          required
+          showRequiredIndicator={!isEditMode}
+        >
+          {({ dataProps, focusableElementProps, interactionStates  }) => (
+            <Select
+              {...dataProps as FormFieldDataHandling<string>}
+              {...focusableElementProps}
+              {...interactionStates}
+            >
+              {sexOptions.map(option => (
+                <SelectOption key={option.value} value={option.value}>
+                  {option.label}
+                </SelectOption>
+              ))}
+            </Select>
+          )}
+        </FormField>
+        <FormField<PatientFormValues, 'description'>
+          name="description"
+          label={translation('description')}
+          showRequiredIndicator={!isEditMode}
+        >
+          {({ dataProps, focusableElementProps, interactionStates  }) => (
+            <Textarea
+              {...dataProps} {...focusableElementProps} {...interactionStates}
+              value={dataProps.value || ''}
+              placeholder={translation('description')}
+            />
+          )}
+        </FormField>
+
+        {!isEditMode && (
+          <FormField<PatientFormValues, 'state'>
+            name="state"
+            label={translation('status')}
+            showRequiredIndicator={!isEditMode}
+          >
+            {({ dataProps: { value, onValueChange, onEditComplete }, focusableElementProps, interactionStates  }) => (
+              <div className="flex items-center gap-2">
+                <Checkbox
+                  {...focusableElementProps} {...interactionStates}
+                  value={value === PatientState.Wait}
+                  onValueChange={(value) => onValueChange(value ? PatientState.Wait : PatientState.Admitted)}
+                  onEditComplete={(value) => onEditComplete(value ? PatientState.Wait : PatientState.Admitted)}
+                />
+                <span>{translation('waitingForPatient')}</span>
+              </div>
+            )}
+          </FormField>
+        )}
+
+        {isEditMode  &&(
+          <FormField<PatientFormValues, 'state'>
+            name="state"
+            label={translation('patientActions')}
+            showRequiredIndicator={!isEditMode}
+          >
+            {({ dataProps: { value }  }) => (
+              <div className="flex gap-4 flex-wrap">
+                <Button
+                  disabled={value === PatientState.Admitted}
+                  onClick={() => admitPatient({ id: patientId! })}
+                  color={value === PatientState.Admitted ? 'positive' : 'neutral'}
+                >
+                  <Visibility isVisible={value === PatientState.Admitted}>
+                    <CheckIcon className="size-4" aria-hidden="true" />
+                  </Visibility>
+                  {translation('admitPatient')}
+                </Button>
+                <Button
+                  disabled={value === PatientState.Discharged}
+                  onClick={() => setIsDischargeDialogOpen(true)}
+                  color="neutral"
+                >
+                  <Visibility isVisible={value === PatientState.Admitted}>
+                    <CheckIcon className="size-4" aria-hidden="true" />
+                  </Visibility>
+                  {translation('dischargePatient')}
+                </Button>
+                <Button
+                  disabled={value === PatientState.Wait}
+                  onClick={() => waitPatient({ id: patientId! })}
+                  color={value === PatientState.Wait ? 'warning' : 'neutral'}
+                >
+                  <Visibility isVisible={value === PatientState.Admitted}>
+                    <CheckIcon className="size-4" aria-hidden="true" />
+                  </Visibility>
+                  {translation('waitPatient')}
+                </Button>
+              </div>
+            )}
+          </FormField>
+        )}
+
+        <FormField<PatientFormValues, 'clinic'>
+          name="clinic"
+          label={translation('clinic')}
+          required
+          showRequiredIndicator={!isEditMode}
+        >
+          {({ dataProps: { value, onValueChange, onEditComplete }, focusableElementProps, interactionStates  }) => (
+            <div className="flex flex-col gap-2">
+              <div className="flex gap-2">
+                <Input
+                  {...focusableElementProps} {...interactionStates}
+                  value={value ? (locationsMap.size > 0 ? formatLocationPathFromId(value.id, locationsMap) : formatLocationPath(value)) : ''}
+                  placeholder={translation('selectClinic')}
+                  readOnly
+                  className="flex-grow cursor-pointer"
+                  onClick={() => setIsClinicDialogOpen(true)}
+                />
+                <Button
+                  onClick={() => setIsClinicDialogOpen(true)}
+                  layout="icon"
+                  title={translation('selectClinic')}
+                >
+                  <Building2 className="size-4" />
+                </Button>
+                {value && !isEditMode && (
+                  <Button
+                    onClick={() => {
+                      onValueChange(null)
+                      onEditComplete(null)
+                    }}
+                    layout="icon"
+                    color="neutral"
+                    title={translation('clear')}
+                  >
+                    <XIcon className="size-5" />
+                  </Button>
+                )}
+              </div>
+            </div>
+          )}
+        </FormField>
+
+        <FormField<PatientFormValues, 'position'>
+          name="position"
+          label={translation('position')}
+        >
+          {({ dataProps: { value, onValueChange, onEditComplete }, focusableElementProps, interactionStates  }) => (
+            <div className="flex flex-col gap-2">
+              <div className="flex gap-2">
+                <Input
+                  {...focusableElementProps} {...interactionStates}
+                  value={value ? (locationsMap.size > 0 ? formatLocationPathFromId(value.id, locationsMap) : formatLocationPath(value)) : ''}
+                  placeholder={translation('selectPosition')}
+                  readOnly
+                  className="flex-grow cursor-pointer"
+                  onClick={() => setIsPositionDialogOpen(true)}
+                />
+                <Button
+                  onClick={() => setIsPositionDialogOpen(true)}
+                  layout="icon"
+                  title={translation('selectPosition')}
+                >
+                  <Locate className="size-4" />
+                </Button>
+                {value && (
+                  <Button
+                    onClick={() => {
+                      onValueChange(null)
+                      onEditComplete(null)
+                    }}
+                    layout="icon"
+                    color="neutral"
+                    title={translation('clear')}
+                  >
+                    <XIcon className="size-5" />
+                  </Button>
+                )}
+              </div>
+            </div>
+          )}
+        </FormField>
+
+        <FormField<PatientFormValues, 'teams'>
+          name="teams"
+          label={translation('teams')}
+        >
+          {({ dataProps: { value, onValueChange, onEditComplete }, focusableElementProps, interactionStates  }) => (
+            <div className="flex flex-col gap-2">
+              <div className="flex gap-2">
+                <Input
+                  {...focusableElementProps} {...interactionStates}
+                  value={value && value.length > 0
+                    ? value.map(loc => locationsMap.size > 0 ? formatLocationPathFromId(loc.id, locationsMap) : formatLocationPath(loc)).join(', ')
+                    : ''}
+                  placeholder={translation('selectTeams')}
+                  readOnly
+                  className="flex-grow cursor-pointer"
+                  onClick={() => setIsTeamsDialogOpen(true)}
+                />
+                <Button
+                  onClick={() => setIsTeamsDialogOpen(true)}
+                  layout="icon"
+                  title={translation('selectTeams')}
+                >
+                  <Users className="size-4" />
+                </Button>
+                {value && value.length > 0 && (
+                  <Button
+                    onClick={() => {
+                      onValueChange([])
+                      onEditComplete([])
+                    }}
+                    layout="icon"
+                    color="neutral"
+                    title={translation('clear')}
+                  >
+                    <XIcon className="size-5" />
+                  </Button>
+                )}
+              </div>
+            </div>
+          )}
+        </FormField>
+
+        {isEditMode && patientId && patientData?.patient && (
+          <div className="pt-6 mt-6 border-t border-divider flex justify-end gap-2">
+            {patientData.patient.state !== PatientState.Dead && (
+              <Button
+                onClick={() => setIsMarkDeadDialogOpen(true)}
+                color="negative"
+                coloringStyle="outline"
+              >
+                {translation('markPatientDead')}
+              </Button>
+            )}
+            <Button
+              onClick={() => setIsDeleteDialogOpen(true)}
+              color="negative"
+              coloringStyle="outline"
+            >
+              {translation('deletePatient') ?? 'Delete Patient'}
+            </Button>
+          </div>
+        )}
+      </form>
+
+      {!isEditMode && (
+        <div className="flex-none pt-4 mt-auto border-t border-divider flex justify-end gap-2">
+          <Button
+            onClick={form.submit}
+            disabled={isCreating}
+          >
+            {translation('create')}
+          </Button>
+        </div>
+      )}
+
+      <ConfirmDialog
+        isOpen={isMarkDeadDialogOpen}
+        onCancel={() => setIsMarkDeadDialogOpen(false)}
+        onConfirm={() => {
+          if (patientId && markPatientDead) {
+            markPatientDead({ id: patientId })
+          }
+          setIsMarkDeadDialogOpen(false)
+        }}
+        titleElement={translation('markPatientDead')}
+        description={translation('markPatientDeadConfirmation')}
+        confirmType="negative"
+      />
+
+      <ConfirmDialog
+        isOpen={isDischargeDialogOpen}
+        onCancel={() => setIsDischargeDialogOpen(false)}
+        onConfirm={() => {
+          if (patientId && dischargePatient) {
+            dischargePatient({ id: patientId })
+          }
+          setIsDischargeDialogOpen(false)
+        }}
+        titleElement={translation('dischargePatient')}
+        description={translation('dischargePatientConfirmation')}
+        confirmType="neutral"
+      />
+
+      <ConfirmDialog
+        isOpen={isDeleteDialogOpen}
+        onCancel={() => setIsDeleteDialogOpen(false)}
+        onConfirm={() => {
+          if (patientId && deletePatient) {
+            deletePatient({ id: patientId })
+          }
+          setIsDeleteDialogOpen(false)
+        }}
+        titleElement={translation('deletePatient') ?? 'Delete Patient'}
+        description={translation('deletePatientConfirmation') ?? 'Are you sure you want to delete this patient? This action cannot be undone.'}
+        confirmType="negative"
+      />
+
+      <LocationSelectionDialog
+        isOpen={isClinicDialogOpen}
+        onClose={() => setIsClinicDialogOpen(false)}
+        onSelect={(locations) => {
+          store.setTouched('clinic')
+          store.setValue('clinic', locations[0] ?? null, true)
+        }}
+        initialSelectedIds={clinic ? [clinic.id] : []}
+        multiSelect={false}
+        useCase="clinic"
+      />
+      <LocationSelectionDialog
+        isOpen={isPositionDialogOpen}
+        onClose={() => setIsPositionDialogOpen(false)}
+        onSelect={(locations) => {
+          store.setTouched('position')
+          store.setValue('position', locations[0] ?? null, true)
+        }}
+        initialSelectedIds={position ? [position.id] : []}
+        multiSelect={false}
+        useCase="position"
+      />
+      <LocationSelectionDialog
+        isOpen={isTeamsDialogOpen}
+        onClose={() => setIsTeamsDialogOpen(false)}
+        onSelect={(locations) => {
+          store.setTouched('teams')
+          store.setValue('teams', locations ?? [], true)
+        }}
+        initialSelectedIds={teams?.map(loc => loc.id)}
+        multiSelect={true}
+        useCase="teams"
+      />
+      <ErrorDialog
+        isOpen={errorDialog.isOpen}
+        onClose={() => setErrorDialog({ isOpen: false })}
+        message={errorDialog.message}
+      />
+    </FormProvider>
+  )
+}
diff --git a/web/components/patients/PatientDetailView.tsx b/web/components/patients/PatientDetailView.tsx
index a15de351..c9ba6fd7 100644
--- a/web/components/patients/PatientDetailView.tsx
+++ b/web/components/patients/PatientDetailView.tsx
@@ -1,59 +1,27 @@
-import { useEffect, useState, useMemo } from 'react'
-import { useQueryClient } from '@tanstack/react-query'
+import { useMemo, useCallback } from 'react'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import type { CreatePatientInput, LocationNodeType, UpdatePatientInput } from '@/api/gql/generated'
+import type { CreatePatientInput, PropertyValueInput } from '@/api/gql/generated'
 import {
-  PatientState,
   PropertyEntity,
-  Sex,
-  type FieldType,
   useGetPatientQuery,
   useGetPropertyDefinitionsQuery
 } from '@/api/gql/generated'
-import { useAtomicMutation } from '@/hooks/useAtomicMutation'
-import { useSafeMutation } from '@/hooks/useSafeMutation'
-import { fetcher } from '@/api/gql/fetcher'
-import { UpdatePatientDocument, type UpdatePatientMutation, type UpdatePatientMutationVariables, AdmitPatientDocument, DischargePatientDocument, WaitPatientDocument, MarkPatientDeadDocument, CreatePatientDocument, DeletePatientDocument, type AdmitPatientMutation, type DischargePatientMutation, type WaitPatientMutation, type MarkPatientDeadMutation, type CreatePatientMutation, type DeletePatientMutation, type CreatePatientMutationVariables, type DeletePatientMutationVariables, type GetPatientQuery, type GetPatientsQuery, CompleteTaskDocument, ReopenTaskDocument, type CompleteTaskMutation, type ReopenTaskMutation, type CompleteTaskMutationVariables, type ReopenTaskMutationVariables, type GetGlobalDataQuery } from '@/api/gql/generated'
 import {
-  Button,
-  Checkbox,
-  ConfirmDialog,
-  DateTimeInput,
-  FormElementWrapper,
-  Input,
-  LoadingButton,
-  LoadingContainer,
   ProgressIndicator,
-  Select,
-  SelectOption,
-  Tab,
-  TabView,
-  Textarea,
+  TabList,
+  TabPanel,
+  TabSwitcher,
   Tooltip
 } from '@helpwave/hightide'
-import { useTasksContext } from '@/hooks/useTasksContext'
-import { CheckCircle2, ChevronDown, Circle, PlusIcon, XIcon, Building2, Locate, Users } from 'lucide-react'
 import { PatientStateChip } from '@/components/patients/PatientStateChip'
-import { AuditLogTimeline } from '@/components/AuditLogTimeline'
 import { LocationChips } from '@/components/patients/LocationChips'
-import { LocationSelectionDialog } from '@/components/locations/LocationSelectionDialog'
-import clsx from 'clsx'
-import { SidePanel } from '@/components/layout/SidePanel'
-import { TaskDetailView } from '@/components/tasks/TaskDetailView'
-import { TaskCardView } from '@/components/tasks/TaskCardView'
-import { formatLocationPath, formatLocationPathFromId } from '@/utils/location'
-import { useGetLocationsQuery } from '@/api/gql/generated'
-import type { PropertyValueInput } from '@/api/gql/generated'
-import { PropertyList } from '@/components/PropertyList'
-import { ErrorDialog } from '@/components/ErrorDialog'
-
-type ExtendedCreatePatientInput = CreatePatientInput & {
-  clinicId?: string,
-  positionId?: string,
-  teamIds?: string[],
-}
+import { PatientTasksView } from './PatientTasksView'
+import { PatientDataEditor } from './PatientDataEditor'
+import { AuditLogTimeline } from '@/components/AuditLogTimeline'
+import { PropertyList, type PropertyValue } from '../tables/PropertyList'
+import { useOptimisticUpdatePatientMutation } from '@/api/optimistic-updates/GetPatient'
 
-const toISODate = (d: Date | string | null | undefined): string | null => {
+export const toISODate = (d: Date | string | null | undefined): string | null => {
   if (!d) return null
   const date = typeof d === 'string' ? new Date(d) : d
   if (!(date instanceof Date) || isNaN(date.getTime())) return null
@@ -76,12 +44,6 @@ export const localToUTCWithSameTime = (d: Date | null | undefined): Date | null
   ))
 }
 
-const getDefaultBirthdate = () => {
-  const d = new Date()
-  d.setFullYear(d.getFullYear() - 18)
-  return toISODate(d)
-}
-
 interface PatientDetailViewProps {
   patientId?: string,
   onClose: () => void,
@@ -96,31 +58,23 @@ export const PatientDetailView = ({
   initialCreateData = {}
 }: PatientDetailViewProps) => {
   const translation = useTasksTranslation()
-  const queryClient = useQueryClient()
-  const { selectedLocationId, selectedRootLocationIds, rootLocations } = useTasksContext()
-  const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
-  const firstSelectedRootLocationId = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds[0] : undefined
-  const [taskId, setTaskId] = useState<string | null>(null)
-  const [isCreatingTask, setIsCreatingTask] = useState(false)
+
   const isEditMode = !!patientId
 
-  const { data: patientData, isLoading: isLoadingPatient } = useGetPatientQuery(
+  const { data: patientData } = useGetPatientQuery(
     { id: patientId! },
-    {
-      enabled: isEditMode,
-      refetchOnMount: true,
-    }
-  )
-
-  const { data: locationsData } = useGetLocationsQuery(
-    undefined,
-    {
-      refetchOnWindowFocus: true,
-    }
+    { enabled: isEditMode }
   )
 
   const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
 
+  const { mutate: updatePatient } = useOptimisticUpdatePatientMutation({
+    id: patientId!,
+    onSuccess: () => {
+      onSuccess()
+    },
+  })
+
   const hasAvailableProperties = useMemo(() => {
     if (!propertyDefinitionsData?.propertyDefinitions) return false
     return propertyDefinitionsData.propertyDefinitions.some(
@@ -128,1025 +82,92 @@ export const PatientDetailView = ({
     )
   }, [propertyDefinitionsData])
 
-  const locationsMap = useMemo(() => {
-    if (!locationsData?.locationNodes) return new Map()
-    const map = new Map<string, { id: string, title: string, parentId?: string | null }>()
-    locationsData.locationNodes.forEach(loc => {
-      map.set(loc.id, { id: loc.id, title: loc.title, parentId: loc.parentId || null })
-    })
-    return map
-  }, [locationsData])
-
-  const [optimisticTaskUpdates, setOptimisticTaskUpdates] = useState<Map<string, boolean>>(new Map())
-
-  const { mutate: completeTask } = useSafeMutation<CompleteTaskMutation, CompleteTaskMutationVariables>({
-    mutationFn: async (variables) => {
-      return fetcher<CompleteTaskMutation, CompleteTaskMutationVariables>(CompleteTaskDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: (variables) => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              tasks: data.patient.tasks?.map(task => (
-                task.id === variables.id ? { ...task, done: true } : task
-              )) || []
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data?.me?.tasks) return oldData
-          return {
-            ...data,
-            me: data.me ? {
-              ...data.me,
-              tasks: data.me.tasks.map(task => task.id === variables.id ? { ...task, done: true } : task)
-            } : null
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(patient => {
-              if (patient.id === patientId && patient.tasks) {
-                return {
-                  ...patient,
-                  tasks: patient.tasks.map(task => task.id === variables.id ? { ...task, done: true } : task)
-                }
-              }
-              return patient
-            })
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatient', { id: patientId }], ['GetTasks'], ['GetPatients'], ['GetOverviewData'], ['GetGlobalData']],
-    onSuccess: async () => {
-      await queryClient.refetchQueries({ queryKey: ['GetPatient', { id: patientId }] })
-      onSuccess()
-    },
-    onError: (error, variables) => {
-      setOptimisticTaskUpdates(prev => {
-        const next = new Map(prev)
-        next.delete(variables.id)
-        return next
-      })
-    },
-  })
-
-  const { mutate: reopenTask } = useSafeMutation<ReopenTaskMutation, ReopenTaskMutationVariables>({
-    mutationFn: async (variables) => {
-      return fetcher<ReopenTaskMutation, ReopenTaskMutationVariables>(ReopenTaskDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: (variables) => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              tasks: data.patient.tasks?.map(task => (
-                task.id === variables.id ? { ...task, done: false } : task
-              )) || []
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data?.me?.tasks) return oldData
-          return {
-            ...data,
-            me: data.me ? {
-              ...data.me,
-              tasks: data.me.tasks.map(task => task.id === variables.id ? { ...task, done: false } : task)
-            } : null
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(patient => {
-              if (patient.id === patientId && patient.tasks) {
-                return {
-                  ...patient,
-                  tasks: patient.tasks.map(task => task.id === variables.id ? { ...task, done: false } : task)
-                }
-              }
-              return patient
-            })
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatient', { id: patientId }], ['GetTasks'], ['GetPatients'], ['GetOverviewData'], ['GetGlobalData']],
-    onSuccess: async () => {
-      await queryClient.refetchQueries({ queryKey: ['GetPatient', { id: patientId }] })
-      onSuccess()
-    },
-    onError: (error, variables) => {
-      setOptimisticTaskUpdates(prev => {
-        const next = new Map(prev)
-        next.delete(variables.id)
-        return next
-      })
-    },
-  })
-
-  const [formData, setFormData] = useState<CreatePatientInput>({
-    firstname: '',
-    lastname: '',
-    sex: Sex.Female,
-    assignedLocationIds: selectedLocationId ? [selectedLocationId] : [],
-    birthdate: getDefaultBirthdate(),
-    state: PatientState.Wait,
-    clinicId: undefined,
-    description: null,
-    ...initialCreateData,
-  } as CreatePatientInput & { clinicId?: string, positionId?: string, teamIds?: string[] })
-  const [isWaiting, setIsWaiting] = useState(false)
-  const [isClinicDialogOpen, setIsClinicDialogOpen] = useState(false)
-  const [isPositionDialogOpen, setIsPositionDialogOpen] = useState(false)
-  const [isTeamsDialogOpen, setIsTeamsDialogOpen] = useState(false)
-  const [selectedClinic, setSelectedClinic] = useState<LocationNodeType | null>(null)
-  const [selectedPosition, setSelectedPosition] = useState<LocationNodeType | null>(null)
-  const [selectedTeams, setSelectedTeams] = useState<LocationNodeType[]>([])
-  const [isMarkDeadDialogOpen, setIsMarkDeadDialogOpen] = useState(false)
-  const [isDischargeDialogOpen, setIsDischargeDialogOpen] = useState(false)
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
-  const [errorDialog, setErrorDialog] = useState<{ isOpen: boolean, message?: string }>({ isOpen: false })
-
-  const [firstnameError, setFirstnameError] = useState<string | null>(null)
-  const [lastnameError, setLastnameError] = useState<string | null>(null)
-  const [clinicError, setClinicError] = useState<string | null>(null)
-  const [birthdateError, setBirthdateError] = useState<string | null>(null)
-  const [sexError, setSexError] = useState<string | null>(null)
-
-  useEffect(() => {
-    if (patientData?.patient) {
-      const patient = patientData.patient
-      const { firstname, lastname, sex, birthdate, assignedLocations, clinic, position, teams, description } = patient
-      setFormData(prev => ({
-        ...prev,
-        firstname,
-        lastname,
-        sex,
-        birthdate: toISODate(birthdate),
-        assignedLocationIds: assignedLocations.map(loc => loc.id),
-        clinicId: clinic?.id || undefined,
-        positionId: position?.id || undefined,
-        teamIds: teams?.map(t => t.id) || undefined,
-        description: description || null,
-      } as CreatePatientInput & { clinicId?: string, positionId?: string, teamIds?: string[] }))
-      setSelectedClinic(clinic ? (clinic as LocationNodeType) : null)
-      setSelectedPosition(position ? (position as LocationNodeType) : null)
-      setSelectedTeams((teams || []) as LocationNodeType[])
-    }
-  }, [patientData])
-
-  useEffect(() => {
-    if (!isEditMode && locationsData?.locationNodes && !formData.clinicId) {
-      let clinicLocation: LocationNodeType | undefined
-      if (firstSelectedRootLocationId) {
-        const selectedRootLocation = locationsData.locationNodes.find(
-          loc => loc.id === firstSelectedRootLocationId && loc.kind === 'CLINIC'
-        )
-        if (selectedRootLocation) {
-          clinicLocation = selectedRootLocation as LocationNodeType
-        }
-      }
-      if (!clinicLocation && rootLocations && rootLocations.length > 0) {
-        const firstClinic = rootLocations.find(loc => loc.kind === 'CLINIC')
-        if (firstClinic) {
-          clinicLocation = firstClinic as LocationNodeType
-        }
-      }
-      if (clinicLocation) {
-        setSelectedClinic(clinicLocation)
-        setFormData(prev => ({
-          ...prev,
-          clinicId: clinicLocation!.id,
-        }))
-      }
+  const convertPropertyValueToInput = useCallback((definitionId: string, value: PropertyValue | null): PropertyValueInput | null => {
+    if (!value) return null
+    return {
+      definitionId,
+      textValue: value.textValue ?? undefined,
+      numberValue: value.numberValue ?? undefined,
+      booleanValue: value.boolValue ?? undefined,
+      dateValue: value.dateValue?.toISOString().split('T')[0] ?? undefined,
+      dateTimeValue: value.dateTimeValue?.toISOString() ?? undefined,
+      selectValue: value.singleSelectValue ?? undefined,
+      multiSelectValues: value.multiSelectValue ?? undefined,
     }
-  }, [isEditMode, firstSelectedRootLocationId, locationsData, formData.clinicId, rootLocations])
-
-  const { mutate: createPatient, isLoading: isCreating } = useSafeMutation<CreatePatientMutation, CreatePatientMutationVariables>({
-    mutationFn: async (variables) => {
-      return fetcher<CreatePatientMutation, CreatePatientMutationVariables>(CreatePatientDocument, variables)()
-    },
-    queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-    optimisticUpdate: (variables) => [
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          const newPatient = {
-            __typename: 'PatientType' as const,
-            id: `temp-${Date.now()}`,
-            name: `${variables.data.firstname} ${variables.data.lastname}`.trim(),
-            firstname: variables.data.firstname,
-            lastname: variables.data.lastname,
-            birthdate: variables.data.birthdate,
-            sex: variables.data.sex,
-            state: variables.data.state || PatientState.Admitted,
-            assignedLocation: null,
-            assignedLocations: [],
-            clinic: null,
-            position: null,
-            teams: [],
-            properties: [],
-            tasks: [],
-          }
-          return {
-            ...data,
-            patients: [...(data.patients || []), newPatient],
-            waitingPatients: variables.data.state === PatientState.Wait
-              ? [...(data.waitingPatients || []), newPatient]
-              : data.waitingPatients || [],
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetGlobalData'], ['GetPatients'], ['GetOverviewData']],
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-      onClose()
-    },
-    onError: (error) => {
-      setErrorDialog({ isOpen: true, message: error instanceof Error ? error.message : 'Failed to create patient' })
-    },
-  })
-
-  const { updateField, flush } = useAtomicMutation<UpdatePatientMutation, { id: string, data: UpdatePatientInput }>({
-    mutationFn: async (variables) => {
-      return fetcher<UpdatePatientMutation, UpdatePatientMutationVariables>(
-        UpdatePatientDocument,
-        variables
-      )()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    timeoutMs: 3000,
-    immediateFields: ['clinicId', 'positionId', 'teamIds', 'properties'] as unknown as (keyof { id: string, data: UpdatePatientInput })[],
-    onChangeFields: ['sex'] as unknown as (keyof { id: string, data: UpdatePatientInput })[],
-    onBlurFields: ['firstname', 'lastname', 'description', 'birthdate'] as unknown as (keyof { id: string, data: UpdatePatientInput })[],
-    onCloseFields: ['birthdate'] as unknown as (keyof { id: string, data: UpdatePatientInput })[],
-    getChecksum: (data) => data?.updatePatient?.checksum || null,
-    invalidateQueries: [
-      ['GetPatient', { id: patientId }],
-      ['GetPatients'],
-      ['GetOverviewData'],
-      ['GetGlobalData']
-    ],
-    optimisticUpdate: (variables) => {
-      const updates: Array<{ queryKey: unknown[], updateFn: (oldData: unknown) => unknown }> = []
-      type PatientType = NonNullable<NonNullable<ReturnType<typeof queryClient.getQueryData<GetPatientQuery>>>['patient']>
-
-      const updatePatientInQuery = (patient: PatientType, updateData: Partial<UpdatePatientInput>) => {
-        if (!patient) return patient
-
-        const updated: typeof patient = { ...patient }
-
-        if (updateData.firstname !== undefined) {
-          updated.firstname = updateData.firstname || ''
-        }
-        if (updateData.lastname !== undefined) {
-          updated.lastname = updateData.lastname || ''
-        }
-        if (updateData.sex !== undefined && updateData.sex !== null) {
-          updated.sex = updateData.sex
-        }
-        if (updateData.birthdate !== undefined) {
-          updated.birthdate = updateData.birthdate || null
-        }
-        if (updateData.description !== undefined) {
-          updated.description = updateData.description
-        }
-        if (updateData.clinicId !== undefined) {
-          if (updateData.clinicId === null || updateData.clinicId === undefined) {
-            updated.clinic = null as unknown as typeof patient.clinic
-          } else {
-            const clinicLocation = locationsData?.locationNodes?.find(loc => loc.id === updateData.clinicId)
-            if (clinicLocation) {
-              updated.clinic = {
-                ...clinicLocation,
-                __typename: 'LocationNodeType' as const,
-              } as typeof patient.clinic
-            }
-          }
-        }
-        if (updateData.positionId !== undefined) {
-          if (updateData.positionId === null) {
-            updated.position = null as typeof patient.position
-          } else {
-            const positionLocation = locationsData?.locationNodes?.find(loc => loc.id === updateData.positionId)
-            if (positionLocation) {
-              updated.position = {
-                ...positionLocation,
-                __typename: 'LocationNodeType' as const,
-              } as typeof patient.position
-            }
-          }
-        }
-        if (updateData.teamIds !== undefined) {
-          const teamLocations = locationsData?.locationNodes?.filter(loc => updateData.teamIds?.includes(loc.id)) || []
-          updated.teams = teamLocations.map(team => ({
-            ...team,
-            __typename: 'LocationNodeType' as const,
-          })) as typeof patient.teams
-        }
-        if (updateData.properties !== undefined && updateData.properties !== null) {
-          const propertyMap = new Map(updateData.properties.map(p => [p.definitionId, p]))
-          const existingPropertyIds = new Set(
-            patient.properties?.map(p => p.definition?.id).filter(Boolean) || []
-          )
-          const newPropertyIds = new Set(updateData.properties.map(p => p.definitionId))
-
-          const existingProperties = patient.properties
-            ? patient.properties
-                .filter(p => newPropertyIds.has(p.definition?.id))
-                .map(p => {
-                  const newProp = propertyMap.get(p.definition?.id)
-                  if (!newProp) return p
-                  return {
-                    ...p,
-                    textValue: newProp.textValue ?? p.textValue,
-                    numberValue: newProp.numberValue ?? p.numberValue,
-                    booleanValue: newProp.booleanValue ?? p.booleanValue,
-                    dateValue: newProp.dateValue ?? p.dateValue,
-                    dateTimeValue: newProp.dateTimeValue ?? p.dateTimeValue,
-                    selectValue: newProp.selectValue ?? p.selectValue,
-                    multiSelectValues: newProp.multiSelectValues ?? p.multiSelectValues,
-                  }
-                })
-            : []
-          const newProperties = updateData.properties
-            .filter(p => !existingPropertyIds.has(p.definitionId))
-            .map(p => {
-              const existingProperty = patient?.properties?.find(ep => ep.definition?.id === p.definitionId)
-              return {
-                __typename: 'PropertyValueType' as const,
-                  definition: existingProperty?.definition || {
-                    __typename: 'PropertyDefinitionType' as const,
-                    id: p.definitionId,
-                    name: '',
-                    description: null,
-                    fieldType: 'TEXT' as FieldType,
-                    isActive: true,
-                    allowedEntities: [],
-                    options: [],
-                  },
-                textValue: p.textValue,
-                numberValue: p.numberValue,
-                booleanValue: p.booleanValue,
-                dateValue: p.dateValue,
-                dateTimeValue: p.dateTimeValue,
-                selectValue: p.selectValue,
-                multiSelectValues: p.multiSelectValues,
-              }
-            })
-          updated.properties = [...existingProperties, ...newProperties]
-        }
-
-        return updated
-      }
-
-      updates.push({
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          const updatedPatient = updatePatientInQuery(data.patient, variables.data || {})
-          return {
-            ...data,
-            patient: updatedPatient
-          }
-        }
-      })
-
-      const allGetPatientsQueries = queryClient.getQueryCache().getAll()
-        .filter(query => {
-          const key = query.queryKey
-          return Array.isArray(key) && key[0] === 'GetPatients'
-        })
+  }, [])
 
-      for (const query of allGetPatientsQueries) {
-        updates.push({
-          queryKey: [...query.queryKey] as unknown[],
-          updateFn: (oldData: unknown) => {
-            const data = oldData as GetPatientsQuery | undefined
-            if (!data?.patients) return oldData
-            const patientIndex = data.patients.findIndex(p => p.id === patientId)
-            if (patientIndex === -1) return oldData
-            const patient = data.patients[patientIndex]
-            if (!patient) return oldData
-            const updatedPatient = updatePatientInQuery(patient as unknown as PatientType, variables.data || {})
-            if (!updatedPatient) return oldData
-            const updatedName = updatedPatient.firstname && updatedPatient.lastname
-              ? `${updatedPatient.firstname} ${updatedPatient.lastname}`.trim()
-              : updatedPatient.firstname || updatedPatient.lastname || patient.name || ''
-            const updateData = variables.data || {}
-            const updatedPatientForList: typeof data.patients[0] = {
-              ...patient,
-              firstname: updateData.firstname !== undefined ? (updateData.firstname || '') : patient.firstname,
-              lastname: updateData.lastname !== undefined ? (updateData.lastname || '') : patient.lastname,
-              name: updatedName,
-              sex: updateData.sex !== undefined && updateData.sex !== null ? updateData.sex : patient.sex,
-              birthdate: updateData.birthdate !== undefined ? (updateData.birthdate || null) : patient.birthdate,
-              ...('description' in patient && { description: updateData.description !== undefined ? updateData.description : (patient as unknown as PatientType & { description?: string | null }).description }),
-              clinic: updateData.clinicId !== undefined
-                ? (updateData.clinicId
-                    ? (locationsData?.locationNodes?.find(loc => loc.id === updateData.clinicId) as typeof patient.clinic || patient.clinic)
-                    : (null as unknown as typeof patient.clinic))
-                : patient.clinic,
-              position: updateData.positionId !== undefined
-                ? (updateData.positionId
-                    ? (locationsData?.locationNodes?.find(loc => loc.id === updateData.positionId) as typeof patient.position || patient.position)
-                    : (null as unknown as typeof patient.position))
-                : patient.position,
-              teams: updateData.teamIds !== undefined
-                ? (locationsData?.locationNodes?.filter(loc => updateData.teamIds?.includes(loc.id)).map(team => team as typeof patient.teams[0]) || patient.teams)
-                : patient.teams,
-              properties: updateData.properties !== undefined && updateData.properties !== null
-                ? (updatedPatient.properties || patient.properties)
-                : patient.properties,
-            }
-            return {
-              ...data,
-              patients: [
-                ...data.patients.slice(0, patientIndex),
-                updatedPatientForList,
-                ...data.patients.slice(patientIndex + 1)
-              ]
-            }
-          }
+  const handlePropertyValueChange = useCallback((definitionId: string, value: PropertyValue | null) => {
+    if (!isEditMode || !patientId || !patientData?.patient) return
+
+    const currentProperties = patientData.patient.properties || []
+    const propertyInputs: PropertyValueInput[] = []
+
+    // Add all existing properties except the one being changed
+    for (const prop of currentProperties) {
+      if (prop.definition.id !== definitionId) {
+        propertyInputs.push({
+          definitionId: prop.definition.id,
+          textValue: prop.textValue ?? undefined,
+          numberValue: prop.numberValue ?? undefined,
+          booleanValue: prop.booleanValue ?? undefined,
+          dateValue: prop.dateValue ?? undefined,
+          dateTimeValue: prop.dateTimeValue ?? undefined,
+          selectValue: prop.selectValue ?? undefined,
+          multiSelectValues: prop.multiSelectValues ?? undefined,
         })
       }
-
-      return updates
-    },
-  })
-
-  useEffect(() => {
-    return () => {
-      if (isEditMode) {
-        flush()
-      }
-    }
-  }, [isEditMode, flush])
-
-  const { mutate: admitPatient } = useSafeMutation<AdmitPatientMutation, { id: string }>({
-    mutationFn: async (variables) => {
-      return fetcher<AdmitPatientMutation, { id: string }>(AdmitPatientDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: () => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              state: PatientState.Admitted
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(p =>
-              p.id === patientId ? { ...p, state: PatientState.Admitted } : p)
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          const existingPatient = data.patients.find(p => p.id === patientId)
-          const updatedPatient = existingPatient
-            ? { ...existingPatient, state: PatientState.Admitted }
-            : { __typename: 'PatientType' as const, id: patientId, state: PatientState.Admitted, assignedLocation: null }
-          return {
-            ...data,
-            patients: existingPatient
-              ? data.patients.map(p => p.id === patientId ? updatedPatient : p)
-              : [...data.patients, updatedPatient],
-            waitingPatients: data.waitingPatients.filter(p => p.id !== patientId)
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatients'], ['GetGlobalData']],
-    onSuccess: () => {
-      onSuccess()
-    },
-  })
-
-  const { mutate: dischargePatient } = useSafeMutation<DischargePatientMutation, { id: string }>({
-    mutationFn: async (variables) => {
-      return fetcher<DischargePatientMutation, { id: string }>(DischargePatientDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: () => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              state: PatientState.Discharged
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(p =>
-              p.id === patientId ? { ...p, state: PatientState.Discharged } : p)
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          const existingPatient = data.patients.find(p => p.id === patientId)
-          const updatedPatient = existingPatient
-            ? { ...existingPatient, state: PatientState.Discharged }
-            : { __typename: 'PatientType' as const, id: patientId, state: PatientState.Discharged, assignedLocation: null }
-          return {
-            ...data,
-            patients: existingPatient
-              ? data.patients.map(p => p.id === patientId ? updatedPatient : p)
-              : [...data.patients, updatedPatient],
-            waitingPatients: data.waitingPatients.filter(p => p.id !== patientId)
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatients'], ['GetGlobalData']],
-    onSuccess: () => {
-      onSuccess()
-    },
-  })
-
-  const { mutate: markPatientDead } = useSafeMutation<MarkPatientDeadMutation, { id: string }>({
-    mutationFn: async (variables) => {
-      return fetcher<MarkPatientDeadMutation, { id: string }>(MarkPatientDeadDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: () => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              state: PatientState.Dead
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(p =>
-              p.id === patientId ? { ...p, state: PatientState.Dead } : p)
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          const existingPatient = data.patients.find(p => p.id === patientId)
-          const updatedPatient = existingPatient
-            ? { ...existingPatient, state: PatientState.Dead }
-            : { __typename: 'PatientType' as const, id: patientId, state: PatientState.Dead, assignedLocation: null }
-          return {
-            ...data,
-            patients: existingPatient
-              ? data.patients.map(p => p.id === patientId ? updatedPatient : p)
-              : [...data.patients, updatedPatient],
-            waitingPatients: data.waitingPatients.filter(p => p.id !== patientId)
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatients'], ['GetGlobalData']],
-    onSuccess: () => {
-      onSuccess()
-    },
-  })
-
-  const { mutate: waitPatient } = useSafeMutation<WaitPatientMutation, { id: string }>({
-    mutationFn: async (variables) => {
-      return fetcher<WaitPatientMutation, { id: string }>(WaitPatientDocument, variables)()
-    },
-    queryKey: ['GetPatient', { id: patientId }],
-    optimisticUpdate: () => [
-      {
-        queryKey: ['GetPatient', { id: patientId }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientQuery | undefined
-          if (!data?.patient) return oldData
-          return {
-            ...data,
-            patient: {
-              ...data.patient,
-              state: PatientState.Wait
-            }
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.map(p =>
-              p.id === patientId ? { ...p, state: PatientState.Wait } : p)
-          }
-        }
-      },
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          const existingPatient = data.patients.find(p => p.id === patientId)
-          const isAlreadyWaiting = data.waitingPatients.some(p => p.id === patientId)
-          const updatedPatient = existingPatient
-            ? { ...existingPatient, state: PatientState.Wait }
-            : { __typename: 'PatientType' as const, id: patientId, state: PatientState.Wait, assignedLocation: null }
-          return {
-            ...data,
-            patients: existingPatient
-              ? data.patients.map(p => p.id === patientId ? updatedPatient : p)
-              : [...data.patients, updatedPatient],
-            waitingPatients: isAlreadyWaiting
-              ? data.waitingPatients
-              : [...data.waitingPatients, updatedPatient]
-          }
-        }
-      }
-    ],
-    invalidateQueries: [['GetPatients'], ['GetGlobalData']],
-    onSuccess: () => {
-      onSuccess()
-    },
-  })
-
-  const { mutate: deletePatient } = useSafeMutation<DeletePatientMutation, DeletePatientMutationVariables>({
-    mutationFn: async (variables) => {
-      return fetcher<DeletePatientMutation, DeletePatientMutationVariables>(DeletePatientDocument, variables)()
-    },
-    queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-    optimisticUpdate: (variables) => [
-      {
-        queryKey: ['GetGlobalData', { rootLocationIds: selectedRootLocationIdsForQuery }],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetGlobalDataQuery | undefined
-          if (!data) return oldData
-          return {
-            ...data,
-            patients: (data.patients || []).filter(p => p.id !== variables.id),
-            waitingPatients: (data.waitingPatients || []).filter(p => p.id !== variables.id),
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatients'],
-        updateFn: (oldData: unknown) => {
-          const data = oldData as GetPatientsQuery | undefined
-          if (!data?.patients) return oldData
-          return {
-            ...data,
-            patients: data.patients.filter(p => p.id !== variables.id),
-          }
-        }
-      },
-      {
-        queryKey: ['GetPatient', { id: variables.id }],
-        updateFn: () => undefined,
-      }
-    ],
-    invalidateQueries: [['GetGlobalData'], ['GetPatients'], ['GetOverviewData']],
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-      onClose()
-    },
-  })
-
-  const handleFieldUpdate = (updates: Partial<UpdatePatientInput>, triggerType?: 'onChange' | 'onBlur' | 'onClose') => {
-    if (!isEditMode || !patientId) return
-    if (updates.firstname !== undefined && !updates.firstname?.trim()) return
-    if (updates.lastname !== undefined && !updates.lastname?.trim()) return
-    updateField({ id: patientId, data: updates }, triggerType)
-  }
-
-  const updateLocalState = (updates: Partial<CreatePatientInput>) => {
-    setFormData(prev => ({ ...prev, ...updates }))
-  }
-
-  const validateFirstname = (value: string): boolean => {
-    if (!value || !value.trim()) {
-      setFirstnameError(translation('firstName') + ' is required')
-      return false
-    }
-    setFirstnameError(null)
-    return true
-  }
-
-  const validateLastname = (value: string): boolean => {
-    if (!value || !value.trim()) {
-      setLastnameError(translation('lastName') + ' is required')
-      return false
-    }
-    setLastnameError(null)
-    return true
-  }
-
-  const validateClinic = (clinic?: LocationNodeType | null): boolean => {
-    const clinicToValidate = clinic !== undefined ? clinic : selectedClinic
-    if (!clinicToValidate || !clinicToValidate.id) {
-      setClinicError(translation('clinic') + ' is required')
-      return false
-    }
-    setClinicError(null)
-    return true
-  }
-
-  const validateBirthdate = (value: string | null | undefined): boolean => {
-    if (!value || !value.trim()) {
-      setBirthdateError(translation('birthdate') + ' is required')
-      return false
-    }
-    setBirthdateError(null)
-    return true
-  }
-
-  const validateSex = (value: Sex | null | undefined): boolean => {
-    if (!value) {
-      setSexError(translation('sex') + ' is required')
-      return false
-    }
-    setSexError(null)
-    return true
-  }
-
-  const isFormValid = useMemo(() => {
-    if (isEditMode) return true
-    const firstnameValid = formData.firstname?.trim() || false
-    const lastnameValid = formData.lastname?.trim() || false
-    const clinicValid = !!selectedClinic?.id
-    const birthdateValid = !!formData.birthdate && formData.birthdate.trim() !== ''
-    const sexValid = !!formData.sex
-    return firstnameValid && lastnameValid && clinicValid && birthdateValid && sexValid
-  }, [formData.firstname, formData.lastname, formData.birthdate, formData.sex, selectedClinic, isEditMode])
-
-  const handleSubmit = () => {
-    const firstnameValid = validateFirstname(formData.firstname || '')
-    const lastnameValid = validateLastname(formData.lastname || '')
-    const clinicValid = validateClinic()
-    const birthdateValid = validateBirthdate(formData.birthdate)
-    const sexValid = validateSex(formData.sex)
-
-    if (!firstnameValid || !lastnameValid || !clinicValid || !birthdateValid || !sexValid || !selectedClinic) {
-      return
-    }
-
-    const dataToSend = {
-      ...formData,
-      clinicId: selectedClinic.id,
-      state: isWaiting ? PatientState.Wait : PatientState.Admitted,
-    } as ExtendedCreatePatientInput
-
-    if (selectedPosition) {
-      dataToSend.positionId = selectedPosition.id
-    }
-
-    if (selectedTeams.length > 0) {
-      dataToSend.teamIds = selectedTeams.map(t => t.id)
-    }
-
-    if (!dataToSend.assignedLocationIds || dataToSend.assignedLocationIds.length === 0) {
-      delete dataToSend.assignedLocationIds
-    }
-    if (!dataToSend.positionId) {
-      delete dataToSend.positionId
-    }
-    if (!dataToSend.teamIds || dataToSend.teamIds.length === 0) {
-      delete dataToSend.teamIds
-    }
-
-    createPatient({ data: dataToSend })
-  }
-
-  const handleClinicSelect = (locations: LocationNodeType[]) => {
-    const clinic = locations[0]
-    if (clinic) {
-      setSelectedClinic(clinic)
-      updateLocalState({ clinicId: clinic.id } as Partial<ExtendedCreatePatientInput>)
-      if (isEditMode) {
-        handleFieldUpdate({ clinicId: clinic.id })
-      } else {
-        validateClinic(clinic)
-      }
-    } else {
-      setSelectedClinic(null)
-      updateLocalState({ clinicId: undefined } as Partial<ExtendedCreatePatientInput>)
-      if (isEditMode) {
-        handleFieldUpdate({ clinicId: undefined })
-      } else {
-        validateClinic(null)
-      }
     }
-    setIsClinicDialogOpen(false)
-  }
 
-  const handlePositionSelect = (locations: LocationNodeType[]) => {
-    const position = locations[0]
-    if (position) {
-      setSelectedPosition(position)
-      updateLocalState({ positionId: position.id } as Partial<ExtendedCreatePatientInput>)
-      if (isEditMode) {
-        handleFieldUpdate({ positionId: position.id })
-      }
-    } else {
-      setSelectedPosition(null)
-      updateLocalState({ positionId: undefined } as Partial<ExtendedCreatePatientInput>)
-      if (isEditMode) {
-        handleFieldUpdate({ positionId: null })
+    // Add the changed property if it's not null
+    if (value !== null) {
+      const newPropertyInput = convertPropertyValueToInput(definitionId, value)
+      if (newPropertyInput) {
+        propertyInputs.push(newPropertyInput)
       }
     }
-    setIsPositionDialogOpen(false)
-  }
-
-  const handleTeamsSelect = (locations: LocationNodeType[]) => {
-    setSelectedTeams(locations)
-    const teamIds = locations.map(loc => loc.id)
-    updateLocalState({ teamIds } as Partial<ExtendedCreatePatientInput>)
-    if (isEditMode) {
-      handleFieldUpdate({ teamIds })
-    }
-    setIsTeamsDialogOpen(false)
-  }
-
-  const sexOptions = [
-    { label: translation('male'), value: Sex.Male },
-    { label: translation('female'), value: Sex.Female },
-    { label: translation('diverse'), value: Sex.Unknown }
-  ]
-
-  const [openExpanded, setOpenExpanded] = useState(true)
-  const [closedExpanded, setClosedExpanded] = useState(false)
 
-  const sortByDueDate = <T extends { dueDate?: string | null }>(tasks: T[]): T[] => {
-    return [...tasks].sort((a, b) => {
-      if (!a.dueDate && !b.dueDate) return 0
-      if (!a.dueDate) return 1
-      if (!b.dueDate) return -1
-      return new Date(a.dueDate).getTime() - new Date(b.dueDate).getTime()
-    })
-  }
-
-  const tasks = useMemo(() => {
-    const baseTasks = patientData?.patient?.tasks || []
-    return baseTasks.map(task => {
-      const optimisticDone = optimisticTaskUpdates.get(task.id)
-      if (optimisticDone !== undefined) {
-        return { ...task, done: optimisticDone }
-      }
-      return task
+    updatePatient({
+      id: patientId,
+      data: {
+        properties: propertyInputs,
+      },
     })
-  }, [patientData?.patient?.tasks, optimisticTaskUpdates])
+  }, [isEditMode, patientId, patientData?.patient, convertPropertyValueToInput, updatePatient])
 
-  const openTasks = useMemo(() => sortByDueDate(tasks.filter(t => !t.done)), [tasks])
-  const closedTasks = useMemo(() => sortByDueDate(tasks.filter(t => t.done)), [tasks])
-  const totalTasks = openTasks.length + closedTasks.length
-  const taskProgress = totalTasks === 0 ? 0 : openTasks.length / totalTasks
+  const taskStats: { totalTasks: number, openTasks: number, closedTasks: number, taskProgress: number } = useMemo(() => ({
+    totalTasks: patientData?.patient?.tasks?.length ?? 0,
+    openTasks: patientData?.patient?.tasks?.filter(task => !task.done).length ?? 0,
+    closedTasks: patientData?.patient?.tasks?.filter(task => task.done).length ?? 0,
+    taskProgress: patientData?.patient?.tasks?.length ?? 0 > 0 ? (patientData?.patient?.tasks?.filter(task => task.done).length ?? 0) / (patientData?.patient?.tasks?.length ?? 0) : 0,
+  }), [patientData?.patient?.tasks])
 
   const patientName = patientData?.patient ? `${patientData.patient.firstname} ${patientData.patient.lastname}` : ''
   const displayLocation = useMemo(() => {
     if (patientData?.patient?.position) {
       return [patientData.patient.position]
     }
-    if (selectedClinic) {
-      return [selectedClinic]
-    }
     if (patientData?.patient?.assignedLocations && patientData.patient.assignedLocations.length > 0) {
       return patientData.patient.assignedLocations
     }
     return []
-  }, [patientData?.patient?.position, patientData?.patient?.assignedLocations, selectedClinic])
+  }, [patientData?.patient?.position, patientData?.patient?.assignedLocations])
 
-  const startDate = useMemo(() => {
-    const year = new Date()
-    year.setFullYear(year.getFullYear() - 100)
-    return year
-  }, [])
-
-  const endDate = useMemo(() => {
-    return new Date()
-  }, [])
-
-  useEffect(() => {
-    setOptimisticTaskUpdates(new Map())
-  }, [patientData?.patient?.tasks])
-
-  const handleToggleDone = (taskId: string, done: boolean) => {
-    setOptimisticTaskUpdates(prev => {
-      const next = new Map(prev)
-      next.set(taskId, done)
-      return next
-    })
-    if (done) {
-      setClosedExpanded(true)
-      completeTask({ id: taskId })
-    } else {
-      setOpenExpanded(true)
-      reopenTask({ id: taskId })
-    }
-  }
-
-  if (isEditMode && isLoadingPatient) {
-    return <LoadingContainer />
-  }
 
   return (
-    <div className="flex-col-0 h-full bg-surface">
+    <div className="flex-col-0 overflow-hidden">
       {isEditMode && patientName && (
-        <div className="px-1 py-3 mb-4">
+        <div className="py-3 mb-4">
           <div className="flex items-center justify-between">
             <div className="font-semibold text-lg">{patientName}</div>
             <div className="flex items-center gap-2">
-              {totalTasks > 0 && (
+              {taskStats.totalTasks > 0 && (
                 <Tooltip
-                  tooltip={`${translation('openTasks')}: ${openTasks.length}\n${translation('closedTasks')}: ${closedTasks.length}`}
+                  tooltip={`${translation('openTasks')}: ${taskStats.openTasks}\n${translation('closedTasks')}: ${taskStats.closedTasks}`}
                   position="top"
                   tooltipClassName="whitespace-pre-line"
                 >
                   <div className="w-12">
-                    <ProgressIndicator progress={taskProgress} rotation={-90} />
+                    <ProgressIndicator progress={taskStats.taskProgress} rotation={-90} />
                   </div>
                 </Tooltip>
               )}
@@ -1162,603 +183,45 @@ export const PatientDetailView = ({
           )}
         </div>
       )}
-      <div className="flex-col-0 flex-grow overflow-hidden">
-        <TabView className="h-full flex-col-0">
-          {isEditMode && (
-            <Tab label={translation('tasks')} className="h-full overflow-y-auto pr-2">
-              <div className="flex flex-col gap-4 pt-4">
-                <div className="mb-2">
-                  <Button
-                    startIcon={<PlusIcon />}
-                    onClick={() => setIsCreatingTask(true)}
-                    className="w-full"
-                  >
-                    {translation('addTask')}
-                  </Button>
-                </div>
-                <div>
-                  <button
-                    onClick={() => setOpenExpanded(!openExpanded)}
-                    className="text-lg font-bold mb-3 flex items-center gap-2 w-full text-left"
-                  >
-                    <ChevronDown className={clsx('size-5 transition-transform', { '-rotate-90': !openExpanded })} />
-                    <Circle className="size-5 text-warning" />
-                    {translation('openTasks')} ({openTasks.length})
-                  </button>
-                  {openExpanded && (
-                    <div className="flex flex-col gap-2">
-                      {openTasks.length === 0 &&
-                        <div className="text-description italic">{translation('noOpenTasks')}</div>}
-                      {openTasks.map(task => (
-                        <TaskCardView
-                          key={task.id}
-                          task={task}
-                          onClick={(t) => setTaskId(t.id)}
-                          onToggleDone={(taskId, done) => handleToggleDone(taskId, done)}
-                          showPatient={false}
-                          showAssignee={!!(task.assignee || task.assigneeTeam)}
-                          fullWidth={true}
-                        />
-                      ))}
-                    </div>
-                  )}
-                </div>
-
-                <div className="opacity-75">
-                  <button
-                    onClick={() => setClosedExpanded(!closedExpanded)}
-                    className="text-lg font-bold mb-3 flex items-center gap-2 w-full text-left"
-                  >
-                    <ChevronDown className={clsx('size-5 transition-transform', { '-rotate-90': !closedExpanded })} />
-                    <CheckCircle2 className="size-5 text-positive" />
-                    {translation('closedTasks')} ({closedTasks.length})
-                  </button>
-                  {closedExpanded && (
-                    <div className="flex flex-col gap-2">
-                      {closedTasks.length === 0 &&
-                        <div className="text-description italic">{translation('noClosedTasks')}</div>}
-                      {closedTasks.map(task => (
-                        <TaskCardView
-                          key={task.id}
-                          task={task}
-                          onClick={(t) => setTaskId(t.id)}
-                          onToggleDone={(taskId, done) => handleToggleDone(taskId, done)}
-                          showPatient={false}
-                          showAssignee={!!(task.assignee || task.assigneeTeam)}
-                          fullWidth={true}
-                        />
-                      ))}
-                    </div>
-                  )}
-                </div>
-              </div>
-            </Tab>
-          )}
-
-          {isEditMode && hasAvailableProperties && (
-            <Tab label={translation('properties')} className="h-full overflow-y-auto pr-2">
-              <div className="flex flex-col gap-4 pt-4">
-                <PropertyList
-                  subjectId={patientId!}
-                  subjectType="patient"
-                  fullWidthAddButton={true}
-                  propertyValues={patientData?.patient?.properties?.map(p => ({
-                    definition: {
-                      id: p.definition.id,
-                      name: p.definition.name,
-                      description: p.definition.description,
-                      fieldType: p.definition.fieldType,
-                      isActive: p.definition.isActive,
-                      allowedEntities: p.definition.allowedEntities,
-                      options: p.definition.options,
-                    },
-                    textValue: p.textValue,
-                    numberValue: p.numberValue,
-                    booleanValue: p.booleanValue,
-                    dateValue: p.dateValue,
-                    dateTimeValue: p.dateTimeValue,
-                    selectValue: p.selectValue,
-                    multiSelectValues: p.multiSelectValues,
-                  }))}
-                  onPropertyValueChange={(definitionId, value) => {
-                    const existingProperties = patientData?.patient?.properties?.map(p => ({
-                      definitionId: p.definition.id,
-                      textValue: p.textValue,
-                      numberValue: p.numberValue,
-                      booleanValue: p.booleanValue,
-                      dateValue: p.dateValue,
-                      dateTimeValue: p.dateTimeValue,
-                      selectValue: p.selectValue,
-                      multiSelectValues: p.multiSelectValues,
-                    })) || []
-
-                    if (value === null) {
-                      const updatedProperties = existingProperties.filter(p => p.definitionId !== definitionId)
-                      handleFieldUpdate({ properties: updatedProperties })
-                      return
-                    }
-
-                    const propertyInput: PropertyValueInput = {
-                      definitionId,
-                      textValue: value.textValue !== undefined ? (value.textValue !== null && value.textValue.trim() !== '' ? value.textValue : '') : null,
-                      numberValue: value.numberValue ?? null,
-                      booleanValue: value.boolValue ?? null,
-                      dateValue: value.dateValue && !isNaN(value.dateValue.getTime()) ? value.dateValue.toISOString().split('T')[0] : null,
-                      dateTimeValue: value.dateTimeValue && !isNaN(value.dateTimeValue.getTime()) ? value.dateTimeValue.toISOString() : null,
-                      selectValue: value.singleSelectValue || null,
-                      multiSelectValues: (value.multiSelectValue && value.multiSelectValue.length > 0) ? value.multiSelectValue : null,
-                    }
-
-                    const updatedProperties = [
-                      ...existingProperties.filter(p => p.definitionId !== definitionId),
-                      propertyInput,
-                    ]
-
-                    handleFieldUpdate({ properties: updatedProperties })
-                  }}
-                />
-              </div>
-            </Tab>
-          )}
-
-          <Tab label={translation('patientData')} className="flex-col-6 px-1 pt-4 h-full overflow-x-visible overflow-y-auto">
-            <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-              <FormElementWrapper
-                label={translation('firstName')}
-                error={firstnameError || undefined}
-                isShowingError={!!firstnameError}
-              >
-                {({ isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                  <Input
-                    {...bag}
-                    value={formData.firstname}
-                    placeholder={translation('firstName')}
-                    required
-                    onChange={e => {
-                      const val = e.target.value
-                      updateLocalState({ firstname: val })
-                      if (isShowingError) {
-                        validateFirstname(val)
-                      }
-                    }}
-                    onBlur={() => {
-                      validateFirstname(formData.firstname || '')
-                      if (isEditMode) {
-                        handleFieldUpdate({ firstname: formData.firstname }, 'onBlur')
-                      }
-                    }}
-                  />
-                )}
-              </FormElementWrapper>
-              <FormElementWrapper
-                label={translation('lastName')}
-                error={lastnameError || undefined}
-                isShowingError={!!lastnameError}
-              >
-                {({ isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                  <Input
-                    {...bag}
-                    value={formData.lastname}
-                    placeholder={translation('lastName')}
-                    required
-                    onChange={e => {
-                      const val = e.target.value
-                      updateLocalState({ lastname: val })
-                      if (isShowingError) {
-                        validateLastname(val)
-                      }
-                    }}
-                    onBlur={() => {
-                      validateLastname(formData.lastname || '')
-                      if (isEditMode) {
-                        handleFieldUpdate({ lastname: formData.lastname }, 'onBlur')
-                      }
-                    }}
-                  />
-                )}
-              </FormElementWrapper>
-            </div>
-
-            <FormElementWrapper
-              label={translation('birthdate')}
-              error={birthdateError || undefined}
-              isShowingError={!!birthdateError}
-            >
-              {({ isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                <DateTimeInput
-                  {...bag}
-                  date={formData.birthdate ? new Date(formData.birthdate as string) : undefined}
-                  pickerProps={{
-                    start: startDate,
-                    end: endDate
-                  }}
-                  mode="date"
-                  required={true}
-                  onValueChange={(date) => {
-                    const dateStr = toISODate(date)
-                    updateLocalState({ birthdate: dateStr })
-                    if (isShowingError) {
-                      validateBirthdate(dateStr)
-                    }
-                  }}
-                  onEditCompleted={(date) => {
-                    if (date) {
-                      const utcDate = localToUTCWithSameTime(date)
-                      const isoDate = utcDate ? toISODate(utcDate) : null
-                      updateLocalState({ birthdate: isoDate })
-                      if (isEditMode) {
-                        handleFieldUpdate({ birthdate: isoDate }, 'onClose')
-                      }
-                    }
-                  }}
-                  onRemove={() => {
-                    updateLocalState({ birthdate: null })
-                    if (isEditMode) {
-                      handleFieldUpdate({ birthdate: null })
-                    } else {
-                      validateBirthdate(null)
-                    }
-                  }}
-                />
-              )}
-            </FormElementWrapper>
-
-            <FormElementWrapper
-              label={translation('sex')}
-              error={sexError || undefined}
-              isShowingError={!!sexError}
-            >
-              {({ isShowingError: _isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                <Select
-                  {...bag}
-                  value={formData.sex}
-                  onValueChanged={(value) => {
-                    updateLocalState({ sex: value as Sex })
-                    if (isEditMode) {
-                      handleFieldUpdate({ sex: value as Sex }, 'onChange')
-                    }
-                    validateSex(value as Sex)
-                  }}
-                >
-                  {sexOptions.map(option => (
-                    <SelectOption key={option.value} value={option.value}>
-                      {option.label}
-                    </SelectOption>
-                  ))}
-                </Select>
-              )}
-            </FormElementWrapper>
-
-            <FormElementWrapper label={translation('description')}>
-              {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
-                <Textarea
-                  {...bag}
-                  value={formData.description || ''}
-                  placeholder={translation('descriptionPlaceholder')}
-                    onChange={e => updateLocalState({ description: e.target.value })}
-                    onBlur={() => {
-                      if (isEditMode) {
-                        handleFieldUpdate({ description: formData.description }, 'onBlur')
-                      }
-                    }}
-                />
-              )}
-            </FormElementWrapper>
-
-            {!isEditMode && (
-              <FormElementWrapper label="">
-                {() => (
-                  <div className="flex items-center gap-2">
-                    <Checkbox
-                      checked={isWaiting}
-                      onCheckedChange={setIsWaiting}
-                    />
-                    <span>{translation('waitingForPatient')}</span>
-                  </div>
-                )}
-              </FormElementWrapper>
-            )}
-
-            {isEditMode && patientId && patientData?.patient && (() => {
-              const patient = patientData.patient
-              return (
-                <FormElementWrapper label={translation('patientActions')}>
-                  {() => (
-                    <div className="flex gap-4 flex-wrap">
-                      {patient.state !== PatientState.Admitted && (
-                        <Button
-                          onClick={() => admitPatient({ id: patientId })}
-                          color="positive"
-                        >
-                          {translation('admitPatient')}
-                        </Button>
-                      )}
-                      {patient.state !== PatientState.Discharged && (
-                        <Button
-                          onClick={() => setIsDischargeDialogOpen(true)}
-                          color="neutral"
-                          coloringStyle="outline"
-                        >
-                          {translation('dischargePatient')}
-                        </Button>
-                      )}
-                      {patient.state !== PatientState.Wait && (
-                        <Button
-                          onClick={() => waitPatient({ id: patientId })}
-                          color="warning"
-                        >
-                          {translation('waitPatient')}
-                        </Button>
-                      )}
-                    </div>
-                  )}
-                </FormElementWrapper>
-              )
-            })()}
-
-            <FormElementWrapper
-              label={translation('clinic') + ' *'}
-              error={clinicError || undefined}
-              isShowingError={!!clinicError}
-            >
-              {({ isShowingError: _isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                <div className="flex flex-col gap-2">
-                  <div className="flex gap-2">
-                    <Input
-                      {...bag}
-                      value={selectedClinic ? (locationsMap.size > 0 ? formatLocationPathFromId(selectedClinic.id, locationsMap) : formatLocationPath(selectedClinic)) : ''}
-                      placeholder={translation('selectClinic')}
-                      readOnly
-                      className="flex-grow cursor-pointer"
-                      required
-                      onClick={() => setIsClinicDialogOpen(true)}
-                    />
-                    <Button
-                      onClick={() => setIsClinicDialogOpen(true)}
-                      layout="icon"
-                      title={translation('selectClinic')}
-                    >
-                      <Building2 className="size-4" />
-                    </Button>
-                    {selectedClinic && !isEditMode && (
-                      <Button
-                        onClick={() => {
-                          setSelectedClinic(null)
-                          updateLocalState({ clinicId: undefined } as Partial<ExtendedCreatePatientInput>)
-                          if (isEditMode) {
-                            handleFieldUpdate({ clinicId: undefined })
-                          } else {
-                            validateClinic(null)
-                          }
-                        }}
-                        layout="icon"
-                        color="neutral"
-                        title={translation('clear')}
-                      >
-                        <XIcon className="size-5" />
-                      </Button>
-                    )}
-                  </div>
-                </div>
-              )}
-            </FormElementWrapper>
-
-            <FormElementWrapper label={translation('position')}>
-              {({ isShowingError: _, setIsShowingError: _2, ...bag }) => (
-                <div className="flex flex-col gap-2">
-                  <div className="flex gap-2">
-                    <Input
-                      {...bag}
-                      value={selectedPosition ? (locationsMap.size > 0 ? formatLocationPathFromId(selectedPosition.id, locationsMap) : formatLocationPath(selectedPosition)) : ''}
-                      placeholder={translation('selectPosition')}
-                      readOnly
-                      className="flex-grow cursor-pointer"
-                      onClick={() => setIsPositionDialogOpen(true)}
-                    />
-                    <Button
-                      onClick={() => setIsPositionDialogOpen(true)}
-                      layout="icon"
-                      title={translation('selectPosition')}
-                    >
-                      <Locate className="size-4" />
-                    </Button>
-                    {selectedPosition && (
-                      <Button
-                        onClick={() => {
-                          setSelectedPosition(null)
-                          updateLocalState({ positionId: undefined } as Partial<ExtendedCreatePatientInput>)
-                          if (isEditMode) {
-                            handleFieldUpdate({ positionId: null })
-                          }
-                        }}
-                        layout="icon"
-                        color="neutral"
-                        title={translation('clear')}
-                      >
-                        <XIcon className="size-5" />
-                      </Button>
-                    )}
-                  </div>
-                </div>
-              )}
-            </FormElementWrapper>
-
-            <FormElementWrapper label={translation('teams')}>
-              {({ isShowingError: _, setIsShowingError: _2, ...bag }) => (
-                <div className="flex flex-col gap-2">
-                  <div className="flex gap-2">
-                    <Input
-                      {...bag}
-                      value={selectedTeams.length > 0
-                        ? selectedTeams.map(loc => locationsMap.size > 0 ? formatLocationPathFromId(loc.id, locationsMap) : formatLocationPath(loc)).join(', ')
-                        : ''}
-                      placeholder={translation('selectTeams')}
-                      readOnly
-                      className="flex-grow cursor-pointer"
-                      onClick={() => setIsTeamsDialogOpen(true)}
-                    />
-                    <Button
-                      onClick={() => setIsTeamsDialogOpen(true)}
-                      layout="icon"
-                      title={translation('selectTeams')}
-                    >
-                      <Users className="size-4" />
-                    </Button>
-                    {selectedTeams.length > 0 && (
-                      <Button
-                        onClick={() => {
-                          setSelectedTeams([])
-                          updateLocalState({ teamIds: [] } as Partial<ExtendedCreatePatientInput>)
-                          if (isEditMode) {
-                            handleFieldUpdate({ teamIds: [] })
-                          }
-                        }}
-                        layout="icon"
-                        color="neutral"
-                        title={translation('clear')}
-                      >
-                        <XIcon className="size-5" />
-                      </Button>
-                    )}
-                  </div>
-                </div>
-              )}
-            </FormElementWrapper>
-
-            {isEditMode && patientId && patientData?.patient && (
-              <div className="pt-6 mt-6 border-t border-divider flex justify-end gap-2">
-                {patientData.patient.state !== PatientState.Dead && (
-                  <Button
-                    onClick={() => setIsMarkDeadDialogOpen(true)}
-                    color="negative"
-                    coloringStyle="outline"
-                  >
-                    {translation('markPatientDead')}
-                  </Button>
-                )}
-                <Button
-                  onClick={() => setIsDeleteDialogOpen(true)}
-                  color="negative"
-                  coloringStyle="outline"
-                >
-                  {translation('deletePatient') ?? 'Delete Patient'}
-                </Button>
-              </div>
-            )}
-          </Tab>
-
-          {isEditMode && patientId && (
-            <Tab label="Audit Log" className="flex-col-6 px-1 pt-4 h-full overflow-x-visible overflow-y-auto">
-              <AuditLogTimeline caseId={patientId} enabled={true} />
-            </Tab>
-          )}
-        </TabView>
-      </div>
-
-      {!isEditMode && (
-        <div className="flex-none pt-4 mt-auto border-t border-divider flex justify-end gap-2">
-          <LoadingButton
-            onClick={handleSubmit}
-            isLoading={isCreating}
-            disabled={!isFormValid}
-          >
-            {translation('create')}
-          </LoadingButton>
-        </div>
-      )}
-
-      <ConfirmDialog
-        isOpen={isMarkDeadDialogOpen}
-        onCancel={() => setIsMarkDeadDialogOpen(false)}
-        onConfirm={() => {
-          if (patientId) {
-            markPatientDead({ id: patientId })
-          }
-          setIsMarkDeadDialogOpen(false)
-        }}
-        titleElement={translation('markPatientDead')}
-        description={translation('markPatientDeadConfirmation')}
-        confirmType="negative"
-      />
-
-      <ConfirmDialog
-        isOpen={isDischargeDialogOpen}
-        onCancel={() => setIsDischargeDialogOpen(false)}
-        onConfirm={() => {
-          if (patientId) {
-            dischargePatient({ id: patientId })
-          }
-          setIsDischargeDialogOpen(false)
-        }}
-        titleElement={translation('dischargePatient')}
-        description={translation('dischargePatientConfirmation')}
-        confirmType="neutral"
-      />
-
-      <ConfirmDialog
-        isOpen={isDeleteDialogOpen}
-        onCancel={() => setIsDeleteDialogOpen(false)}
-        onConfirm={() => {
-          if (patientId) {
-            deletePatient({ id: patientId })
-          }
-          setIsDeleteDialogOpen(false)
-        }}
-        titleElement={translation('deletePatient') ?? 'Delete Patient'}
-        description={translation('deletePatientConfirmation') ?? 'Are you sure you want to delete this patient? This action cannot be undone.'}
-        confirmType="negative"
-      />
-
-      <LocationSelectionDialog
-        isOpen={isClinicDialogOpen}
-        onClose={() => setIsClinicDialogOpen(false)}
-        onSelect={handleClinicSelect}
-        initialSelectedIds={selectedClinic ? [selectedClinic.id] : []}
-        multiSelect={false}
-        useCase="clinic"
-      />
-      <LocationSelectionDialog
-        isOpen={isPositionDialogOpen}
-        onClose={() => setIsPositionDialogOpen(false)}
-        onSelect={handlePositionSelect}
-        initialSelectedIds={selectedPosition ? [selectedPosition.id] : []}
-        multiSelect={false}
-        useCase="position"
-      />
-      <LocationSelectionDialog
-        isOpen={isTeamsDialogOpen}
-        onClose={() => setIsTeamsDialogOpen(false)}
-        onSelect={handleTeamsSelect}
-        initialSelectedIds={selectedTeams.map(loc => loc.id)}
-        multiSelect={true}
-        useCase="teams"
-      />
-      <SidePanel
-        isOpen={!!taskId || isCreatingTask}
-        onClose={() => {
-          setTaskId(null)
-          setIsCreatingTask(false)
-        }}
-        title={taskId ? translation('editTask') : translation('createTask')}
-      >
-        <TaskDetailView
-          taskId={taskId}
-          initialPatientId={isCreatingTask ? patientId : undefined}
-          onSuccess={() => {
-            onSuccess()
-            setIsCreatingTask(false)
-          }}
-          onClose={() => {
-            setTaskId(null)
-            setIsCreatingTask(false)
-          }}
-        />
-      </SidePanel>
-      <ErrorDialog
-        isOpen={errorDialog.isOpen}
-        onClose={() => setErrorDialog({ isOpen: false })}
-        message={errorDialog.message}
-      />
+      <TabSwitcher>
+        <TabList/>
+        {isEditMode && patientId && (
+          <TabPanel label={translation('tasks')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+            <PatientTasksView
+              patientId={patientId}
+              patientData={patientData}
+              onSuccess={onSuccess}
+            />
+          </TabPanel>
+        )}
+
+        {isEditMode && hasAvailableProperties && patientId && (
+          <TabPanel label={translation('properties')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+            <PropertyList
+              subjectId={patientId}
+              subjectType="patient"
+              fullWidthAddButton={true}
+              propertyValues={patientData?.patient?.properties}
+              onPropertyValueChange={handlePropertyValueChange}
+            />
+          </TabPanel>
+        )}
+
+        <TabPanel label={translation('patientData')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+          <PatientDataEditor
+            id={patientId || null}
+            initialCreateData={initialCreateData}
+            onSuccess={onSuccess}
+            onClose={onClose}
+          />
+        </TabPanel>
+
+        {isEditMode && patientId && (
+          <TabPanel label="Audit Log" className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+            <AuditLogTimeline caseId={patientId} enabled={true} />
+          </TabPanel>
+        )}
+      </TabSwitcher>
     </div>
   )
 }
diff --git a/web/components/patients/PatientStateChip.tsx b/web/components/patients/PatientStateChip.tsx
index 3927ebab..9762eb1a 100644
--- a/web/components/patients/PatientStateChip.tsx
+++ b/web/components/patients/PatientStateChip.tsx
@@ -11,21 +11,21 @@ export const PatientStateChip = ({ state }: PatientStateChipProps) => {
 
   const getColor = (state: PatientState): 'positive' | 'warning' | 'neutral' | 'negative' => {
     switch (state) {
-      case PatientState.Admitted:
-        return 'positive'
-      case PatientState.Wait:
-        return 'warning'
-      case PatientState.Discharged:
-        return 'neutral'
-      case PatientState.Dead:
-        return 'negative'
-      default:
-        return 'neutral'
+    case PatientState.Admitted:
+      return 'positive'
+    case PatientState.Wait:
+      return 'warning'
+    case PatientState.Discharged:
+      return 'neutral'
+    case PatientState.Dead:
+      return 'negative'
+    default:
+      return 'neutral'
     }
   }
 
   return (
-    <Chip color={getColor(state)} size="small" className="font-[var(--font-space-grotesk)] uppercase text-xs">
+    <Chip color={getColor(state)} size="sm" className="font-[var(--font-space-grotesk)] uppercase text-xs">
       {translation('patientState', { state: state as string })}
     </Chip>
   )
diff --git a/web/components/patients/PatientTasksView.tsx b/web/components/patients/PatientTasksView.tsx
new file mode 100644
index 00000000..e980e081
--- /dev/null
+++ b/web/components/patients/PatientTasksView.tsx
@@ -0,0 +1,184 @@
+import { useState, useMemo, useEffect } from 'react'
+import { Button, Drawer, ExpandableContent, ExpandableHeader, ExpandableRoot } from '@helpwave/hightide'
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import { CheckCircle2, ChevronDown, Circle, PlusIcon } from 'lucide-react'
+import { TaskCardView } from '@/components/tasks/TaskCardView'
+import clsx from 'clsx'
+import type { GetPatientQuery } from '@/api/gql/generated'
+import { TaskDetailView } from '@/components/tasks/TaskDetailView'
+import { useOptimisticCompleteTaskMutation, useOptimisticReopenTaskMutation } from '@/api/optimistic-updates/GetPatient'
+
+interface PatientTasksViewProps {
+  patientId: string,
+  patientData: GetPatientQuery | undefined,
+  onSuccess?: () => void,
+}
+
+const sortByDueDate = <T extends { dueDate?: string | null }>(tasks: T[]): T[] => {
+  return [...tasks].sort((a, b) => {
+    if (!a.dueDate && !b.dueDate) return 0
+    if (!a.dueDate) return 1
+    if (!b.dueDate) return -1
+    return new Date(a.dueDate).getTime() - new Date(b.dueDate).getTime()
+  })
+}
+
+export const PatientTasksView = ({
+  patientId,
+  patientData,
+  onSuccess,
+}: PatientTasksViewProps) => {
+  const translation = useTasksTranslation()
+  const [taskId, setTaskId] = useState<string | null>(null)
+  const [isCreatingTask, setIsCreatingTask] = useState(false)
+  const [optimisticTaskUpdates, setOptimisticTaskUpdates] = useState<Map<string, boolean>>(new Map())
+
+  const { mutate: completeTask } = useOptimisticCompleteTaskMutation({
+    id: patientId,
+    onSuccess: async () => {
+      onSuccess?.()
+    },
+    onError: (error, variables) => {
+      setOptimisticTaskUpdates(prev => {
+        const next = new Map(prev)
+        next.delete(variables.id)
+        return next
+      })
+    },
+  })
+
+  const { mutate: reopenTask } = useOptimisticReopenTaskMutation({
+    id: patientId,
+    onSuccess: async () => {
+      onSuccess?.()
+    },
+    onError: (error, variables) => {
+      setOptimisticTaskUpdates(prev => {
+        const next = new Map(prev)
+        next.delete(variables.id)
+        return next
+      })
+    },
+  })
+
+  const tasks = useMemo(() => {
+    const baseTasks = patientData?.patient?.tasks || []
+    return baseTasks.map(task => {
+      const optimisticDone = optimisticTaskUpdates.get(task.id)
+      if (optimisticDone !== undefined) {
+        return { ...task, done: optimisticDone }
+      }
+      return task
+    })
+  }, [patientData?.patient?.tasks, optimisticTaskUpdates])
+
+  const openTasks = useMemo(() => sortByDueDate(tasks.filter(t => !t.done)), [tasks])
+  const closedTasks = useMemo(() => sortByDueDate(tasks.filter(t => t.done)), [tasks])
+
+  useEffect(() => {
+    setOptimisticTaskUpdates(new Map())
+  }, [patientData?.patient?.tasks])
+
+  const handleToggleDone = (taskId: string, done: boolean) => {
+    setOptimisticTaskUpdates(prev => {
+      const next = new Map(prev)
+      next.set(taskId, done)
+      return next
+    })
+    if (done) {
+      completeTask({ id: taskId })
+    } else {
+      reopenTask({ id: taskId })
+    }
+  }
+
+  return (
+    <>
+      <div className="flex flex-col gap-4 pt-4">
+        <div className="mb-2">
+          <Button
+            onClick={() => setIsCreatingTask(true)}
+            className="w-full"
+          >
+            <PlusIcon />
+            {translation('addTask')}
+          </Button>
+        </div>
+        <ExpandableRoot className="shadow-none group/expandable" isExpanded={true}>
+          <ExpandableHeader
+            className="justify-start p-2 ext-lg font-bold"
+            isUsingDefaultIcon={false}
+          >
+            <ChevronDown className={clsx('size-5 transition-transform -rotate-90 group-data-[expanded]/expandable:rotate-0')} />
+            <Circle className="size-5 text-warning" />
+            {translation('openTasks')} ({openTasks.length})
+          </ExpandableHeader>
+          <ExpandableContent className="expandable-content-h-56 px-1 data-[expanded]:py-2">
+            {openTasks.length === 0 &&
+                <div className="text-description italic">{translation('noOpenTasks')}</div>}
+            {openTasks.map(task => (
+              <TaskCardView
+                key={task.id}
+                task={task}
+                onClick={(t) => setTaskId(t.id)}
+                onToggleDone={handleToggleDone}
+                showPatient={false}
+                showAssignee={!!(task.assignee || task.assigneeTeam)}
+                fullWidth={true}
+              />
+            ))}
+          </ExpandableContent>
+        </ExpandableRoot>
+
+        <ExpandableRoot className="shadow-none opacity-75 group/expandable">
+          <ExpandableHeader
+            className="justify-start p-2 ext-lg font-bold"
+            isUsingDefaultIcon={false}
+          >
+            <ChevronDown className={clsx('size-5 transition-transform -rotate-90 group-data-[expanded]/expandable:rotate-0')} />
+            <CheckCircle2 className="size-5 text-positive" />
+            {translation('closedTasks')} ({closedTasks.length})
+          </ExpandableHeader>
+          <ExpandableContent className="expandable-content-h-56 px-1 data-[expanded]:py-2">
+            {closedTasks.length === 0 &&
+                <div className="text-description italic">{translation('noClosedTasks')}</div>}
+            {closedTasks.map(task => (
+              <TaskCardView
+                key={task.id}
+                task={task}
+                onClick={(t) => setTaskId(t.id)}
+                onToggleDone={handleToggleDone}
+                showPatient={false}
+                showAssignee={!!(task.assignee || task.assigneeTeam)}
+                fullWidth={true}
+              />
+            ))}
+          </ExpandableContent>
+        </ExpandableRoot>
+      </div>
+      <Drawer
+        isOpen={!!taskId || isCreatingTask}
+        onClose={() => {
+          setTaskId(null)
+          setIsCreatingTask(false)
+        }}
+        alignment="right"
+        titleElement={taskId ? translation('editTask') : translation('createTask')}
+        description={undefined}
+      >
+        <TaskDetailView
+          taskId={taskId}
+          initialPatientId={isCreatingTask ? patientId : undefined}
+          onSuccess={() => {
+            onSuccess?.()
+            setIsCreatingTask(false)
+          }}
+          onClose={() => {
+            setTaskId(null)
+            setIsCreatingTask(false)
+          }}
+        />
+      </Drawer>
+    </>
+  )
+}
diff --git a/web/components/properties/PropertyCell.tsx b/web/components/properties/PropertyCell.tsx
new file mode 100644
index 00000000..daff1798
--- /dev/null
+++ b/web/components/properties/PropertyCell.tsx
@@ -0,0 +1,73 @@
+import { Chip, FillerCell, Tooltip } from '@helpwave/hightide'
+import { SmartDate } from '@/utils/date'
+import { FieldType } from '@/api/gql/generated'
+import type { PropertyValueType } from '@/api/gql/generated'
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+
+export interface PropertyCellProps {
+  property?: PropertyValueType | undefined,
+  fieldType: FieldType,
+}
+
+
+export const PropertyCell = ({
+  property,
+  fieldType,
+}: PropertyCellProps) => {
+  const translation = useTasksTranslation()
+
+
+  if (!property) {
+    return <FillerCell />
+  }
+
+  switch (fieldType) {
+  case FieldType.FieldTypeCheckbox:
+    return (
+      <Chip
+        className="coloring-tonal"
+        color={property.booleanValue ? 'positive' : 'negative'}
+      >
+        {property.booleanValue ? translation('yes') : translation('no')}
+      </Chip>
+    )
+  case FieldType.FieldTypeDate:
+    return (
+      <SmartDate date={property.dateValue ?? new Date()} showTime={false} />
+    )
+  case FieldType.FieldTypeDateTime:
+    return (
+      <SmartDate date={property.dateTimeValue ?? new Date()} />
+    )
+  case FieldType.FieldTypeSelect:
+    return (
+      <Chip className="primary coloring-tonal">
+        {property.selectValue}
+      </Chip>
+    )
+  case FieldType.FieldTypeMultiSelect:
+    return (
+      <div className="flex flex-wrap gap-1">
+        {property.multiSelectValues?.map((val) => {
+          return (
+            <Chip key={val} className="primary coloring-tonal">
+              {val}
+            </Chip>
+          )
+        })}
+      </div>
+    )
+  case FieldType.FieldTypeNumber:
+    return (
+      <span className="truncate">{property.numberValue}</span>
+    )
+  case FieldType.FieldTypeText:
+    return (
+      <Tooltip tooltip={property.textValue} tooltipClassName="whitespace-wrap">
+        <span className="truncate">{property.textValue ?? property.numberValue}</span>
+      </Tooltip>
+    )
+  default:
+    return <FillerCell />
+  }
+}
\ No newline at end of file
diff --git a/web/components/properties/PropertyDetailView.tsx b/web/components/properties/PropertyDetailView.tsx
index a8295683..b7108e9f 100644
--- a/web/components/properties/PropertyDetailView.tsx
+++ b/web/components/properties/PropertyDetailView.tsx
@@ -1,16 +1,19 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useState, useRef } from 'react'
+import type { FormFieldDataHandling } from '@helpwave/hightide'
 import {
   Button,
   Checkbox,
-  FormElementWrapper,
   Input,
-  LoadingButton,
   Select,
   SelectOption,
-  Textarea
+  Textarea,
+  FormField,
+  FormProvider,
+  useCreateForm,
+  FormObserverKey
 } from '@helpwave/hightide'
-import type { Property, PropertyFieldType, PropertySelectOption, PropertySubjectType } from '@/components/PropertyList'
-import { propertyFieldTypeList, propertySubjectTypeList } from '@/components/PropertyList'
+import type { Property, PropertyFieldType, PropertySelectOption, PropertySubjectType } from '@/components/tables/PropertyList'
+import { propertyFieldTypeList, propertySubjectTypeList } from '@/components/tables/PropertyList'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { PlusIcon, XIcon } from 'lucide-react'
 import {
@@ -27,6 +30,35 @@ interface PropertyDetailViewProps {
   onSuccess: () => void,
 }
 
+type PropertyFormValues = {
+  name: string,
+  description: string,
+  subjectType: PropertySubjectType,
+  fieldType: PropertyFieldType,
+  isArchived: boolean,
+  selectData?: {
+    isAllowingFreetext: boolean,
+    options: PropertySelectOption[],
+  },
+}
+
+const mapFieldTypeToBackend = (fieldType: PropertyFieldType): FieldType => {
+  const mapping: Record<PropertyFieldType, FieldType> = {
+    text: FieldType.FieldTypeText,
+    number: FieldType.FieldTypeNumber,
+    checkbox: FieldType.FieldTypeCheckbox,
+    date: FieldType.FieldTypeDate,
+    dateTime: FieldType.FieldTypeDateTime,
+    singleSelect: FieldType.FieldTypeSelect,
+    multiSelect: FieldType.FieldTypeMultiSelect,
+  }
+  return mapping[fieldType]
+}
+
+const mapSubjectTypeToBackend = (subjectType: PropertySubjectType): PropertyEntity => {
+  return subjectType === 'patient' ? PropertyEntity.Patient : PropertyEntity.Task
+}
+
 export const PropertyDetailView = ({
   id,
   initialData,
@@ -36,18 +68,6 @@ export const PropertyDetailView = ({
   const translation = useTasksTranslation()
   const isEditMode = !!id
 
-  const [formData, setFormData] = useState<Property>({
-    id: '',
-    name: '',
-    subjectType: 'patient',
-    fieldType: 'singleSelect',
-    description: '',
-    isArchived: false,
-    selectData: undefined,
-    alwaysIncludeForViewSource: false,
-    setId: '',
-    ...initialData
-  })
   const [newOption, setNewOption] = useState<PropertySelectOption>({
     id: '',
     name: '',
@@ -55,83 +75,34 @@ export const PropertyDetailView = ({
     isCustom: false,
   })
 
-  useEffect(() => {
-    if (initialData && !isEditMode) {
-      const isSelectType = initialData.fieldType === 'multiSelect' || initialData.fieldType === 'singleSelect'
-      const selectData = isSelectType && !initialData.selectData && initialData.fieldType ? {
-        isAllowingFreetext: false,
-        options: [],
-      } : initialData.selectData
-
-      setFormData(prev => ({
-        ...prev,
-        ...initialData,
-        selectData,
-      }))
-    } else if (initialData && isEditMode && id && initialData.id === id) {
-      const isSelectType = initialData.fieldType === 'multiSelect' || initialData.fieldType === 'singleSelect'
-      const selectData = isSelectType && !initialData.selectData && initialData.fieldType ? {
-        isAllowingFreetext: false,
-        options: [],
-      } : initialData.selectData
-
-      setFormData(prev => {
-        if (prev.id === id && prev.selectData?.options && selectData?.options) {
-          const existingOptionNames = new Set(prev.selectData.options.map(o => o.name))
-          const newOptionNames = new Set(selectData.options.map(o => o.name))
-          const optionsChanged = prev.selectData.options.length !== selectData.options.length ||
-            !prev.selectData.options.every(o => newOptionNames.has(o.name)) ||
-            !selectData.options.every(o => existingOptionNames.has(o.name))
-
-          if (!optionsChanged) {
-            return prev
-          }
-        }
-        return {
-          ...prev,
-          ...initialData,
-          selectData,
-        }
-      })
-    }
-  }, [initialData, isEditMode, id])
-
-  const mapFieldTypeToBackend = (fieldType: PropertyFieldType): FieldType => {
-    const mapping: Record<PropertyFieldType, FieldType> = {
-      text: FieldType.FieldTypeText,
-      number: FieldType.FieldTypeNumber,
-      checkbox: FieldType.FieldTypeCheckbox,
-      date: FieldType.FieldTypeDate,
-      dateTime: FieldType.FieldTypeDateTime,
-      singleSelect: FieldType.FieldTypeSelect,
-      multiSelect: FieldType.FieldTypeMultiSelect,
-    }
-    return mapping[fieldType]
-  }
-
-  const mapSubjectTypeToBackend = (subjectType: PropertySubjectType): PropertyEntity => {
-    return subjectType === 'patient' ? PropertyEntity.Patient : PropertyEntity.Task
-  }
-
-  const { mutate: createProperty, isLoading: isCreating } = useCreatePropertyDefinitionMutation({
+  const [isCreating, setIsCreating] = useState<boolean>(false)
+  const { mutate: createProperty } = useCreatePropertyDefinitionMutation({
+    onMutate: () => {
+      setIsCreating(true)
+    },
+    onSettled: () => {
+      setIsCreating(false)
+    },
     onSuccess: () => {
       onSuccess()
       onClose()
     }
   })
 
-  const { mutate: updateProperty, isLoading: isUpdating } = useUpdatePropertyDefinitionMutation({
+  const [isUpdating, setIsUpdating] = useState<boolean>(false)
+  const { mutate: updateProperty } = useUpdatePropertyDefinitionMutation({
+    onMutate: () => {
+      setIsUpdating(true)
+    },
+    onSettled: () => {
+      setIsUpdating(false)
+    },
     onSuccess: () => {
       onSuccess()
     }
   })
 
-  const isLoading = isCreating || isUpdating
-
-  const updateLocal = (updates: Partial<Property>) =>
-    setFormData(prev => ({ ...prev, ...updates }))
-
-  const persist = (updates: Partial<Property>) => {
+  const persist = (updates: Partial<PropertyFormValues>) => {
     if (!isEditMode || !id) return
 
     const backendUpdates: Record<string, unknown> = {}
@@ -152,57 +123,149 @@ export const PropertyDetailView = ({
     })
   }
 
-  const handleCreate = () => {
-    if (!formData.name.trim()) return
+  const isLoading = isCreating || isUpdating
+
+  const form = useCreateForm<PropertyFormValues>({
+    initialValues: {
+      name: initialData?.name || '',
+      description: initialData?.description || '',
+      subjectType: initialData?.subjectType || 'patient',
+      fieldType: initialData?.fieldType || 'singleSelect',
+      isArchived: initialData?.isArchived || false,
+      selectData: initialData?.selectData ?? {
+        isAllowingFreetext: false,
+        options: [],
+      },
+    },
+    onFormSubmit: (values) => {
+      if (!values.name.trim()) return
+
+      const createData = {
+        name: values.name,
+        description: values.description || null,
+        fieldType: mapFieldTypeToBackend(values.fieldType),
+        allowedEntities: [mapSubjectTypeToBackend(values.subjectType)],
+        options: values.selectData?.options.map(opt => opt.name) || null,
+        isActive: !values.isArchived,
+      }
 
-    const createData = {
-      name: formData.name,
-      description: formData.description || null,
-      fieldType: mapFieldTypeToBackend(formData.fieldType),
-      allowedEntities: [mapSubjectTypeToBackend(formData.subjectType)],
-      options: formData.selectData?.options.map(opt => opt.name) || null,
-      isActive: !formData.isArchived,
+      createProperty({ data: createData })
+    },
+    validators: {
+      name: (value) => {
+        if (!value || !value.trim()) {
+          return translation('name') + ' is required'
+        }
+        return null
+      },
+    },
+    onValidUpdate: (_, updates) => {
+      if (!isEditMode) return
+      persist(updates)
     }
+  })
 
-    createProperty({ data: createData })
-  }
+  const { update: updateForm } = form
+  const updateFormRef = useRef(updateForm)
+  updateFormRef.current = updateForm
+
+  useEffect(() => {
+    if (initialData && !isEditMode) {
+      const isSelectType = initialData.fieldType === 'multiSelect' || initialData.fieldType === 'singleSelect'
+      const selectData = isSelectType && !initialData.selectData && initialData.fieldType ? {
+        isAllowingFreetext: false,
+        options: [],
+      } : initialData.selectData
+
+      updateFormRef.current(prev => ({
+        ...prev,
+        name: initialData.name || '',
+        description: initialData.description || '',
+        subjectType: initialData.subjectType || 'patient',
+        fieldType: initialData.fieldType || 'singleSelect',
+        isArchived: initialData.isArchived || false,
+        selectData,
+      }))
+    } else if (initialData && isEditMode && id && initialData.id === id) {
+      const isSelectType = initialData.fieldType === 'multiSelect' || initialData.fieldType === 'singleSelect'
+      const selectData = isSelectType && !initialData.selectData && initialData.fieldType ? {
+        isAllowingFreetext: false,
+        options: [],
+      } : initialData.selectData
+
+      updateFormRef.current(prev => {
+        if (prev.selectData?.options && selectData?.options) {
+          const existingOptionNames = new Set(prev.selectData.options.map(o => o.name))
+          const newOptionNames = new Set(selectData.options.map(o => o.name))
+          const optionsChanged = prev.selectData.options.length !== selectData.options.length ||
+            !prev.selectData.options.every(o => newOptionNames.has(o.name)) ||
+            !selectData.options.every(o => existingOptionNames.has(o.name))
 
-  const isSelectType = formData.fieldType === 'multiSelect' || formData.fieldType === 'singleSelect'
+          if (!optionsChanged) {
+            return prev
+          }
+        }
+        return {
+          ...prev,
+          name: initialData.name || '',
+          description: initialData.description || '',
+          subjectType: initialData.subjectType || 'patient',
+          fieldType: initialData.fieldType || 'singleSelect',
+          isArchived: initialData.isArchived || false,
+          selectData,
+        }
+      })
+    }
+  }, [initialData, isEditMode, id])
 
   return (
-    <div className="flex flex-col h-full bg-surface">
-      <div className="flex-grow overflow-hidden flex flex-col">
-        <div className="flex flex-col gap-6 pt-4">
-          <FormElementWrapper label={translation('name')}>
-            {({ ...bag }) => (
+    <FormProvider state={form}>
+      <div className="flex-col-0 h-full overflow-hidden">
+        <form
+          onSubmit={event => { event.preventDefault(); form.submit() }}
+          className="flex-col-6 flex-1 overflow-y-auto"
+        >
+          <FormField<PropertyFormValues, 'name'>
+            name="name"
+            label={translation('name')}
+            required
+          >
+            {({ dataProps, focusableElementProps, interactionStates }) => (
               <Input
-                {...bag}
-                value={formData.name}
-                onChange={e => updateLocal({ name: e.target.value })}
-                onBlur={() => persist({ name: formData.name })}
+                {...dataProps} {...focusableElementProps} {...interactionStates}
+                value={dataProps.value || ''}
               />
             )}
-          </FormElementWrapper>
+          </FormField>
 
-          <FormElementWrapper label={translation('description')}>
-            {({ ...bag }) => (
+          <FormField<PropertyFormValues, 'description'>
+            name="description"
+            label={translation('description')}
+          >
+            {({ dataProps, focusableElementProps, interactionStates }) => (
               <Textarea
-                {...bag}
-                value={formData.description ?? ''}
-                onChange={e => updateLocal({ description: e.target.value })}
-                onBlur={() => persist({ description: formData.description })}
+                {...dataProps} {...focusableElementProps} {...interactionStates}
+                value={dataProps.value || ''}
               />
             )}
-          </FormElementWrapper>
+          </FormField>
 
-          <FormElementWrapper label={translation('subjectType')} disabled={isEditMode}>
-            {({ ...bag }) => (
+          <FormField<PropertyFormValues, 'subjectType'>
+            name="subjectType"
+            label={translation('subjectType')}
+          >
+            {({ dataProps, focusableElementProps, interactionStates }) => (
               <Select
-                {...bag}
-                value={formData.subjectType}
-                onValueChanged={value => {
-                  updateLocal({ subjectType: value as PropertySubjectType })
-                  persist({ subjectType: value as PropertySubjectType })
+                {...dataProps as FormFieldDataHandling<string>} {...focusableElementProps} {...interactionStates}
+                value={dataProps.value || 'patient'}
+                disabled={isEditMode}
+                onValueChange={(value) => {
+                  const subjectType = value as PropertySubjectType
+                  dataProps.onValueChange?.(subjectType)
+                  dataProps.onEditComplete?.(subjectType)
+                  if (isEditMode && id) {
+                    persist({ subjectType })
+                  }
                 }}
               >
                 {propertySubjectTypeList.map(v => (
@@ -212,16 +275,24 @@ export const PropertyDetailView = ({
                 ))}
               </Select>
             )}
-          </FormElementWrapper>
+          </FormField>
 
-          <FormElementWrapper label={translation('type')} disabled={isEditMode}>
-            {({ ...bag }) => (
+          <FormField<PropertyFormValues, 'fieldType'>
+            name="fieldType"
+            label={translation('type')}
+          >
+            {({ dataProps, focusableElementProps, interactionStates }) => (
               <Select
-                {...bag}
-                value={formData.fieldType}
-                onValueChanged={value => {
-                  updateLocal({ fieldType: value as PropertyFieldType })
-                  persist({ fieldType: value as PropertyFieldType })
+                {...dataProps as FormFieldDataHandling<string>} {...focusableElementProps} {...interactionStates}
+                value={dataProps.value || 'singleSelect'}
+                disabled={isEditMode}
+                onValueChange={(value) => {
+                  const fieldType = value as PropertyFieldType
+                  dataProps.onValueChange?.(fieldType)
+                  dataProps.onEditComplete?.(fieldType)
+                  if (isEditMode && id) {
+                    persist({ fieldType })
+                  }
                 }}
               >
                 {propertyFieldTypeList.map(v => (
@@ -231,190 +302,212 @@ export const PropertyDetailView = ({
                 ))}
               </Select>
             )}
-          </FormElementWrapper>
+          </FormField>
 
-          {isSelectType && (
-            <div className="flex-col-2">
-              <span className="typography-title-md">
-                {translation('selectOptions')}
-              </span>
-              <div className="flex-col-2 min-h-64 max-h-64 overflow-y-auto">
-                {formData.selectData?.options.map((option) => (
-                  <div key={option.id} className="relative">
-                    <Input
-                      value={option.name}
-                      onChangeText={value => {
-                        setFormData(prev => {
-                          if (!prev.selectData) return prev
-                          return {
-                            ...prev,
-                            selectData: {
-                              ...prev.selectData,
-                              options: prev.selectData.options
-                                .map(entry => entry.id === option.id ? { ...entry, name: value } : entry)
-                            }
-                          }
-                        })
-                      }}
-                      onEditCompleted={value => {
-                        const update = {
-                          selectData: formData.selectData ? {
-                            ...formData.selectData,
-                            options: formData.selectData.options
-                              .map(entry => entry.id === option.id ? { ...entry, name: value } : entry)
-                          } : undefined
-                        }
-                        updateLocal(update)
-                        persist(update)
+          <FormObserverKey<PropertyFormValues, 'fieldType'> formKey="fieldType">
+            {({ value: fieldType }) => {
+              const isSelectType = fieldType === 'multiSelect' || fieldType === 'singleSelect'
+              if (!isSelectType) return null
+              return (
+                <div className="flex-col-2">
+                  <span className="typography-title-md">
+                    {translation('selectOptions')}
+                  </span>
+                  <div className="flex-col-2 min-h-64 max-h-64 overflow-y-auto">
+                    <FormObserverKey<PropertyFormValues, 'selectData'> formKey="selectData">
+                      {({ value: selectData }) => {
+                        return selectData?.options.map((option) => (
+                          <div key={option.id} className="relative">
+                            <Input
+                              value={option.name}
+                              onChange={(e) => {
+                                const value = e.target.value
+                                updateForm(prev => {
+                                  if (!prev.selectData) return prev
+                                  return {
+                                    ...prev,
+                                    selectData: {
+                                      ...prev.selectData,
+                                      options: prev.selectData.options
+                                        .map(entry => entry.id === option.id ? { ...entry, name: value } : entry)
+                                    }
+                                  }
+                                })
+                              }}
+                              onBlur={(e) => {
+                                const value = e.target.value
+                                const update = {
+                                  selectData: selectData ? {
+                                    ...selectData,
+                                    options: selectData.options
+                                      .map(entry => entry.id === option.id ? { ...entry, name: value } : entry)
+                                  } : undefined
+                                }
+                                updateForm(prev => ({ ...prev, ...update }))
+                                persist(update)
+                              }}
+                              className="pr-11 w-full"
+                            />
+                            <Button
+                              coloringStyle="text"
+                              color="negative"
+                              size="sm"
+                              layout="icon"
+                              className="absolute right-1 top-1 rounded"
+                              onClick={() => {
+                                const update = {
+                                  selectData: selectData ? {
+                                    ...selectData,
+                                    options: selectData.options.filter(entry => entry.id !== option.id)
+                                  } : undefined
+                                }
+                                updateForm(prev => ({ ...prev, ...update }))
+                                persist(update)
+                              }}
+                            >
+                              <XIcon />
+                            </Button>
+                          </div>
+                        ))
                       }}
-                      className="pr-11 w-full"
-                    />
-                    <Button
-                      coloringStyle="text"
-                      color="negative"
-                      size="none"
-                      className="absolute right-3 top-2 rounded"
-                      onClick={() => {
-                        const update = {
-                          selectData: formData.selectData ? {
-                            ...formData.selectData,
-                            options: formData.selectData.options.filter(entry => entry.id !== option.id)
-                          } : undefined
-                        }
-                        updateLocal(update)
-                        persist(update)
+                    </FormObserverKey>
+                    <FormObserverKey<PropertyFormValues, 'selectData'> formKey="selectData">
+                      {({ value: selectData }) => {
+                        return (
+                          <div className="relative">
+                            <Input
+                              value={newOption.name}
+                              onChange={(e) => {
+                                const name = e.target.value
+                                setNewOption({
+                                  ...newOption,
+                                  name
+                                })
+                              }}
+                              onBlur={(e) => {
+                                const name = e.target.value.trim()
+                                if (!name) return
+                                const option = {
+                                  ...newOption,
+                                  id: `temp-${Date.now()}-${Math.random()}`,
+                                  name
+                                }
+                                const currentSelectData = selectData
+                                const update = {
+                                  selectData: currentSelectData ? {
+                                    ...currentSelectData,
+                                    options: [...currentSelectData.options, option]
+                                  } : {
+                                    options: [option],
+                                    isAllowingFreetext: false,
+                                  }
+                                }
+                                updateForm(prev => ({ ...prev, ...update }))
+                                setTimeout(() => {
+                                  persist(update)
+                                }, 0)
+                                setNewOption({
+                                  id: '',
+                                  name: '',
+                                  description: '',
+                                  isCustom: false,
+                                })
+                              }}
+                              className="pr-16 w-full"
+                              placeholder={translation('rAdd', { name: translation('option') })}
+                            />
+                            <Button
+                              coloringStyle="text"
+                              color="primary"
+                              size="sm"
+                              layout="icon"
+                              className="absolute right-1 top-1 rounded"
+                              disabled={!newOption.name}
+                              onClick={() => {
+                                if (!newOption.name.trim()) return
+                                const option = {
+                                  ...newOption,
+                                  id: `temp-${Date.now()}-${Math.random()}`,
+                                  name: newOption.name.trim()
+                                }
+                                const currentSelectData = selectData
+                                const update = {
+                                  selectData: currentSelectData ? {
+                                    ...currentSelectData,
+                                    options: [...currentSelectData.options, option]
+                                  } : {
+                                    options: [option],
+                                    isAllowingFreetext: false,
+                                  }
+                                }
+                                updateForm(prev => ({ ...prev, ...update }))
+                                setTimeout(() => {
+                                  persist(update)
+                                }, 0)
+                                setNewOption({
+                                  id: '',
+                                  name: '',
+                                  description: '',
+                                  isCustom: false,
+                                })
+                              }}
+                            >
+                              <PlusIcon />
+                            </Button>
+                          </div>
+                        )
                       }}
-                    >
-                      <XIcon />
-                    </Button>
+                    </FormObserverKey>
                   </div>
-                ))}
-                <div className="relative">
-                  <Input
-                    value={newOption.name}
-                    onChangeText={name => {
-                      setNewOption({
-                        ...newOption,
-                        name
-                      })
-                    }}
-                    onEditCompleted={name => {
-                      if (!name.trim()) return
-                      const option = {
-                        ...newOption,
-                        id: `temp-${Date.now()}-${Math.random()}`,
-                        name: name.trim()
+                </div>
+              )
+            }}
+          </FormObserverKey>
+          {isEditMode && (
+            <FormField<PropertyFormValues, 'isArchived'>
+              name="isArchived"
+              label={translation('archiveProperty')}
+            >
+              {({ dataProps: { value, onValueChange }, focusableElementProps, interactionStates }) => (
+                <div className="flex-row-4 justify-between items-center">
+                  <div className="flex-col-1">
+                    <span className="typography-title-md">
+                      {translation('archiveProperty')}
+                    </span>
+                    <span className="text-description">
+                      {translation('archivedPropertyDescription')}
+                    </span>
+                  </div>
+                  <Checkbox
+                    {...focusableElementProps} {...interactionStates}
+                    value={value || false}
+                    onValueChange={(checked) => {
+                      onValueChange?.(checked)
+                      if (isEditMode && id) {
+                        persist({ isArchived: checked })
                       }
-                      setFormData(prev => {
-                        const update = {
-                          selectData: prev.selectData ? {
-                            ...prev.selectData,
-                            options: [...prev.selectData.options, option]
-                          } : {
-                            options: [option],
-                            isAllowingFreetext: false,
-                          }
-                        }
-                        const updatedFormData = {
-                          ...prev,
-                          ...update
-                        }
-                        setTimeout(() => {
-                          persist(update)
-                        }, 0)
-                        return updatedFormData
-                      })
-                      setNewOption({
-                        id: '',
-                        name: '',
-                        description: '',
-                        isCustom: false,
-                      })
                     }}
-                    className="pr-16 w-full"
-                    placeholder={translation('rAdd', { name: translation('option') })}
                   />
-                  <Button
-                    coloringStyle="text"
-                    color="primary"
-                    size="none"
-                    className="absolute right-3 top-2 rounded"
-                    disabled={!newOption.name}
-                    onClick={() => {
-                      if (!newOption.name.trim()) return
-                      const option = {
-                        ...newOption,
-                        id: `temp-${Date.now()}-${Math.random()}`,
-                        name: newOption.name.trim()
-                      }
-                      setFormData(prev => {
-                        const update = {
-                          selectData: prev.selectData ? {
-                            ...prev.selectData,
-                            options: [...prev.selectData.options, option]
-                          } : {
-                            options: [option],
-                            isAllowingFreetext: false,
-                          }
-                        }
-                        const updatedFormData = {
-                          ...prev,
-                          ...update
-                        }
-                        setTimeout(() => {
-                          persist(update)
-                        }, 0)
-                        return updatedFormData
-                      })
-                      setNewOption({
-                        id: '',
-                        name: '',
-                        description: '',
-                        isCustom: false,
-                      })
-                    }}
-                  >
-                    <PlusIcon />
-                  </Button>
                 </div>
-              </div>
-            </div>
+              )}
+            </FormField>
           )}
-          {isEditMode && (
-            <>
+          <div className="min-h-16" />
+        </form>
 
-              <div className="flex-row-4 justify-between items-center">
-                <div className="flex-col-1">
-                  <span className="typography-title-md">
-                    {translation('archiveProperty')}
-                  </span>
-                  <span className="text-description">
-                    {translation('archivedPropertyDescription')}
-                  </span>
-                </div>
-                <Checkbox
-                  checked={formData.isArchived}
-                  onCheckedChange={value => {
-                    const update = { isArchived: value }
-                    updateLocal(update)
-                    persist(update)
-                  }}
-                />
-              </div>
-
-            </>
-          )}
-        </div>
-        <div className="min-h-16" />
+        {!isEditMode && (
+          <div className="flex-row-0 pt-2 justify-end">
+            <Button
+              type="submit"
+              onClick={() => form.submit()}
+              disabled={isLoading}
+              className="w-fit"
+            >
+              {translation('create')}
+            </Button>
+          </div>
+        )}
       </div>
-
-      {!isEditMode && (
-        <div className="flex-none pt-4 mt-auto border-t border-divider flex justify-end">
-          <LoadingButton onClick={handleCreate} isLoading={isLoading}>
-            Create
-          </LoadingButton>
-        </div>
-      )}
-    </div>
+    </FormProvider>
   )
 }
diff --git a/web/components/properties/PropertyEntry.tsx b/web/components/properties/PropertyEntry.tsx
new file mode 100644
index 00000000..e4de08bb
--- /dev/null
+++ b/web/components/properties/PropertyEntry.tsx
@@ -0,0 +1,133 @@
+import {
+  CheckboxProperty,
+  DateProperty,
+  MultiSelectProperty,
+  NumberProperty,
+  SelectOption,
+  SingleSelectProperty,
+  TextProperty
+} from '@helpwave/hightide'
+import type { PropertyFieldType, PropertySelectOption, PropertyValue } from '@/components/tables/PropertyList'
+
+type PropertyEntrySelectProps = {
+  onAddOption?: (name: string) => void,
+  options: PropertySelectOption[],
+}
+
+type PropertyEntryProps = {
+  value: PropertyValue,
+  name: string,
+  fieldType: PropertyFieldType,
+  onChange: (value: PropertyValue) => void,
+  onEditComplete: (value: PropertyValue) => void,
+  selectData?: PropertyEntrySelectProps,
+  onRemove?: () => void,
+  onValueClear?: () => void,
+  readOnly?: boolean,
+}
+
+// TODO move to hightide
+export const PropertyEntry = ({
+  value,
+  name,
+  fieldType,
+  onChange,
+  onEditComplete,
+  selectData,
+  onRemove,
+  onValueClear,
+  readOnly,
+}: PropertyEntryProps) => {
+  const commonProps = {
+    name,
+    onRemove,
+    onValueClear,
+    readOnly,
+  }
+
+  if (['singleSelect', 'multiSelect'].includes(fieldType) && !selectData) {
+    throw new Error('PropertyEntry: When using a SingleSelect or MultiSelect field type selectData must be provided')
+  }
+
+  switch (fieldType) {
+  case 'text':
+    return (
+      <TextProperty
+        {...commonProps}
+        value={value.textValue ?? ''}
+        onValueChange={textValue => onChange({ ...value, textValue: textValue ?? '' })}
+        onEditComplete={textValue => onEditComplete({ ...value, textValue: textValue ?? '' })}
+      />
+    )
+  case 'number':
+    return (
+      <NumberProperty
+        {...commonProps}
+        value={value.numberValue}
+        onValueChange={numberValue => onChange({ ...value, numberValue })}
+        onEditComplete={numberValue => onEditComplete({ ...value, numberValue })}
+      />
+    )
+  case 'date':
+    return (
+      <DateProperty
+        {...commonProps}
+        value={value.dateValue}
+        onValueChange={dateValue => onChange({ ...value, dateValue })}
+        onEditComplete={dateValue => onEditComplete({ ...value, dateValue })}
+      />
+    )
+  case 'dateTime':
+    return (
+      <DateProperty
+        {...commonProps}
+        value={value.dateTimeValue}
+        onValueChange={dateTimeValue => onChange({ ...value, dateTimeValue })}
+        onEditComplete={dateTimeValue => onEditComplete({ ...value, dateTimeValue })}
+      />
+    )
+  case 'checkbox':
+    return (
+      <CheckboxProperty
+        {...commonProps}
+        value={value.boolValue}
+        onValueChange={boolValue => onChange({ ...value, boolValue })}
+        onEditComplete={boolValue => onChange({ ...value, boolValue })}
+      />
+    )
+  case 'singleSelect':
+    return (
+      <SingleSelectProperty
+        {...commonProps}
+        value={value.singleSelectValue}
+        onValueChange={singleSelectValue => onChange({ ...value, singleSelectValue })}
+        onEditComplete={singleSelectValue => onEditComplete({ ...value, singleSelectValue })}
+      >
+        {selectData?.options.map(option => (
+          <SelectOption key={option.id} value={option.id}>
+            {option.name}
+          </SelectOption>
+        ))
+        }
+      </SingleSelectProperty>
+    )
+  case 'multiSelect':
+    return (
+      <MultiSelectProperty
+        {...commonProps}
+        value={value.multiSelectValue ?? []}
+        onValueChange={multiSelectValue => onChange({ ...value, multiSelectValue })}
+        onEditComplete={multiSelectValue => onEditComplete({ ...value, multiSelectValue })}
+      >
+        {selectData?.options.map(option => (
+          <SelectOption key={option.id} value={option.id}>
+            {option.name}
+          </SelectOption>
+        ))
+        }
+      </MultiSelectProperty>
+    )
+  default:
+    return <></>
+  }
+}
diff --git a/web/components/pwa/InstallPrompt.tsx b/web/components/pwa/InstallPrompt.tsx
index 43799240..b6a330ef 100644
--- a/web/components/pwa/InstallPrompt.tsx
+++ b/web/components/pwa/InstallPrompt.tsx
@@ -111,7 +111,8 @@ export const InstallPrompt = () => {
         <Button color="neutral" coloringStyle="outline" onClick={handleDismiss}>
           {translation('dismiss')}
         </Button>
-        <Button color="positive" onClick={handleInstall} startIcon={<Download className="size-4" />}>
+        <Button color="positive" onClick={handleInstall}>
+          <Download className="size-4" />
           {translation('install')}
         </Button>
       </div>
diff --git a/web/components/patients/PatientList.tsx b/web/components/tables/PatientList.tsx
similarity index 55%
rename from web/components/patients/PatientList.tsx
rename to web/components/tables/PatientList.tsx
index 7508eb48..b7791eea 100644
--- a/web/components/patients/PatientList.tsx
+++ b/web/components/tables/PatientList.tsx
@@ -1,9 +1,8 @@
-import { useMemo, useState, forwardRef, useImperativeHandle, useEffect } from 'react'
-import { Table, Chip, FillerRowElement, Button, SearchBar, ProgressIndicator, Tooltip, Checkbox } from '@helpwave/hightide'
+import { useMemo, useState, forwardRef, useImperativeHandle, useEffect, useCallback } from 'react'
+import { Chip, FillerCell, Button, SearchBar, ProgressIndicator, Tooltip, Checkbox, Drawer, Visibility, TableProvider, TableDisplay, TablePagination, TableColumnSwitcher } from '@helpwave/hightide'
 import { PlusIcon, Table as TableIcon, LayoutGrid, Printer } from 'lucide-react'
-import { GetPatientsDocument, Sex, PatientState, type GetPatientsQuery, type TaskType } from '@/api/gql/generated'
+import { GetPatientsDocument, Sex, PatientState, type GetPatientsQuery, type TaskType, useGetPropertyDefinitionsQuery, PropertyEntity, type FullTextSearchInput } from '@/api/gql/generated'
 import { usePaginatedGraphQLQuery } from '@/hooks/usePaginatedQuery'
-import { SidePanel } from '@/components/layout/SidePanel'
 import { PatientDetailView } from '@/components/patients/PatientDetailView'
 import { SmartDate } from '@/utils/date'
 import { LocationChips } from '@/components/patients/LocationChips'
@@ -12,7 +11,8 @@ import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { useTasksContext } from '@/hooks/useTasksContext'
 import { usePatientViewToggle } from '@/hooks/useViewToggle'
 import { PatientCardView } from '@/components/patients/PatientCardView'
-import type { ColumnDef } from '@tanstack/table-core'
+import type { ColumnDef, Row } from '@tanstack/table-core'
+import { createPropertyColumn } from '@/utils/propertyColumn'
 
 export type PatientViewModel = {
   id: string,
@@ -26,6 +26,7 @@ export type PatientViewModel = {
   sex: Sex,
   state: PatientState,
   tasks: TaskType[],
+  properties?: GetPatientsQuery['patients'][0]['properties'],
 }
 
 const STORAGE_KEY_SHOW_ALL_PATIENTS = 'patient-show-all-states'
@@ -75,30 +76,41 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
     })
   }
 
-  const allPatientStates: PatientState[] = [
+  const allPatientStates: PatientState[] = useMemo(() => [
     PatientState.Admitted,
     PatientState.Discharged,
     PatientState.Dead,
     PatientState.Wait,
-  ]
+  ], [])
 
   const patientStates = showAllPatients ? allPatientStates : (acceptedStates ?? [PatientState.Admitted])
 
-  const { data: patientsData, refetch } = usePaginatedGraphQLQuery<GetPatientsQuery, GetPatientsQuery['patients'][0], { rootLocationIds?: string[], states?: PatientState[] }>({
-    queryKey: ['GetPatients', { rootLocationIds: effectiveRootLocationIds, states: patientStates }],
+  const searchInput: FullTextSearchInput | undefined = searchQuery
+    ? {
+      searchText: searchQuery,
+      includeProperties: true,
+    }
+    : undefined
+
+  const { data: patientsData, refetch, totalCount } = usePaginatedGraphQLQuery<GetPatientsQuery, GetPatientsQuery['patients'][0], { rootLocationIds?: string[], states?: PatientState[], search?: FullTextSearchInput }>({
+    queryKey: ['GetPatients', { rootLocationIds: effectiveRootLocationIds, states: patientStates, search: searchQuery }],
     document: GetPatientsDocument,
     baseVariables: {
       rootLocationIds: effectiveRootLocationIds && effectiveRootLocationIds.length > 0 ? effectiveRootLocationIds : undefined,
-      states: patientStates
+      states: patientStates,
+      search: searchInput,
     },
     pageSize: 50,
     extractItems: (result) => result.patients,
+    extractTotalCount: (result) => result.patientsTotal ?? undefined,
     mode: 'infinite',
     enabled: !isPrinting,
     refetchOnWindowFocus: !isPrinting,
     refetchOnMount: true,
   })
 
+  const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
+
   useEffect(() => {
     const handleBeforePrint = () => setIsPrinting(true)
     const handleAfterPrint = () => setIsPrinting(false)
@@ -115,7 +127,7 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
   const patients: PatientViewModel[] = useMemo(() => {
     if (!patientsData || patientsData.length === 0) return []
 
-    let data = patientsData.map(p => ({
+    return patientsData.map(p => ({
       id: p.id,
       name: p.name,
       firstname: p.firstname,
@@ -126,19 +138,10 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
       position: p.position,
       openTasksCount: p.tasks?.filter(t => !t.done).length ?? 0,
       closedTasksCount: p.tasks?.filter(t => t.done).length ?? 0,
-      tasks: []
+      tasks: [],
+      properties: p.properties ?? [],
     }))
-
-    if (searchQuery) {
-      const lowerQuery = searchQuery.toLowerCase()
-      data = data.filter(p =>
-        p.name.toLowerCase().includes(lowerQuery) ||
-        p.firstname.toLowerCase().includes(lowerQuery) ||
-        p.lastname.toLowerCase().includes(lowerQuery))
-    }
-
-    return data
-  }, [patientsData, searchQuery])
+  }, [patientsData])
 
   useImperativeHandle(ref, () => ({
     openCreate: () => {
@@ -173,16 +176,16 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
       if (patient) {
         setSelectedPatient(patient)
       }
-        setIsPanelOpen(true)
-        setOpenedPatientId(initialPatientId)
-        onInitialPatientOpened?.()
+      setIsPanelOpen(true)
+      setOpenedPatientId(initialPatientId)
+      onInitialPatientOpened?.()
     }
   }, [initialPatientId, patients, openedPatientId, onInitialPatientOpened])
 
-  const handleEdit = (patient: PatientViewModel) => {
+  const handleEdit = useCallback((patient: PatientViewModel) => {
     setSelectedPatient(patient)
     setIsPanelOpen(true)
-  }
+  }, [])
 
   const handleClose = () => {
     setIsPanelOpen(false)
@@ -194,6 +197,17 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
     window.print()
   }
 
+  const patientPropertyColumns = useMemo<ColumnDef<PatientViewModel>[]>(() => {
+    if (!propertyDefinitionsData?.propertyDefinitions) return []
+
+    const patientProperties = propertyDefinitionsData.propertyDefinitions.filter(
+      def => def.isActive && def.allowedEntities.includes(PropertyEntity.Patient)
+    )
+
+    return patientProperties.map(prop =>
+      createPropertyColumn<PatientViewModel>(prop))
+  }, [propertyDefinitionsData])
+
   const columns = useMemo<ColumnDef<PatientViewModel>[]>(() => [
     {
       id: 'name',
@@ -202,22 +216,29 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
       minSize: 200,
       size: 250,
       maxSize: 300,
+      filterFn: 'text',
     },
     {
       id: 'state',
       header: translation('status'),
-      accessorKey: 'state',
+      accessorFn: ({ state }) => [state],
       cell: ({ row }) => (
         <PatientStateChip state={row.original.state} />
       ),
       minSize: 120,
       size: 144,
       maxSize: 180,
+      filterFn: 'tags',
+      meta: {
+        filterData: {
+          tags: allPatientStates.map(state => ({ label: translation('patientState', { state: state as string }), tag: state })),
+        }
+      }
     },
     {
       id: 'sex',
       header: translation('sex'),
-      accessorKey: 'sex',
+      accessorFn: ({ sex }) => [sex],
       cell: ({ row }) => {
         const sex = row.original.sex
         const colorClass = sex === Sex.Male
@@ -234,28 +255,40 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
 
         return (
           <Chip
-            color={sex === Sex.Unknown ? 'neutral' : 'none'}
-            size="small"
+            color={sex === Sex.Unknown ? 'neutral' : undefined}
+            coloringStyle="tonal"
+            size="sm"
             className={`${colorClass} font-[var(--font-space-grotesk)] uppercase text-xs`}
           >
             <span>{label}</span>
           </Chip>
         )
       },
-      minSize: 100,
-      size: 100,
-      maxSize: 150,
+      minSize: 160,
+      size: 160,
+      maxSize: 200,
+      filterFn: 'tags',
+      meta: {
+        filterData: {
+          tags: [
+            { label: translation('male'), tag: Sex.Male },
+            { label: translation('female'), tag: Sex.Female },
+            { label: translation('diverse'), tag: Sex.Unknown },
+          ],
+        }
+      }
     },
     {
       id: 'position',
       header: translation('location'),
-      accessorKey: 'position',
+      accessorFn: ({ position }) => position?.title,
       cell: ({ row }) => (
         <LocationChips locations={row.original.position ? [row.original.position] : []} small />
       ),
       minSize: 200,
       size: 250,
       maxSize: 400,
+      filterFn: 'text',
     },
     {
       id: 'birthdate',
@@ -266,8 +299,10 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
           <SmartDate date={row.original.birthdate} showTime={false} />
         )
       },
-      minSize: 90,
-      size: 100,
+      minSize: 200,
+      size: 200,
+      maxSize: 200,
+      filterFn: 'date',
     },
     {
       id: 'tasks',
@@ -294,117 +329,135 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
           </Tooltip>
         )
       },
-      minSize: 80,
-      size: 110,
-      maxSize: 130,
+      minSize: 150,
+      size: 150,
+      maxSize: 200,
     },
-  ], [translation])
+    ...patientPropertyColumns,
+  ], [allPatientStates, translation, patientPropertyColumns])
+
+  const onRowClick = useCallback((row: Row<PatientViewModel>) => handleEdit(row.original), [handleEdit])
+  const fillerRowCell = useCallback(() => (<FillerCell className="min-h-8" />), [])
 
   return (
-    <div className="flex flex-col h-full gap-4 print-container">
-      <div className="flex flex-col sm:flex-row justify-between w-full gap-4 print-header">
-        <div className="w-full sm:max-w-md">
-          <SearchBar
-            placeholder={translation('search')}
-            value={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            onSearch={() => null}
-          />
-        </div>
-        <div className="flex flex-col sm:flex-row items-center gap-4 w-full sm:w-auto sm:ml-auto lg:pr-4">
-          <div className="flex items-center gap-2">
-            <Checkbox
-              checked={showAllPatients}
-              onCheckedChange={handleShowAllPatientsChange}
+    <TableProvider
+      data={patients}
+      columns={columns}
+      fillerRowCell={fillerRowCell}
+      onRowClick={onRowClick}
+      initialState={{
+        pagination: {
+          pageSize: 25,
+        }
+      }}
+      pageCount={totalCount ? Math.ceil(totalCount / 25) : undefined}
+    >
+      <div className="flex flex-col h-full gap-4">
+        <div className="flex flex-col sm:flex-row justify-between w-full gap-4">
+          <div className="flex-row-2 items-center">
+            <SearchBar
+              placeholder={translation('search')}
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              onSearch={() => null}
             />
-            <span className="text-sm text-description whitespace-nowrap">{translation('showAllPatients') || 'Show all patients'}</span>
+            <Visibility isVisible={viewType === 'table'}>
+              <TableColumnSwitcher />
+            </Visibility>
           </div>
-          {viewType === 'table' && (
-            <Tooltip tooltip="Print" position="top">
+          <div className="flex flex-col sm:flex-row items-center gap-4 w-full sm:w-auto sm:ml-auto">
+            <div className="flex items-center gap-2">
+              <Checkbox
+                value={showAllPatients}
+                onValueChange={handleShowAllPatientsChange}
+              />
+              <span className="text-sm text-description whitespace-nowrap">{translation('showAllPatients') || 'Show all patients'}</span>
+            </div>
+            <Tooltip tooltip={translation(viewType !== 'table' ? 'printOnlyAvailableInTableMode' : 'print')} position="top">
               <Button
                 layout="icon"
                 color="neutral"
                 coloringStyle="text"
                 onClick={handlePrint}
                 className="print-button"
+                disabled={viewType !== 'table'}
               >
                 <Printer className="size-5" />
               </Button>
             </Tooltip>
-          )}
-          <div className="flex items-center gap-2 flex-shrink-0">
-            <Tooltip tooltip="Table View" position="top">
-              <Button
-                layout="icon"
-                color={viewType === 'table' ? 'primary' : 'neutral'}
-                coloringStyle={viewType === 'table' ? undefined : 'text'}
-                onClick={() => toggleView('table')}
-              >
-                <TableIcon className="size-5" />
-              </Button>
-            </Tooltip>
-            <Tooltip tooltip="Card View" position="top">
+            <div className="flex items-center gap-2 flex-shrink-0">
+              <Tooltip tooltip={translation('tableView')} position="top">
+                <Button
+                  layout="icon"
+                  color={viewType === 'table' ? 'primary' : 'neutral'}
+                  coloringStyle={viewType === 'table' ? undefined : 'text'}
+                  onClick={() => toggleView('table')}
+                >
+                  <TableIcon className="size-5" />
+                </Button>
+              </Tooltip>
+              <Tooltip tooltip={translation('cardView')} position="top">
+                <Button
+                  layout="icon"
+                  color={viewType === 'card' ? 'primary' : 'neutral'}
+                  coloringStyle={viewType === 'card' ? undefined : 'text'}
+                  onClick={() => toggleView('card')}
+                >
+                  <LayoutGrid className="size-5" />
+                </Button>
+              </Tooltip>
+            </div>
+            <Tooltip tooltip={translation('addPatient')} position="top">
               <Button
+                onClick={() => {
+                  setSelectedPatient(undefined)
+                  setIsPanelOpen(true)
+                }}
                 layout="icon"
-                color={viewType === 'card' ? 'primary' : 'neutral'}
-                coloringStyle={viewType === 'card' ? undefined : 'text'}
-                onClick={() => toggleView('card')}
               >
-                <LayoutGrid className="size-5" />
+                <PlusIcon />
               </Button>
             </Tooltip>
           </div>
-          <Button
-            startIcon={<PlusIcon />}
-            onClick={() => {
-              setSelectedPatient(undefined)
-              setIsPanelOpen(true)
-            }}
-            className="w-full sm:w-auto min-w-[13rem] flex-shrink-0"
-          >
-            {translation('addPatient')}
-          </Button>
         </div>
-      </div>
-      {viewType === 'table' ? (
-        <div className="overflow-x-auto -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4 print-content">
-          <Table
-            className="w-full h-full cursor-pointer min-w-[800px] print-table"
-            data={patients}
-            columns={columns}
-            fillerRow={() => (<FillerRowElement className="min-h-12" />)}
-            onRowClick={(row) => handleEdit(row.original)}
+        <Visibility isVisible={viewType === 'table'}>
+          <TableDisplay
+            className="print-content"
           />
-        </div>
-      ) : (
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4 print-content">
-          {patients.length === 0 ? (
-            <div className="col-span-full text-center text-description py-8">
-              {translation('noPatient')}
-            </div>
-          ) : (
-            patients.map((patient) => (
-              <PatientCardView
-                key={patient.id}
-                patient={patient}
-                onClick={handleEdit}
-              />
-            ))
-          )}
-        </div>
-      )}
-      <SidePanel
-        isOpen={isPanelOpen}
-        onClose={handleClose}
-        title={!selectedPatient && !openedPatientId ? translation('addPatient') : translation('editPatient')}
-      >
-        <PatientDetailView
-          patientId={selectedPatient?.id ?? openedPatientId ?? undefined}
+          <TablePagination />
+        </Visibility>
+        <Visibility isVisible={viewType === 'card'}>
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4 print-content">
+            {patients.length === 0 ? (
+              <div className="col-span-full text-center text-description py-8">
+                {translation('noPatient')}
+              </div>
+            ) : (
+              patients.map((patient) => (
+                <PatientCardView
+                  key={patient.id}
+                  patient={patient}
+                  onClick={handleEdit}
+                />
+              ))
+            )}
+          </div>
+        </Visibility>
+        <Drawer
+          isOpen={isPanelOpen}
           onClose={handleClose}
-          onSuccess={refetch}
-        />
-      </SidePanel>
-    </div>
+          alignment="right"
+          titleElement={!selectedPatient && !openedPatientId ? translation('addPatient') : translation('editPatient')}
+          description={undefined}
+        >
+          <PatientDetailView
+            patientId={selectedPatient?.id ?? openedPatientId ?? undefined}
+            onClose={handleClose}
+            onSuccess={refetch}
+          />
+        </Drawer>
+      </div>
+    </TableProvider>
   )
 })
 
diff --git a/web/components/PropertyList.tsx b/web/components/tables/PropertyList.tsx
similarity index 72%
rename from web/components/PropertyList.tsx
rename to web/components/tables/PropertyList.tsx
index ef0ca66c..b473e2fa 100644
--- a/web/components/PropertyList.tsx
+++ b/web/components/tables/PropertyList.tsx
@@ -1,10 +1,12 @@
 import { LoadingAndErrorComponent, LoadingAnimation, Menu, MenuItem, ConfirmDialog, Button } from '@helpwave/hightide'
 import { Plus } from 'lucide-react'
-import React, { useMemo, useState, useEffect } from 'react'
+import { useMemo, useState, useEffect } from 'react'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import { PropertyEntry } from '@/components/PropertyEntry'
+import { PropertyEntry } from '@/components/properties/PropertyEntry'
 import { useGetPropertyDefinitionsQuery, FieldType, PropertyEntity } from '@/api/gql/generated'
 
+
+
 export const propertyFieldTypeList = ['multiSelect', 'singleSelect', 'number', 'text', 'date', 'dateTime', 'checkbox'] as const
 export type PropertyFieldType = typeof propertyFieldTypeList[number]
 
@@ -76,6 +78,28 @@ export type PropertyListProps = {
   fullWidthAddButton?: boolean,
 }
 
+const getDefaultValue = (fieldType: PropertyFieldType, selectData?: PropertySelectData): PropertyValue => {
+  switch (fieldType) {
+  case 'text':
+    return { textValue: '' }
+  case 'number':
+    return { numberValue: undefined }
+  case 'checkbox':
+    return { boolValue: false }
+  case 'date':
+  case 'dateTime':
+    return {}
+  case 'singleSelect':
+    return selectData?.options && selectData.options.length > 0
+      ? { singleSelectValue: selectData.options[0]?.id || undefined }
+      : {}
+  case 'multiSelect':
+    return { multiSelectValue: [] }
+  default:
+    return {}
+  }
+}
+
 const mapFieldTypeFromBackend = (fieldType: FieldType): PropertyFieldType => {
   const mapping: Record<FieldType, PropertyFieldType> = {
     [FieldType.FieldTypeText]: 'text',
@@ -222,7 +246,7 @@ export const PropertyList = ({
           ...ap,
           value: localValue || ap.value,
         }
-    })
+      })
 
     const pending = Array.from(pendingAdditions.values())
       .filter(pa => !removedPropertyIds.has(pa.property.id) && !attachedPropertyIds.has(pa.property.id))
@@ -274,25 +298,25 @@ export const PropertyList = ({
   const handleAddProperty = (property: Property) => {
     const getDefaultValue = (): PropertyValue => {
       switch (property.fieldType) {
-        case 'text':
-          return { textValue: '' }
-        case 'number':
-          return { numberValue: undefined }
-        case 'checkbox':
-          return { boolValue: false }
-        case 'date':
-        case 'dateTime':
-          return {}
-        case 'singleSelect':
-          return property.selectData?.options && property.selectData.options.length > 0
-            ? { singleSelectValue: property.selectData.options[0]?.id || undefined }
-            : {}
-        case 'multiSelect':
-          return { multiSelectValue: [] }
-        default:
-          return {}
-          }
-        }
+      case 'text':
+        return { textValue: '' }
+      case 'number':
+        return { numberValue: undefined }
+      case 'checkbox':
+        return { boolValue: false }
+      case 'date':
+      case 'dateTime':
+        return {}
+      case 'singleSelect':
+        return property.selectData?.options && property.selectData.options.length > 0
+          ? { singleSelectValue: property.selectData.options[0]?.id || undefined }
+          : {}
+      case 'multiSelect':
+        return { multiSelectValue: [] }
+      default:
+        return {}
+      }
+    }
 
     const defaultValue = getDefaultValue()
     setRemovedPropertyIds(prev => {
@@ -322,120 +346,129 @@ export const PropertyList = ({
       hasError={isError}
       className="min-h-48"
     >
-      <div className="flex-col-2">
+      <div className="flex-col-2 px-1 pt-2 pb-16">
         {displayedProperties.map((attachedProperty) => (
-            <PropertyEntry
+          <PropertyEntry
             key={attachedProperty.property.id}
             value={attachedProperty.value}
-              name={attachedProperty.property.name}
-              fieldType={attachedProperty.property.fieldType}
-              selectData={attachedProperty.property.selectData ?
-                {
-                  onAddOption: () => {
-                  },
-                  options: attachedProperty.property.selectData.options,
-                } : undefined
-              }
-              onChange={value => {
-                setLocalPropertyValues(prev => {
-                  const newMap = new Map(prev)
-                  newMap.set(attachedProperty.property.id, value)
-                  return newMap
-                })
-              }}
+            name={attachedProperty.property.name}
+            fieldType={attachedProperty.property.fieldType}
+            selectData={attachedProperty.property.selectData ?
+              {
+                onAddOption: () => {},
+                options: attachedProperty.property.selectData.options,
+              } : undefined
+            }
+            onValueClear={() => {
+              handlePropertyChange(
+                attachedProperty.property.id,
+                getDefaultValue(attachedProperty.property.fieldType, attachedProperty.property.selectData)
+              )
+            }}
+            onChange={value => {
+              setLocalPropertyValues(prev => {
+                const newMap = new Map(prev)
+                newMap.set(attachedProperty.property.id, value)
+                return newMap
+              })
+            }}
             onEditComplete={value => {
               handlePropertyChange(attachedProperty.property.id, value)
-              }}
-              onRemove={() => {
-                setPropertyToRemove(attachedProperty.property.id)
-              }}
-            />
+            }}
+            onRemove={() => {
+              setPropertyToRemove(attachedProperty.property.id)
+            }}
+          />
         ))}
         {fullWidthAddButton && (
           <div className="w-full">
             {hasUnattachedProperties ? (
-              <Menu<HTMLButtonElement>
+              <Menu
                 trigger={({ toggleOpen }, ref) => (
                   <Button
                     ref={ref}
-                    startIcon={<Plus size={20} />}
                     onClick={toggleOpen}
                     className="w-full"
                   >
+                    <Plus size={20} />
                     {translation('addProperty')}
                   </Button>
                 )}
-                menuClassName="min-w-[200px] p-2 "
-                alignmentVertical="topOutside"
+                className="min-w-50 p-2 "
+                options={{
+                  verticalAlignment: 'beforeStart',
+                }}
               >
-              {({ close }) => (
-                <LoadingAndErrorComponent
-                  isLoading={isLoading}
-                  hasError={isError}
-                  loadingComponent={<LoadingAnimation classname="min-h-20" />}
-                >
+                {({ close }) => (
+                  <LoadingAndErrorComponent
+                    isLoading={isLoading}
+                    hasError={isError}
+                    loadingComponent={<LoadingAnimation classname="min-h-20" />}
+                  >
                     {unattachedProperties.map(property => (
-                        <MenuItem
-                          key={property.id}
-                          onClick={() => {
+                      <MenuItem
+                        key={property.id}
+                        onClick={() => {
                           handleAddProperty(property)
-                            close()
-                          }}
-                          className="rounded-md cursor-pointer"
-                        >
-                          {property.name}
-                        </MenuItem>
+                          close()
+                        }}
+                        className="rounded-md cursor-pointer"
+                      >
+                        {property.name}
+                      </MenuItem>
                     ))}
-                </LoadingAndErrorComponent>
-              )}
+                  </LoadingAndErrorComponent>
+                )}
               </Menu>
             ) : (
               <Button
-                startIcon={<Plus size={20} />}
                 disabled={true}
                 className="w-full"
               >
+                <Plus size={20} />
                 {translation('addProperty')}
               </Button>
             )}
           </div>
         )}
         {!fullWidthAddButton && hasUnattachedProperties && (
-            <Menu<HTMLDivElement>
-              trigger={({ toggleOpen }, ref) => (
-                <div
-                  ref={ref as React.RefObject<HTMLDivElement>}
-                  className="flex-row-4 px-4 py-2 items-center border-2 border-dashed bg-property-title-background text-property-title-text hover:border-primary rounded-xl cursor-pointer"
-                  onClick={toggleOpen}
-                >
-                  <Plus size={20} />
-                  <span>{translation('addProperty')}</span>
-                </div>
-              )}
-              menuClassName="min-w-[200px] p-2 "
-              alignmentVertical="topOutside"
-            >
-              {({ close }) => (
-                <LoadingAndErrorComponent
-                  isLoading={isLoading}
-                  hasError={isError}
-                  loadingComponent={<LoadingAnimation classname="min-h-20" />}
-                >
+          <Menu
+            trigger={({ toggleOpen }, ref) => (
+              <div
+                ref={ref}
+                className="flex-row-4 px-4 py-2 items-center border-2 border-dashed bg-property-title-background text-property-title-text hover:border-primary rounded-xl cursor-pointer"
+                onClick={toggleOpen}
+              >
+                <Plus size={20} />
+                <span>{translation('addProperty')}</span>
+              </div>
+            )}
+            className="min-w-50 p-2 "
+            options={{
+              verticalAlignment: 'beforeStart',
+            }}
+          >
+            {({ close }) => (
+              <LoadingAndErrorComponent
+                isLoading={isLoading}
+                hasError={isError}
+                loadingComponent={<LoadingAnimation classname="min-h-20" />}
+              >
                 {unattachedProperties.map(property => (
-                        <MenuItem
-                          key={property.id}
-                          onClick={() => {
+                  <MenuItem
+                    key={property.id}
+                    onClick={() => {
                       handleAddProperty(property)
-                            close()
-                          }}
-                          className="rounded-md cursor-pointer"
-                        >
-                          {property.name}
-                        </MenuItem>
+                      close()
+                    }}
+                    className="rounded-md cursor-pointer"
+                  >
+                    {property.name}
+                  </MenuItem>
                 ))}
-                </LoadingAndErrorComponent>
-              )}
-            </Menu>
+              </LoadingAndErrorComponent>
+            )}
+          </Menu>
         )}
       </div>
       <ConfirmDialog
diff --git a/web/components/tables/RecentPatientsTable.tsx b/web/components/tables/RecentPatientsTable.tsx
new file mode 100644
index 00000000..a86325cd
--- /dev/null
+++ b/web/components/tables/RecentPatientsTable.tsx
@@ -0,0 +1,121 @@
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import type { ColumnDef, Row } from '@tanstack/react-table'
+import type { GetOverviewDataQuery } from '@/api/gql/generated'
+import { useCallback, useMemo } from 'react'
+import type { TableProps } from '@helpwave/hightide'
+import { FillerCell, Table, TableColumnSwitcher, Tooltip } from '@helpwave/hightide'
+import { SmartDate } from '@/utils/date'
+import { LocationChips } from '@/components/patients/LocationChips'
+import { useGetPropertyDefinitionsQuery, PropertyEntity } from '@/api/gql/generated'
+import { createPropertyColumn } from '@/utils/propertyColumn'
+
+type PatientViewModel = GetOverviewDataQuery['recentPatients'][0]
+
+export interface RecentPatientsTableProps extends Omit<TableProps<PatientViewModel>, 'table'> {
+  patients: PatientViewModel[],
+  onSelectPatient: (id: string) => void,
+}
+
+export const RecentPatientsTable = ({
+  patients,
+  onSelectPatient,
+  ...props
+}: RecentPatientsTableProps) => {
+  const translation = useTasksTranslation()
+  const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
+
+  const patientPropertyColumns = useMemo<ColumnDef<PatientViewModel>[]>(() => {
+    if (!propertyDefinitionsData?.propertyDefinitions) return []
+
+    const patientProperties = propertyDefinitionsData.propertyDefinitions.filter(
+      def => def.isActive && def.allowedEntities.includes(PropertyEntity.Patient)
+    )
+
+    return patientProperties.map(prop =>
+      createPropertyColumn<PatientViewModel>(prop))
+  }, [propertyDefinitionsData])
+
+  const patientColumns = useMemo<ColumnDef<PatientViewModel>[]>(() => [
+    {
+      id: 'name',
+      header: translation('name'),
+      accessorKey: 'name',
+      cell: ({ row }) => {
+        return (
+          <Tooltip tooltip={row.original.name} containerClassName="overflow-hidden w-fit max-w-full !block">
+            <span className="truncate block">{row.original.name}</span>
+          </Tooltip>
+        )
+      },
+      minSize: 160,
+      filterFn: 'text',
+    },
+    {
+      id: 'location',
+      header: translation('location'),
+      accessorKey: 'position',
+      cell: ({ row }) => (
+        <LocationChips
+          locations={row.original.position ? [row.original.position] : []}
+          small
+          className="min-h-8"
+          placeholderProps={{ className: 'min-h-8 block' }}
+        />
+      ),
+      minSize: 200,
+      filterFn: 'text',
+    },
+    {
+      id: 'updated',
+      header: translation('updated'),
+      accessorFn: (value) => {
+        const tasks = value.tasks || []
+        const updateDates = tasks
+          .map(t => t.updateDate ? new Date(t.updateDate) : null)
+          .filter((d): d is Date => d !== null)
+          .sort((a, b) => b.getTime() - a.getTime())
+        return updateDates[0]
+      },
+      cell: ({ getValue }) => {
+        const date = getValue() as Date | undefined
+        if (!date) return <FillerCell/>
+        return (
+          <SmartDate date={date}/>
+        )
+      },
+      minSize: 200,
+      size: 200,
+      maxSize: 200,
+      filterFn: 'date',
+    },
+    ...patientPropertyColumns,
+  ], [translation, patientPropertyColumns])
+
+  return (
+    <Table
+      {...props}
+      table={{
+        data: patients,
+        columns: patientColumns,
+        fillerRowCell: useCallback(() => (<FillerCell className="min-h-8"/>), []),
+        onRowClick: useCallback((row: Row<PatientViewModel>) => onSelectPatient(row.original.id), [onSelectPatient]),
+        initialState: {
+          pagination: {
+            pageSize: 25,
+          }
+        }
+      }}
+      header={(
+        <div className="flex-row-4 justify-between items-center">
+          <div className="flex-col-0">
+            <span className="typography-title-lg">{translation('recentPatients')}</span>
+            <span className="text-description">{translation('patientsUpdatedRecently')}</span>
+          </div>
+          <div>
+            <TableColumnSwitcher/>
+          </div>
+        </div>
+      )}
+    />
+  )
+}
\ No newline at end of file
diff --git a/web/components/tables/RecentTasksTable.tsx b/web/components/tables/RecentTasksTable.tsx
new file mode 100644
index 00000000..cd5b4e7a
--- /dev/null
+++ b/web/components/tables/RecentTasksTable.tsx
@@ -0,0 +1,198 @@
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import type { ColumnDef, Row } from '@tanstack/react-table'
+import type { GetOverviewDataQuery, TaskPriority } from '@/api/gql/generated'
+import { useCallback, useMemo } from 'react'
+import clsx from 'clsx'
+import type { TableProps } from '@helpwave/hightide'
+import { Button, Checkbox, FillerCell, Table, TableColumnSwitcher, Tooltip } from '@helpwave/hightide'
+import { ArrowRightIcon } from 'lucide-react'
+import { SmartDate } from '@/utils/date'
+import { DueDateUtils } from '@/utils/dueDate'
+import { PriorityUtils } from '@/utils/priority'
+import { useGetPropertyDefinitionsQuery, PropertyEntity } from '@/api/gql/generated'
+import { createPropertyColumn } from '@/utils/propertyColumn'
+
+type TaskViewModel = GetOverviewDataQuery['recentTasks'][0]
+
+export interface RecentTasksTableProps extends Omit<TableProps<TaskViewModel>, 'table'> {
+  tasks: TaskViewModel[],
+  completeTask: (id: string) => void,
+  reopenTask: (id: string) => void,
+  onSelectPatient: (id: string) => void,
+  onSelectTask: (id: string) => void,
+}
+
+
+export const RecentTasksTable = ({
+  tasks,
+  completeTask,
+  reopenTask,
+  onSelectPatient,
+  onSelectTask,
+  ...props
+}: RecentTasksTableProps) => {
+  const translation = useTasksTranslation()
+  const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
+
+  const taskPropertyColumns = useMemo<ColumnDef<TaskViewModel>[]>(() => {
+    if (!propertyDefinitionsData?.propertyDefinitions) return []
+
+    const taskProperties = propertyDefinitionsData.propertyDefinitions.filter(
+      def => def.isActive && def.allowedEntities.includes(PropertyEntity.Task)
+    )
+
+    return taskProperties.map(prop =>
+      createPropertyColumn<TaskViewModel>(prop))
+  }, [propertyDefinitionsData])
+
+  const taskColumns = useMemo<ColumnDef<TaskViewModel>[]>(() => [
+    {
+      id: 'done',
+      header: () => null,
+      accessorKey: 'done',
+      cell: ({ row }) => (
+        <Checkbox
+          value={row.original.done}
+          onValueChange={(checked) => {
+            if (checked) {
+              completeTask(row.original.id)
+            } else {
+              reopenTask(row.original.id)
+            }
+          }}
+          onClick={(e) => e.stopPropagation()}
+          className={clsx('rounded-full', PriorityUtils.toCheckboxColor(row.original.priority as TaskPriority | null | undefined))}
+        />
+      ),
+      minSize: 60,
+      size: 60,
+      maxSize: 60,
+      enableResizing: false,
+      enableHiding: false,
+    },
+    {
+      id: 'title',
+      header: translation('task'),
+      accessorKey: 'title',
+      cell: ({ row }) => {
+        return (
+          <Tooltip tooltip={row.original.title} containerClassName="overflow-hidden w-full !block">
+            <div className="flex-row-2 items-center">
+              {row.original.priority && (
+                <div className={clsx('w-2 h-2 rounded-full shrink-0', PriorityUtils.toBackgroundColor(row.original.priority as TaskPriority | null | undefined))} />
+              )}
+              <span className="typography-title-sm truncate block">{row.original.title}</span>
+            </div>
+          </Tooltip>
+        )
+      },
+      minSize: 200,
+      filterFn: 'text',
+    },
+    {
+      id: 'patient',
+      header: translation('patient'),
+      accessorFn: (value) => value.patient?.name,
+      cell: ({ row }) => {
+        const patient = row.original.patient
+        if (!patient) return <FillerCell />
+
+        return (
+          <Tooltip tooltip={translation('rShow', { name: patient.name })} containerClassName="overflow-hidden w-full !block">
+            <Button
+              color="neutral"
+              coloringStyle="text"
+              size="sm"
+              onClick={(e) => {
+                e.stopPropagation()
+                onSelectPatient(patient.id)
+              }}
+              className="flex-row-1 w-full justify-between"
+            >
+              <span className="truncate block">{patient.name}</span>
+              <ArrowRightIcon className="size-force-5" />
+            </Button>
+          </Tooltip>
+        )
+      },
+      minSize: 200,
+      maxSize: 400,
+      filterFn: 'text',
+    },
+    {
+      id: 'dueDate',
+      header: translation('dueDate'),
+      accessorKey: 'dueDate',
+      cell: ({ row }) => {
+        if (!row.original.dueDate) return <span className="text-description">-</span>
+        const overdue = DueDateUtils.isOverdue(row.original.dueDate, row.original.done)
+        const closeToDue = DueDateUtils.isCloseToDueDate(row.original.dueDate, row.original.done)
+        let colorClass = ''
+        if (overdue) {
+          colorClass = '!text-red-500'
+        } else if (closeToDue) {
+          colorClass = '!text-orange-500'
+        }
+        return (
+          <SmartDate
+            date={new Date(row.original.dueDate)}
+            mode="relative"
+            className={clsx(colorClass)}
+          />
+        )
+      },
+      minSize: 220,
+      size: 220,
+      maxSize: 220,
+      enableResizing: false,
+      filterFn: 'date',
+    },
+    {
+      id: 'date',
+      header: translation('updated'),
+      accessorFn: (value) => value.updateDate ? new Date(value.updateDate) : undefined,
+      cell: ({ getValue }) => {
+        const date = getValue() as Date | undefined
+        if (!date) return <FillerCell />
+        return (
+          <SmartDate date={date} />
+        )
+      },
+      minSize: 220,
+      size: 220,
+      maxSize: 220,
+      enableResizing: false,
+      filterFn: 'date',
+    },
+    ...taskPropertyColumns,
+  ], [translation, completeTask, reopenTask, onSelectPatient, taskPropertyColumns])
+
+  return (
+    <Table
+      {...props}
+      table={{
+        data: tasks,
+        columns: taskColumns,
+        isUsingFillerRows: true,
+        fillerRowCell: useCallback(() => (<FillerCell className="min-h-8" />), []),
+        onRowClick: useCallback((row: Row<TaskViewModel>) => onSelectTask(row.original.id), [onSelectTask]),
+        initialState: {
+          pagination: {
+            pageSize: 25,
+          }
+        }
+      }}
+      header={(
+        <div className="flex-row-4 justify-between items-center">
+          <div className="flex-col-0">
+            <span className="typography-title-lg">{translation('recentTasks')}</span>
+            <span className="text-description">{translation('tasksUpdatedRecently')}</span>
+          </div>
+          <div>
+            <TableColumnSwitcher />
+          </div>
+        </div>
+      )}
+    />
+  )
+}
diff --git a/web/components/tasks/TaskList.tsx b/web/components/tables/TaskList.tsx
similarity index 50%
rename from web/components/tasks/TaskList.tsx
rename to web/components/tables/TaskList.tsx
index 7f6dbad0..e1635c58 100644
--- a/web/components/tasks/TaskList.tsx
+++ b/web/components/tables/TaskList.tsx
@@ -1,12 +1,13 @@
-import { useMemo, useState, forwardRef, useImperativeHandle, useEffect, useRef } from 'react'
+import { useMemo, useState, forwardRef, useImperativeHandle, useEffect, useRef, useCallback } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { Button, Checkbox, ConfirmDialog, FillerRowElement, SearchBar, Table, Tooltip } from '@helpwave/hightide'
+import { Button, Checkbox, ConfirmDialog, FillerCell, SearchBar, TableColumnSwitcher, TableDisplay, TablePagination, TableProvider, Tooltip, useLocalStorage, Visibility } from '@helpwave/hightide'
 import { PlusIcon, Table as TableIcon, LayoutGrid, UserCheck, Users, Printer } from 'lucide-react'
-import { useAssignTaskMutation, useAssignTaskToTeamMutation, useCompleteTaskMutation, useReopenTaskMutation, useGetUsersQuery, useGetLocationsQuery, type GetGlobalDataQuery } from '@/api/gql/generated'
-import { AssigneeSelectDialog } from './AssigneeSelectDialog'
+import type { TaskPriority, GetTasksQuery } from '@/api/gql/generated'
+import { useAssignTaskMutation, useAssignTaskToTeamMutation, useCompleteTaskMutation, useReopenTaskMutation, useGetUsersQuery, useGetLocationsQuery, useGetPropertyDefinitionsQuery, PropertyEntity, type GetGlobalDataQuery } from '@/api/gql/generated'
+import { AssigneeSelectDialog } from '@/components/tasks/AssigneeSelectDialog'
 import clsx from 'clsx'
 import { SmartDate } from '@/utils/date'
-import { SidePanel } from '@/components/layout/SidePanel'
+import { Drawer } from '@helpwave/hightide'
 import { TaskDetailView } from '@/components/tasks/TaskDetailView'
 import { AvatarStatusComponent } from '@/components/AvatarStatusComponent'
 import { PatientDetailView } from '@/components/patients/PatientDetailView'
@@ -16,7 +17,10 @@ import { useTasksContext } from '@/hooks/useTasksContext'
 import { useTaskViewToggle } from '@/hooks/useViewToggle'
 import { TaskCardView } from '@/components/tasks/TaskCardView'
 import { UserInfoPopup } from '@/components/UserInfoPopup'
-import type { ColumnDef } from '@tanstack/table-core'
+import type { ColumnDef, ColumnFiltersState, PaginationState, SortingState, TableState, VisibilityState } from '@tanstack/table-core'
+import { PriorityUtils } from '@/utils/priority'
+import { createPropertyColumn } from '@/utils/propertyColumn'
+import { useStateWithLocalStorage } from '@/hooks/useStateWithLocalStorage'
 
 export type TaskViewModel = {
   id: string,
@@ -38,6 +42,7 @@ export type TaskViewModel = {
   assignee?: { id: string, name: string, avatarURL?: string | null, isOnline?: boolean | null },
   assigneeTeam?: { id: string, title: string },
   done: boolean,
+  properties?: GetTasksQuery['tasks'][0]['properties'],
 }
 
 export type TaskListRef = {
@@ -57,6 +62,7 @@ type TaskListProps = {
   initialTaskId?: string,
   onInitialTaskOpened?: () => void,
   headerActions?: React.ReactNode,
+  totalCount?: number,
 }
 
 const isOverdue = (dueDate: Date | undefined, done: boolean): boolean => {
@@ -72,62 +78,45 @@ const isCloseToDueDate = (dueDate: Date | undefined, done: boolean): boolean =>
   return dueTime > now && dueTime - now <= oneHour
 }
 
-const getPriorityColor = (priority: string | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'border-l-4 border-l-green-500'
-    case 'P2':
-      return 'border-l-4 border-l-blue-500'
-    case 'P3':
-      return 'border-l-4 border-l-orange-500'
-    case 'P4':
-      return 'border-l-4 border-l-red-500'
-    default:
-      return ''
-  }
-}
 
-const getPriorityDotColor = (priority: string | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'bg-green-500'
-    case 'P2':
-      return 'bg-blue-500'
-    case 'P3':
-      return 'bg-orange-500'
-    case 'P4':
-      return 'bg-red-500'
-    default:
-      return ''
-  }
-}
-
-const getPriorityCheckboxColor = (priority: string | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'border-green-500 text-green-500 checked:bg-green-500'
-    case 'P2':
-      return 'border-blue-500 text-blue-500 checked:bg-blue-500'
-    case 'P3':
-      return 'border-orange-500 text-orange-500 checked:bg-orange-500'
-    case 'P4':
-      return 'border-red-500 text-red-500 checked:bg-red-500'
-    default:
-      return ''
-  }
-}
 
 const STORAGE_KEY_SHOW_DONE = 'task-show-done'
+const STORAGE_KEY_COLUMN_VISIBILITY = 'task-list-column-visibility'
+const STORAGE_KEY_COLUMN_FILTERS = 'task-list-column-filters'
+const STORAGE_KEY_COLUMN_SORTING = 'task-list-column-sorting'
+const STORAGE_KEY_COLUMN_PAGINATION = 'task-list-column-pagination'
 
-export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initialTasks, onRefetch, showAssignee = false, initialTaskId, onInitialTaskOpened, headerActions }, ref) => {
+export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initialTasks, onRefetch, showAssignee = false, initialTaskId, onInitialTaskOpened, headerActions, totalCount }, ref) => {
   const translation = useTasksTranslation()
+
+  const [pagination, setPagination] = useStateWithLocalStorage<PaginationState>({
+    key: STORAGE_KEY_COLUMN_PAGINATION,
+    defaultValue: {
+      pageSize: 25,
+      pageIndex: 0
+    }
+  })
+  const [sorting, setSorting] = useStateWithLocalStorage<SortingState>({
+    key: STORAGE_KEY_COLUMN_SORTING,
+    defaultValue: [
+      { id: 'done', desc: false },
+      { id: 'dueDate', desc: false },
+    ]
+  })
+  const [filters, setFilters] = useStateWithLocalStorage<ColumnFiltersState>({
+    key: STORAGE_KEY_COLUMN_FILTERS,
+    defaultValue: []
+  })
+  const [columnVisibility, setColumnVisibility] = useStateWithLocalStorage<VisibilityState>({
+    key: STORAGE_KEY_COLUMN_VISIBILITY,
+    defaultValue: {}
+  })
+
   const queryClient = useQueryClient()
   const { totalPatientsCount, user, selectedRootLocationIds } = useTasksContext()
   const { viewType, toggleView } = useTaskViewToggle()
   const [optimisticUpdates, setOptimisticUpdates] = useState<Map<string, boolean>>(new Map())
+  const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
   const { mutate: completeTask } = useCompleteTaskMutation({
     onMutate: async (variables) => {
       const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
@@ -226,20 +215,6 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
       onRefetch?.()
     }
   })
-  const [, setIsPrinting] = useState(false)
-
-  useEffect(() => {
-    const handleBeforePrint = () => setIsPrinting(true)
-    const handleAfterPrint = () => setIsPrinting(false)
-
-    window.addEventListener('beforeprint', handleBeforePrint)
-    window.addEventListener('afterprint', handleAfterPrint)
-
-    return () => {
-      window.removeEventListener('beforeprint', handleBeforePrint)
-      window.removeEventListener('afterprint', handleAfterPrint)
-    }
-  }, [])
 
   const [selectedPatientId, setSelectedPatientId] = useState<string | null>(null)
   const [selectedUserPopupId, setSelectedUserPopupId] = useState<string | null>(null)
@@ -250,27 +225,7 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
   const [selectedUserId, setSelectedUserId] = useState<string | null>(null)
   const [isConfirmDialogOpen, setIsConfirmDialogOpen] = useState(false)
   const isOpeningConfirmDialogRef = useRef(false)
-  const [showDone, setShowDone] = useState<boolean>(() => {
-    if (typeof window !== 'undefined') {
-      const stored = localStorage.getItem(STORAGE_KEY_SHOW_DONE)
-      if (stored === 'true') {
-        return true
-      }
-      if (stored === 'false') {
-        return false
-      }
-    }
-    return false
-  })
-
-  const handleShowDoneChange = (checked: boolean) => {
-    setShowDone(() => {
-      if (typeof window !== 'undefined') {
-        localStorage.setItem(STORAGE_KEY_SHOW_DONE, String(checked))
-      }
-      return checked
-    })
-  }
+  const { value: showDone, setValue: setShowDone } = useLocalStorage<boolean>(STORAGE_KEY_SHOW_DONE, false)
 
   const hasPatients = (totalPatientsCount ?? 0) > 0
 
@@ -345,6 +300,7 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
     })
   }, [initialTasks, optimisticUpdates, searchQuery, showDone])
 
+
   const openTasks = useMemo(() => {
     const tasksWithOptimistic = initialTasks.map(task => {
       const optimisticDone = optimisticUpdates.get(task.id)
@@ -435,104 +391,116 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
     setIsHandoverDialogOpen(false)
   }
 
-  const columns = useMemo<ColumnDef<TaskViewModel>[]>(
-    () => {
-      const cols: ColumnDef<TaskViewModel>[] = [
-        {
-          id: 'done',
-          header: translation('status'),
-          accessorKey: 'done',
-          cell: ({ row }) => {
-            const task = row.original
-            const optimisticDone = optimisticUpdates.get(task.id)
-            const displayDone = optimisticDone !== undefined ? optimisticDone : task.done
-            return (
-              <div onClick={(e) => e.stopPropagation()}>
-                <Checkbox
-                  checked={displayDone}
-                  onCheckedChange={(checked) => {
-                    setOptimisticUpdates(prev => {
-                      const next = new Map(prev)
-                      next.set(task.id, checked)
-                      return next
-                    })
-                    if (checked) {
-                      completeTask({ id: task.id })
-                    } else {
-                      reopenTask({ id: task.id })
-                    }
-                  }}
-                  className={clsx('rounded-full', getPriorityCheckboxColor(task.priority))}
-                />
-              </div>
-            )
-          },
-          minSize: 110,
-          size: 110,
-          maxSize: 110,
-          enableResizing: false,
+  const taskProperties = useMemo(() => {
+    return propertyDefinitionsData?.propertyDefinitions
+      .filter(def => def.isActive && def.allowedEntities.includes(PropertyEntity.Task)) ?? []
+  }, [propertyDefinitionsData])
+
+  const taskPropertyColumns = useMemo<ColumnDef<TaskViewModel>[]>(() => {
+    return taskProperties.map(prop => createPropertyColumn<TaskViewModel>(prop))
+  }, [taskProperties])
+
+
+  const columns = useMemo<ColumnDef<TaskViewModel>[]>(() => {
+    const cols: ColumnDef<TaskViewModel>[] = [
+      {
+        id: 'done',
+        header: () => null,
+        accessorKey: 'done',
+        cell: ({ row }) => {
+          const task = row.original
+          const optimisticDone = optimisticUpdates.get(task.id)
+          const displayDone = optimisticDone !== undefined ? optimisticDone : task.done
+          return (
+            <Checkbox
+              value={displayDone}
+              onValueChange={(checked) => {
+                setOptimisticUpdates(prev => {
+                  const next = new Map(prev)
+                  next.set(task.id, checked)
+                  return next
+                })
+                if (checked) {
+                  completeTask({ id: task.id })
+                } else {
+                  reopenTask({ id: task.id })
+                }
+              }}
+              onClick={(e) => e.stopPropagation()}
+              className={clsx('rounded-full', PriorityUtils.toCheckboxColor(task.priority as TaskPriority | null | undefined))}
+            />
+          )
         },
-        {
-          id: 'title',
-          header: translation('title'),
-          accessorKey: 'name',
-          cell: ({ row }) => {
-            return (
-              <div className="flex items-center gap-2">
-                {row.original.priority && (
-                  <div className={clsx('w-2 h-2 rounded-full shrink-0', getPriorityDotColor(row.original.priority))} />
-                )}
-                <span>{row.original.name}</span>
-              </div>
-            )
-          },
-          minSize: 200,
-          size: Number.MAX_SAFE_INTEGER,
+        minSize: 60,
+        size: 60,
+        maxSize: 60,
+        enableResizing: false,
+      },
+      {
+        id: 'title',
+        header: translation('title'),
+        accessorKey: 'name',
+        cell: ({ row }) => {
+          return (
+            <div className="flex-row-2 items-center">
+              {row.original.priority && (
+                <div className={clsx('w-2 h-2 rounded-full shrink-0', PriorityUtils.toBackgroundColor(row.original.priority as TaskPriority | null | undefined))} />
+              )}
+              <span>{row.original.name}</span>
+            </div>
+          )
         },
-        {
-          id: 'dueDate',
-          header: translation('dueDate'),
-          accessorKey: 'dueDate',
-          cell: ({ row }) => {
-            if (!row.original.dueDate) return <span className="text-description">-</span>
-            const overdue = isOverdue(row.original.dueDate, row.original.done)
-            const closeToDue = isCloseToDueDate(row.original.dueDate, row.original.done)
-            let colorClass = ''
-            if (overdue) {
-              colorClass = '!text-red-500'
-            } else if (closeToDue) {
-              colorClass = '!text-orange-500'
-            }
-            return (
-              <SmartDate
-                date={row.original.dueDate}
-                mode="relative"
-                className={clsx(colorClass)}
-              />
-            )
-          },
-          minSize: 150,
-          size: 150,
-          maxSize: 200,
+        minSize: 200,
+        size: 300,
+        filterFn: 'text',
+      },
+      {
+        id: 'dueDate',
+        header: translation('dueDate'),
+        accessorKey: 'dueDate',
+        cell: ({ row }) => {
+          if (!row.original.dueDate) return <span className="text-description">-</span>
+          const overdue = isOverdue(row.original.dueDate, row.original.done)
+          const closeToDue = isCloseToDueDate(row.original.dueDate, row.original.done)
+          let colorClass = ''
+          if (overdue) {
+            colorClass = '!text-red-500'
+          } else if (closeToDue) {
+            colorClass = '!text-orange-500'
+          }
+          return (
+            <SmartDate
+              date={row.original.dueDate}
+              mode="relative"
+              className={clsx(colorClass)}
+            />
+          )
         },
-        {
-          id: 'patient',
-          header: translation('patient'),
-          accessorFn: ({ patient }) => patient?.name,
-          cell: ({ row }) => {
-            const data = row.original
-            if (!data.patient) {
-              return (
-                <span className="text-description">
-                  {translation('noPatient')}
-                </span>
-              )
-            }
+        minSize: 220,
+        size: 220,
+        maxSize: 220,
+        enableResizing: false,
+        filterFn: 'date',
+      },
+      {
+        id: 'patient',
+        header: translation('patient'),
+        accessorFn: ({ patient }) => patient?.name,
+        cell: ({ row }) => {
+          const data = row.original
+          if (!data.patient) {
             return (
-              <div className="flex flex-col gap-1">
+              <span className="text-description">
+                {translation('noPatient')}
+              </span>
+            )
+          }
+          return (
+            <>
+              <div className="flex flex-col gap-1 print:hidden">
                 <Button
                   color="neutral"
-                  size="small"
+                  size="sm"
                   onClick={event => {
                     event.stopPropagation()
                     setSelectedPatientId(data.patient?.id ?? null)
@@ -543,75 +511,76 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
                 </Button>
                 <LocationChips locations={data.patient.locations || []} small />
               </div>
-            )
-          },
-          sortingFn: 'text',
-          minSize: 200,
-          size: 250,
-          maxSize: 350,
+              <span className="hidden print:block">{data.patient?.name}</span>
+            </>
+          )
         },
-      ]
-
-      if (showAssignee) {
-        cols.push({
-          id: 'assignee',
-          header: translation('assignedTo'),
-          accessorFn: ({ assignee, assigneeTeam }) => assignee?.name || assigneeTeam?.title,
-          cell: ({ row }) => {
-            const assignee = row.original.assignee
-            const assigneeTeam = row.original.assigneeTeam
-            if (!assignee && !assigneeTeam) {
-              return (
-                <span className="text-description">
-                  {translation('notAssigned')}
-                </span>
-              )
-            }
-
-            if (assigneeTeam) {
-              return (
-                <div className="flex-row-2 items-center">
-                  <Users className="size-5 text-description" />
-                  <span>{assigneeTeam.title}</span>
-                </div>
-              )
-            }
-
-            if (assignee) {
-              return (
-                <button
-                  onClick={() => setSelectedUserPopupId(assignee.id)}
-                  className="flex-row-2 items-center hover:opacity-75 transition-opacity"
-                >
-                  <AvatarStatusComponent
-                    fullyRounded={true}
-                    isOnline={assignee?.isOnline ?? null}
-                    image={{
-                      avatarUrl: assignee.avatarURL || 'https://cdn.helpwave.de/boringavatar.svg',
-                      alt: assignee.name
-                    }}
-                  />
-                  <span>{assignee.name}</span>
-                </button>
-              )
-            }
-
+        sortingFn: 'text',
+        filterFn: 'text',
+        minSize: 200,
+        size: 250,
+        maxSize: 350,
+      },
+    ]
+
+    if (showAssignee) {
+      cols.push({
+        id: 'assignee',
+        header: translation('assignedTo'),
+        accessorFn: ({ assignee, assigneeTeam }) => assignee?.name || assigneeTeam?.title,
+        cell: ({ row }) => {
+          const assignee = row.original.assignee
+          const assigneeTeam = row.original.assigneeTeam
+          if (!assignee && !assigneeTeam) {
             return (
               <span className="text-description">
                 {translation('notAssigned')}
               </span>
             )
-          },
-          minSize: 200,
-          size: 250,
-          maxSize: 350,
-        })
-      }
+          }
 
-      return cols
-    },
-    [translation, completeTask, reopenTask, showAssignee, optimisticUpdates]
-  )
+          if (assigneeTeam) {
+            return (
+              <div className="flex-row-2 items-center">
+                <Users className="size-5 text-description" />
+                <span>{assigneeTeam.title}</span>
+              </div>
+            )
+          }
+
+          if (assignee) {
+            return (
+              <button
+                onClick={() => setSelectedUserPopupId(assignee.id)}
+                className="flex-row-2 items-center hover:opacity-75 transition-opacity"
+              >
+                <AvatarStatusComponent
+                  isOnline={assignee?.isOnline ?? null}
+                  image={{
+                    avatarUrl: assignee.avatarURL || 'https://cdn.helpwave.de/boringavatar.svg',
+                    alt: assignee.name
+                  }}
+                />
+                <span>{assignee.name}</span>
+              </button>
+            )
+          }
+
+          return (
+            <span className="text-description">
+              {translation('notAssigned')}
+            </span>
+          )
+        },
+        minSize: 200,
+        size: 250,
+        maxSize: 350,
+      })
+    }
+
+    return [...cols, ...taskPropertyColumns]
+  },
+  [translation, completeTask, reopenTask, showAssignee, optimisticUpdates, taskPropertyColumns])
 
   const handleToggleDone = (taskId: string, checked: boolean) => {
     const task = initialTasks.find(t => t.id === taskId)
@@ -629,194 +598,203 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
     }
   }
 
-  const handlePrint = () => {
-    window.print()
-  }
-
   return (
-    <div className="flex flex-col h-full gap-4 print-container">
-      <div className="flex flex-col sm:flex-row justify-between w-full gap-4 print-header">
-        <div className="w-full sm:max-w-md">
-          <SearchBar
-            placeholder={translation('search')}
-            value={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            onSearch={() => null}
-          />
-        </div>
-        <div className="flex flex-wrap items-center gap-4 w-full sm:w-auto sm:ml-auto lg:pr-4">
-          <div className="flex items-center justify-between gap-4 w-full sm:w-auto">
-            <div className="flex items-center gap-2">
-              <Checkbox
-                checked={showDone}
-                onCheckedChange={handleShowDoneChange}
-              />
-              <span className="text-sm text-description whitespace-nowrap">{translation('showDone') || 'Show done'}</span>
-            </div>
-            <div className="flex items-center gap-2">
-              {viewType === 'table' && (
-                <Tooltip tooltip="Print" position="top">
+    <TableProvider
+      data={tasks}
+      columns={columns}
+      fillerRowCell={useCallback(() => (<FillerCell className="min-h-12"/>), [])}
+      state={{
+        columnVisibility,
+        pagination,
+        sorting,
+        columnFilters: filters,
+      } as Partial<TableState> as TableState}
+      onColumnVisibilityChange={setColumnVisibility}
+      onPaginationChange={setPagination}
+      onSortingChange={setSorting}
+      onColumnFiltersChange={setFilters}
+      enableMultiSort={true}
+      onRowClick={row => setTaskDialogState({ isOpen: true, taskId: row.original.id })}
+      pageCount={totalCount ? Math.ceil(totalCount / 25) : undefined}
+    >
+      <div className="flex flex-col h-full gap-4">
+        <div className="flex flex-col sm:flex-row justify-between w-full gap-4">
+          <div className="flex-row-2 items-center">
+            <SearchBar
+              placeholder={translation('search')}
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              onSearch={() => null}
+              containerProps={{ className: 'max-w-80 h-10' }}
+            />
+            <Visibility isVisible={viewType === 'table'}>
+              <TableColumnSwitcher />
+            </Visibility>
+          </div>
+          <div className="flex flex-wrap items-center justify-end gap-4 w-full sm:w-auto sm:ml-auto lg:pr-4">
+            <div className="flex items-center justify-between gap-4 w-full sm:w-auto">
+              <div className="flex items-center gap-2">
+                <Checkbox
+                  value={showDone}
+                  onValueChange={setShowDone}
+                />
+                <span className="text-sm text-description whitespace-nowrap">{translation('showDone') || 'Show done'}</span>
+              </div>
+              <div className="flex items-center gap-2">
+                <Tooltip tooltip={translation(viewType !== 'table' ? 'printOnlyAvailableInTableMode' : 'print')} position="top">
                   <Button
+                    disabled={viewType !== 'table'}
                     layout="icon"
                     color="neutral"
                     coloringStyle="text"
-                    onClick={handlePrint}
-                    className="print-button"
+                    onClick={() => window.print()}
                   >
                     <Printer className="size-5" />
                   </Button>
                 </Tooltip>
-              )}
-              <Tooltip tooltip="Table View" position="top">
-                <Button
-                  layout="icon"
-                  color={viewType === 'table' ? 'primary' : 'neutral'}
-                  coloringStyle={viewType === 'table' ? undefined : 'text'}
-                  onClick={() => toggleView('table')}
-                >
-                  <TableIcon className="size-5" />
-                </Button>
-              </Tooltip>
-              <Tooltip tooltip="Card View" position="top">
-                <Button
-                  layout="icon"
-                  color={viewType === 'card' ? 'primary' : 'neutral'}
-                  coloringStyle={viewType === 'card' ? undefined : 'text'}
-                  onClick={() => toggleView('card')}
-                >
-                  <LayoutGrid className="size-5" />
-                </Button>
-              </Tooltip>
+                <Tooltip tooltip={translation('tableView')} position="top">
+                  <Button
+                    layout="icon"
+                    color={viewType === 'table' ? 'primary' : 'neutral'}
+                    coloringStyle={viewType === 'table' ? undefined : 'text'}
+                    onClick={() => toggleView('table')}
+                  >
+                    <TableIcon className="size-5" />
+                  </Button>
+                </Tooltip>
+                <Tooltip tooltip={translation('cardView')} position="top">
+                  <Button
+                    layout="icon"
+                    color={viewType === 'card' ? 'primary' : 'neutral'}
+                    coloringStyle={viewType === 'card' ? undefined : 'text'}
+                    onClick={() => toggleView('card')}
+                  >
+                    <LayoutGrid className="size-5" />
+                  </Button>
+                </Tooltip>
+              </div>
             </div>
+            {headerActions}
+            {canHandover && (
+              <Button
+                onClick={handleHandoverClick}
+                className="w-fit"
+              >
+                <UserCheck className="size-5"/>
+                {translation('shiftHandover') || 'Shift Handover'}
+              </Button>
+            )}
+            <Tooltip tooltip={translation('addTask')} position="top">
+              <Button
+                onClick={() => setTaskDialogState({ isOpen: true })}
+                disabled={!hasPatients}
+                layout="icon"
+              >
+                <PlusIcon/>
+              </Button>
+            </Tooltip>
           </div>
-          {headerActions}
-          {canHandover && (
-            <Button
-              startIcon={<UserCheck className="size-5"/>}
-              onClick={handleHandoverClick}
-              className="w-full sm:w-auto flex-shrink-0"
-            >
-              {translation('shiftHandover') || 'Shift Handover'}
-            </Button>
-          )}
-          <Button
-            startIcon={<PlusIcon/>}
-            onClick={() => setTaskDialogState({ isOpen: true })}
-            className="w-full sm:w-auto min-w-[13rem] flex-shrink-0"
-            disabled={!hasPatients}
-          >
-            {translation('addTask')}
-          </Button>
         </div>
-      </div>
-      {viewType === 'table' ? (
-        <div className="overflow-x-auto -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4 print-content">
-          <Table
-            className="w-full h-full cursor-pointer min-w-[800px] print-table"
-            data={tasks}
-            columns={columns}
-            fillerRow={() => (
-              <FillerRowElement className="min-h-12"/>
+        <Visibility isVisible={viewType === 'table'}>
+          <div className="flex-col-3 items-center">
+            <TableDisplay className="print-content" />
+            <TablePagination />
+          </div>
+        </Visibility>
+        <Visibility isVisible={viewType === 'card'}>
+          <div className="grid gap-4 -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4" style={{ gridTemplateColumns: 'repeat(auto-fit, minmax(400px, 1fr))' }}>
+            {tasks.length === 0 ? (
+              <div className="w-full text-center text-description py-8 col-span-full">
+                {translation('noOpenTasks')}
+              </div>
+            ) : (
+              tasks.map((task) => (
+                <TaskCardView
+                  key={task.id}
+                  task={task}
+                  onToggleDone={handleToggleDone}
+                  onClick={(t) => setTaskDialogState({ isOpen: true, taskId: t.id })}
+                  showAssignee={showAssignee}
+                  onRefetch={onRefetch}
+                  className={clsx('w-full')}
+                />
+              ))
             )}
-            initialState={{
-              sorting: [
-                { id: 'done', desc: false },
-                { id: 'dueDate', desc: false },
-              ]
-            }}
-            enableMultiSort={true}
-            onRowClick={row => setTaskDialogState({ isOpen: true, taskId: row.original.id })}
-          />
-        </div>
-      ) : (
-        <div className="grid gap-4 -mx-4 px-4 lg:mx-0 lg:pl-0 lg:pr-4 print-content" style={{ gridTemplateColumns: 'repeat(auto-fit, minmax(400px, 1fr))' }}>
-          {tasks.length === 0 ? (
-            <div className="w-full text-center text-description py-8 col-span-full">
-              {translation('noOpenTasks')}
-            </div>
-          ) : (
-            tasks.map((task) => (
-              <TaskCardView
-                key={task.id}
-                task={task}
-                onToggleDone={handleToggleDone}
-                onClick={(t) => setTaskDialogState({ isOpen: true, taskId: t.id })}
-                showAssignee={showAssignee}
-                onRefetch={onRefetch}
-                className={clsx('w-full', getPriorityColor(task.priority))}
-              />
-            ))
-          )}
-        </div>
-      )}
-      <SidePanel
-        title={taskDialogState.taskId ? translation('editTask') : translation('createTask')}
-        isOpen={taskDialogState.isOpen}
-        onClose={() => setTaskDialogState({ isOpen: false })}
-      >
-        <TaskDetailView
-          taskId={taskDialogState.taskId ?? null}
+          </div>
+        </Visibility>
+        <Drawer
+          alignment="right"
+          titleElement={taskDialogState.taskId ? translation('editTask') : translation('createTask')}
+          description={undefined}
+          isOpen={taskDialogState.isOpen}
           onClose={() => setTaskDialogState({ isOpen: false })}
-          onSuccess={onRefetch || (() => {
-          })}
-        />
-      </SidePanel>
-      <SidePanel
-        title={translation('editPatient')}
-        isOpen={!!selectedPatientId}
-        onClose={() => setSelectedPatientId(null)}
-      >
-        {!!selectedPatientId && (
-          <PatientDetailView
-            patientId={selectedPatientId}
-            onClose={() => setSelectedPatientId(null)}
+        >
+          <TaskDetailView
+            taskId={taskDialogState.taskId ?? null}
+            onClose={() => setTaskDialogState({ isOpen: false })}
             onSuccess={onRefetch || (() => {
             })}
           />
-        )}
-      </SidePanel>
-      <AssigneeSelectDialog
-        value={selectedUserId || ''}
-        onValueChanged={handleUserSelect}
-        allowTeams={true}
-        allowUnassigned={false}
-        excludeUserIds={user?.id ? [user.id] : []}
-        isOpen={isHandoverDialogOpen}
-        onClose={() => {
-          setIsHandoverDialogOpen(false)
-          if (!isConfirmDialogOpen && !isOpeningConfirmDialogRef.current) {
-            setSelectedUserId(null)
-          }
-        }}
-        dialogTitle={translation('shiftHandover') || 'Shift Handover'}
-        onUserInfoClick={(userId) => setSelectedUserPopupId(userId)}
-      />
-      {isConfirmDialogOpen && selectedUserId && (
-        <ConfirmDialog
-          isOpen={isConfirmDialogOpen}
-          onCancel={() => {
-            setIsConfirmDialogOpen(false)
-            setSelectedUserId(null)
+        </Drawer>
+        <Drawer
+          alignment="right"
+          titleElement={translation('editPatient')}
+          description={undefined}
+          isOpen={!!selectedPatientId}
+          onClose={() => setSelectedPatientId(null)}
+        >
+          {!!selectedPatientId && (
+            <PatientDetailView
+              patientId={selectedPatientId}
+              onClose={() => setSelectedPatientId(null)}
+              onSuccess={onRefetch || (() => {
+              })}
+            />
+          )}
+        </Drawer>
+        <AssigneeSelectDialog
+          value={selectedUserId || ''}
+          onValueChanged={handleUserSelect}
+          allowTeams={true}
+          allowUnassigned={false}
+          excludeUserIds={user?.id ? [user.id] : []}
+          isOpen={isHandoverDialogOpen}
+          onClose={() => {
             setIsHandoverDialogOpen(false)
-          }}
-          onConfirm={() => {
-            if (selectedUserId) {
-              handleConfirmHandover()
+            if (!isConfirmDialogOpen && !isOpeningConfirmDialogRef.current) {
+              setSelectedUserId(null)
             }
           }}
-          titleElement={translation('confirmShiftHandover') || 'Confirm Shift Handover'}
-          description={getSelectedUserOrTeam && openTasks.length > 0 ? translation('confirmShiftHandoverDescriptionWithName', {
-            taskCount: openTasks.length,
-            name: getSelectedUserOrTeam.name
-          }) : (translation('confirmShiftHandoverDescription') || 'Are you sure you want to transfer all open tasks?')}
+          dialogTitle={translation('shiftHandover') || 'Shift Handover'}
+          onUserInfoClick={(userId) => setSelectedUserPopupId(userId)}
+        />
+        {isConfirmDialogOpen && selectedUserId && (
+          <ConfirmDialog
+            isOpen={isConfirmDialogOpen}
+            onCancel={() => {
+              setIsConfirmDialogOpen(false)
+              setSelectedUserId(null)
+              setIsHandoverDialogOpen(false)
+            }}
+            onConfirm={() => {
+              if (selectedUserId) {
+                handleConfirmHandover()
+              }
+            }}
+            titleElement={translation('confirmShiftHandover') || 'Confirm Shift Handover'}
+            description={getSelectedUserOrTeam && openTasks.length > 0 ? translation('confirmShiftHandoverDescriptionWithName', {
+              taskCount: openTasks.length,
+              name: getSelectedUserOrTeam.name
+            }) : (translation('confirmShiftHandoverDescription') || 'Are you sure you want to transfer all open tasks?')}
+          />
+        )}
+        <UserInfoPopup
+          userId={selectedUserPopupId}
+          isOpen={!!selectedUserPopupId}
+          onClose={() => setSelectedUserPopupId(null)}
         />
-      )}
-      <UserInfoPopup
-        userId={selectedUserPopupId}
-        isOpen={!!selectedUserPopupId}
-        onClose={() => setSelectedUserPopupId(null)}
-      />
-    </div>
+      </div>
+    </TableProvider>
   )
 })
 
diff --git a/web/components/tasks/AssigneeSelect.tsx b/web/components/tasks/AssigneeSelect.tsx
index 1015dcca..e6a445d6 100644
--- a/web/components/tasks/AssigneeSelect.tsx
+++ b/web/components/tasks/AssigneeSelect.tsx
@@ -1,11 +1,12 @@
 import { useState, useMemo } from 'react'
-import { SearchBar } from '@helpwave/hightide'
+import { PropsUtil, Visibility } from '@helpwave/hightide'
 import { AvatarStatusComponent } from '@/components/AvatarStatusComponent'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import { Users, ChevronDown, Info } from 'lucide-react'
+import { Users, ChevronDown, Info, SearchIcon } from 'lucide-react'
 import { useGetUsersQuery, useGetLocationsQuery } from '@/api/gql/generated'
 import clsx from 'clsx'
 import { AssigneeSelectDialog } from './AssigneeSelectDialog'
+import { UserInfoPopup } from '../UserInfoPopup'
 
 interface AssigneeSelectProps {
   value: string,
@@ -15,11 +16,10 @@ interface AssigneeSelectProps {
   excludeUserIds?: string[],
   id?: string,
   className?: string,
-  onUserInfoClick?: (userId: string) => void,
   [key: string]: unknown,
 }
 
-export const AssigneeSelect = ({
+export const  AssigneeSelect = ({
   value,
   onValueChanged,
   allowTeams = true,
@@ -27,11 +27,11 @@ export const AssigneeSelect = ({
   excludeUserIds = [],
   id,
   className,
-  onUserInfoClick,
 }: AssigneeSelectProps) => {
   const translation = useTasksTranslation()
-  const [searchQuery, setSearchQuery] = useState('')
   const [isOpen, setIsOpen] = useState(false)
+  const [selectedUserPopupState, setSelectedUserPopupState] = useState<{ isOpen: boolean, userId: string | null }>({ isOpen: false, userId: null })
+
 
   const { data: usersData } = useGetUsersQuery(undefined, {
   })
@@ -73,42 +73,30 @@ export const AssigneeSelect = ({
     setIsOpen(false)
   }
 
-  const showSearchBar = !selectedItem
 
   return (
     <>
       <div
         id={id}
-        className={clsx(
-          'relative w-full',
-          className
-        )}
+        className={clsx('flex-row-4 justify-between items-center input-element h-12 px-2 py-2 rounded-md w-full hover:cursor-pointer', className)}
+
+        role="button"
+        tabIndex={0}
+        {...PropsUtil.aria.click(handleInputClick)}
       >
-        <div className="relative flex items-center w-full transition-all duration-200">
-          {showSearchBar ? (
-            <SearchBar
-              placeholder={translation('selectAssignee') || 'Assign to...'}
-              value={searchQuery}
-              onChange={(e) => {
-                setSearchQuery(e.target.value)
-              }}
-              onSearch={() => null}
-              onClick={handleInputClick}
-              onFocus={handleInputClick}
-              className="w-full"
-            />
-          ) : (
-            <div
-              onClick={handleInputClick}
-              className="flex items-center gap-2 justify-between w-full h-10 px-3 border-2 border-border rounded-md bg-surface text-on-surface hover:bg-surface-hover focus-within:outline-none focus-within:ring-2 focus-within:ring-primary transition-all duration-200 cursor-pointer ml-0.5"
-            >
+        <Visibility isVisible={!selectedItem}>
+          <span className="truncate">{translation('selectAssignee')}</span>
+          <SearchIcon className="size-4 text-description" />
+        </Visibility>
+        <Visibility isVisible={!!selectedItem}>
+          {selectedItem && (
+            <>
               <div className="flex items-center gap-2 min-w-0 flex-1">
                 {selectedItem.type === 'team' ? (
                   <Users className="size-5 text-description flex-shrink-0" />
                 ) : (
                   <AvatarStatusComponent
                     size="sm"
-                    fullyRounded={true}
                     isOnline={selectedItem.user.isOnline ?? null}
                     image={selectedItem.user.avatarUrl ? {
                       avatarUrl: selectedItem.user.avatarUrl,
@@ -119,15 +107,16 @@ export const AssigneeSelect = ({
                 <span className="truncate">{selectedItem?.name}</span>
               </div>
               <div className="flex items-center gap-1">
-                {selectedItem && selectedItem.type === 'user' && onUserInfoClick && (
+                {selectedItem && selectedItem.type === 'user' && (
                   <button
                     type="button"
                     onClick={(e) => {
                       e.stopPropagation()
                       if (selectedItem) {
-                        onUserInfoClick(selectedItem.id)
+                        setSelectedUserPopupState({ isOpen: true, userId: selectedItem.id })
                       }
                     }}
+                    onKeyDown={(e) => e.stopPropagation()}
                     className="p-1 hover:bg-surface-hover rounded transition-colors text-description hover:text-on-surface"
                     aria-label="View user info"
                   >
@@ -136,9 +125,9 @@ export const AssigneeSelect = ({
                 )}
                 <ChevronDown className={clsx('size-6 ml-2 flex-shrink-0 transition-transform duration-200 text-description', isOpen && 'rotate-180')} />
               </div>
-            </div>
+            </>
           )}
-        </div>
+        </Visibility>
       </div>
       <AssigneeSelectDialog
         value={value}
@@ -148,7 +137,12 @@ export const AssigneeSelect = ({
         excludeUserIds={excludeUserIds}
         isOpen={isOpen}
         onClose={handleClose}
-        onUserInfoClick={onUserInfoClick}
+        onUserInfoClick={(userId) => setSelectedUserPopupState({ isOpen: true, userId })}
+      />
+      <UserInfoPopup
+        userId={selectedUserPopupState.userId}
+        isOpen={selectedUserPopupState.isOpen && selectedUserPopupState.userId !== null}
+        onClose={() => setSelectedUserPopupState(prev => ({ ...prev, isOpen: false }))}
       />
     </>
   )
diff --git a/web/components/tasks/AssigneeSelectDialog.tsx b/web/components/tasks/AssigneeSelectDialog.tsx
index 5557ba8e..930ad37c 100644
--- a/web/components/tasks/AssigneeSelectDialog.tsx
+++ b/web/components/tasks/AssigneeSelectDialog.tsx
@@ -111,16 +111,16 @@ export const AssigneeSelectDialog = ({
       className="w-[500px] h-[600px] max-w-full flex flex-col"
       isModal={true}
     >
+      <div ref={searchInputRef} className="flex-shrink-0">
+        <SearchBar
+          placeholder={translation('searchUsersOrTeams') || 'Search users or teams...'}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          onSearch={() => null}
+          className="w-full"
+        />
+      </div>
       <div className="flex flex-col gap-4 flex-1 min-h-0 overflow-hidden" onClick={(e) => e.stopPropagation()} onMouseDown={(e) => e.stopPropagation()}>
-        <div ref={searchInputRef} className="flex-shrink-0">
-          <SearchBar
-            placeholder={translation('searchUsersOrTeams') || 'Search users or teams...'}
-            value={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            onSearch={() => null}
-            className="w-full"
-          />
-        </div>
         <div className="overflow-y-auto flex-1 min-h-0 border border-divider rounded-lg bg-surface" style={{ height: '300px' }}>
           {filteredUsers.length > 0 && (
             <>
@@ -140,7 +140,6 @@ export const AssigneeSelectDialog = ({
                   >
                     <AvatarStatusComponent
                       size="sm"
-                      fullyRounded={true}
                       isOnline={u.isOnline ?? null}
                       image={u.avatarUrl ? {
                         avatarUrl: u.avatarUrl,
diff --git a/web/components/tasks/TaskCardView.tsx b/web/components/tasks/TaskCardView.tsx
index 3636f521..dd39e42a 100644
--- a/web/components/tasks/TaskCardView.tsx
+++ b/web/components/tasks/TaskCardView.tsx
@@ -4,13 +4,15 @@ import { Clock, User, Users, Flag } from 'lucide-react'
 import clsx from 'clsx'
 import { SmartDate } from '@/utils/date'
 import { LocationChips } from '@/components/patients/LocationChips'
-import type { TaskViewModel } from './TaskList'
+import type { TaskViewModel } from '@/components/tables/TaskList'
 import { useRouter } from 'next/router'
+import type { TaskPriority } from '@/api/gql/generated'
 import { useCompleteTaskMutation, useReopenTaskMutation, type GetGlobalDataQuery } from '@/api/gql/generated'
 import { useState, useEffect, useRef, useMemo } from 'react'
 import { UserInfoPopup } from '@/components/UserInfoPopup'
 import { useQueryClient } from '@tanstack/react-query'
 import { useTasksContext } from '@/hooks/useTasksContext'
+import { PriorityUtils } from '@/utils/priority'
 
 type FlexibleTask = {
   id: string,
@@ -68,38 +70,6 @@ const isCloseToDueDate = (dueDate: Date | undefined, done: boolean): boolean =>
   return dueTime > now && dueTime - now <= oneHour
 }
 
-const getPriorityColor = (priority: string | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'border-l-4 border-l-green-500'
-    case 'P2':
-      return 'border-l-4 border-l-blue-500'
-    case 'P3':
-      return 'border-l-4 border-l-orange-500'
-    case 'P4':
-      return 'border-l-4 border-l-red-500'
-    default:
-      return ''
-  }
-}
-
-const getPriorityCheckboxColor = (priority: string | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'border-green-500 text-green-500 checked:bg-green-500'
-    case 'P2':
-      return 'border-blue-500 text-blue-500 checked:bg-blue-500'
-    case 'P3':
-      return 'border-orange-500 text-orange-500 checked:bg-orange-500'
-    case 'P4':
-      return 'border-red-500 text-red-500 checked:bg-red-500'
-    default:
-      return ''
-  }
-}
-
 const toDate = (date: Date | string | null | undefined): Date | undefined => {
   if (!date) return undefined
   if (date instanceof Date) return date
@@ -198,12 +168,6 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
     return finishDate
   }, [dueDate, flexibleTask.estimatedTime])
 
-  const borderColorClass = overdue
-    ? 'border-red-500'
-    : closeToDue
-      ? 'border-orange-500'
-      : 'border-neutral-300 dark:border-neutral-600'
-
   const handlePatientClick = (e: React.MouseEvent) => {
     e.stopPropagation()
     if (task.patient?.id) {
@@ -229,12 +193,29 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
     }
   }
 
-  const priorityBorderClass = getPriorityColor(task.priority || (task as FlexibleTask).priority)
+  const borderColorClass = overdue
+    ? 'border-negative'
+    : closeToDue
+      ? 'border-warning'
+      : 'border-border'
+
+  const priorityBorderClass = {
+    P1: 'border-l-4 border-l-priority-p1',
+    P2: 'border-l-4 border-l-priority-p2',
+    P3: 'border-l-4 border-l-priority-p3',
+    P4: 'border-l-4 border-l-priority-p4',
+  }[(task as FlexibleTask).priority as TaskPriority] ?? ''
 
   return (
     <div
       onClick={() => onClick(task)}
-      className={clsx('border-2 p-5 rounded-lg text-left transition-colors hover:border-primary relative bg-[rgba(255,255,255,1)] dark:bg-[rgba(55,65,81,1)] overflow-hidden cursor-pointer w-full', borderColorClass, priorityBorderClass, className)}
+      className={clsx(
+        'border-2 p-4 rounded-lg text-left transition-colors hover:border-primary ',
+        'relative bg-surface-variant bg-on-surface-variant overflow-hidden cursor-pointer w-full min-h-35',
+        borderColorClass,
+        priorityBorderClass,
+        className
+      )}
       role="button"
       tabIndex={0}
       onKeyDown={(e) => {
@@ -247,22 +228,21 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
       <div className="flex items-start gap-4 w-full min-w-0">
         <div onClick={(e) => e.stopPropagation()}>
           <Checkbox
-            checked={displayDone}
-            onCheckedChange={handleToggleDone}
-            className={clsx('rounded-full mt-0.5 shrink-0', getPriorityCheckboxColor(task.priority || (task as FlexibleTask).priority))}
+            value={displayDone}
+            onValueChange={handleToggleDone}
+            className={clsx('rounded-full mt-0.5 shrink-0', PriorityUtils.toCheckboxColor(task?.priority as TaskPriority | null | undefined))}
           />
         </div>
         <div className={clsx('flex-1 min-w-0 overflow-hidden', { 'pb-16': showPatient, 'pb-12': !showPatient })}>
           <div className={clsx('flex items-center justify-between gap-2 flex-wrap min-w-0', { 'mb-2': showPatient, 'mb-4': !showPatient })}>
             <div className="flex items-center gap-2 min-w-0 flex-1">
               {(task as FlexibleTask).priority && (
-                <div className={clsx(
-                  'w-2 h-2 rounded-full shrink-0',
-                  (task as FlexibleTask).priority === 'P1' ? 'bg-green-500' :
-                    (task as FlexibleTask).priority === 'P2' ? 'bg-blue-500' :
-                      (task as FlexibleTask).priority === 'P3' ? 'bg-orange-500' :
-                        (task as FlexibleTask).priority === 'P4' ? 'bg-red-500' : ''
-                )} />
+                <div
+                  className={clsx(
+                    'w-2 h-2 rounded-full shrink-0',
+                    PriorityUtils.toBackgroundColor(task?.priority as TaskPriority | null | undefined)
+                  )}
+                />
               )}
               <div
                 className={clsx(
@@ -276,7 +256,7 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
             {task.assigneeTeam && (
               <div className="flex items-center gap-1.5 text-base text-description shrink-0 min-w-0">
                 <Users className="size-5 text-description" />
-                <span className="truncate max-w-[150px]">{task.assigneeTeam.title}</span>
+                <span className="truncate max-w-40">{task.assigneeTeam.title}</span>
               </div>
             )}
             {!task.assigneeTeam && task.assignee && (
@@ -288,7 +268,6 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
                 className="flex items-center gap-1.5 text-base text-description shrink-0 min-w-0 hover:opacity-75 transition-opacity"
               >
                 <AvatarStatusComponent
-                  fullyRounded={true}
                   size="sm"
                   isOnline={task.assignee?.isOnline ?? null}
                   image={{
@@ -309,7 +288,7 @@ export const TaskCardView = ({ task, onToggleDone: _onToggleDone, onClick, showA
         <div className="absolute bottom-5" style={{ left: 'calc(1.25rem + 1.5rem + 1rem)' }}>
           <Button
             color="neutral"
-            size="small"
+            size="sm"
             onClick={handlePatientClick}
             className="flex-row-0 justify-start w-fit"
           >
diff --git a/web/components/tasks/TaskDataEditor.tsx b/web/components/tasks/TaskDataEditor.tsx
new file mode 100644
index 00000000..a76ce6a1
--- /dev/null
+++ b/web/components/tasks/TaskDataEditor.tsx
@@ -0,0 +1,460 @@
+import { useEffect, useState, useMemo } from 'react'
+import { useTasksTranslation } from '@/i18n/useTasksTranslation'
+import type { CreateTaskInput, UpdateTaskInput, TaskPriority } from '@/api/gql/generated'
+import {
+  PatientState,
+  useCreateTaskMutation,
+  useDeleteTaskMutation,
+  useGetPatientsQuery,
+  useGetTaskQuery
+} from '@/api/gql/generated'
+import type { FormFieldDataHandling } from '@helpwave/hightide'
+import {
+  Button,
+  Checkbox,
+  DateTimeInput,
+  FormProvider,
+  FormField,
+  Input,
+  LoadingContainer,
+  Select,
+  SelectOption,
+  Textarea,
+  useCreateForm,
+  Drawer,
+  useFormObserverKey,
+  Visibility,
+  FormObserver
+} from '@helpwave/hightide'
+import { useTasksContext } from '@/hooks/useTasksContext'
+import { User, Flag } from 'lucide-react'
+import { SmartDate } from '@/utils/date'
+import { AssigneeSelect } from './AssigneeSelect'
+import { localToUTCWithSameTime, PatientDetailView } from '@/components/patients/PatientDetailView'
+import { useOptimisticUpdateTaskMutation } from '@/api/optimistic-updates/GetTask'
+import { ErrorDialog } from '@/components/ErrorDialog'
+import clsx from 'clsx'
+import { PriorityUtils } from '@/utils/priority'
+
+type TaskFormValues = CreateTaskInput & {
+  done: boolean,
+  assigneeTeamId?: string | null,
+}
+
+interface TaskDataEditorProps {
+  id: null | string,
+  initialPatientId?: string,
+  onSuccess?: () => void,
+  onClose?: () => void,
+}
+
+export const TaskDataEditor = ({
+  id,
+  initialPatientId,
+  onSuccess,
+  onClose,
+}: TaskDataEditorProps) => {
+  const translation = useTasksTranslation()
+  const { selectedRootLocationIds } = useTasksContext()
+  const [errorDialog, setErrorDialog] = useState<{ isOpen: boolean, message?: string }>({ isOpen: false })
+  const [isShowingPatientDialog, setIsShowingPatientDialog] = useState<boolean>(false)
+
+  const isEditMode = id !== null
+  const taskId = id
+
+  const { data: taskData, isLoading: isLoadingTask } = useGetTaskQuery(
+    { id: taskId! },
+    {
+      enabled: isEditMode,
+      refetchOnMount: true,
+    }
+  )
+
+  const { data: patientsData } = useGetPatientsQuery(
+    {
+      rootLocationIds: selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined,
+      states: [PatientState.Admitted, PatientState.Wait],
+    },
+    {
+      enabled: !isEditMode,
+    }
+  )
+
+  const [isCreating, setIsCreating] = useState<boolean>(false)
+  const { mutate: createTask } = useCreateTaskMutation({
+    onMutate: () => {
+      setIsCreating(true)
+    },
+    onSettled: () => {
+      setIsCreating(false)
+    },
+    onSuccess: async () => {
+      onSuccess?.()
+      onClose?.()
+    },
+    onError: (error) => {
+      setErrorDialog({ isOpen: true, message: error instanceof Error ? error.message : 'Failed to create task' })
+    },
+  })
+
+  const { mutate: updateTask } = useOptimisticUpdateTaskMutation({
+    id: taskId!,
+    onSuccess: () => {
+      onSuccess?.()
+    },
+  })
+
+  const [isDeleting, setIsDeleting] = useState<boolean>(false)
+  const { mutate: deleteTask } = useDeleteTaskMutation({
+    onMutate: () => {
+      setIsDeleting(true)
+    },
+    onSettled: () => {
+      setIsDeleting(false)
+    },
+    onSuccess: () => {
+      onSuccess?.()
+      onClose?.()
+    },
+  })
+
+  const form = useCreateForm<TaskFormValues>({
+    initialValues: {
+      title: '',
+      description: '',
+      patientId: initialPatientId || '',
+      assigneeId: null,
+      assigneeTeamId: null,
+      dueDate: null,
+      priority: null,
+      estimatedTime: null,
+      done: false,
+    },
+    onFormSubmit: (values) => {
+      createTask({
+        data: {
+          title: values.title,
+          patientId: values.patientId,
+          description: values.description,
+          assigneeId: values.assigneeId,
+          assigneeTeamId: values.assigneeTeamId,
+          dueDate: values.dueDate ? localToUTCWithSameTime(values.dueDate)?.toISOString() : null,
+          priority: (values.priority as TaskPriority | null) || undefined,
+          estimatedTime: values.estimatedTime,
+          properties: values.properties
+        } as CreateTaskInput & { priority?: TaskPriority | null, estimatedTime?: number | null }
+      })
+    },
+    validators: {
+      title: (value) => {
+        if (!value || !value.trim()) {
+          return translation('taskTitlePlaceholder') + ' is required'
+        }
+        return null
+      },
+      patientId: (value) => {
+        if (!value || !value.trim()) {
+          return translation('patient') + ' is required'
+        }
+        return null
+      },
+    },
+    onValidUpdate: (_, updates) => {
+      if (isEditMode && taskId) {
+        const data: UpdateTaskInput = {
+          title: updates?.title,
+          description: updates?.description,
+          dueDate: updates?.dueDate ? localToUTCWithSameTime(updates.dueDate)?.toISOString() : undefined,
+          priority: updates?.priority as TaskPriority | null | undefined,
+          estimatedTime: updates?.estimatedTime,
+          done: updates?.done,
+          assigneeId: updates?.assigneeId,
+          assigneeTeamId: updates?.assigneeTeamId,
+        }
+        updateTask({ id: taskId, data })
+      }
+    }
+  })
+
+  const { update: updateForm } = form
+
+  useEffect(() => {
+    if (taskData?.task && isEditMode) {
+      const task = taskData.task
+      updateForm(prev => ({
+        ...prev,
+        title: task.title,
+        description: task.description || '',
+        patientId: task.patient?.id || '',
+        assigneeId: task.assignee?.id || null,
+        assigneeTeamId: task.assigneeTeam?.id || null,
+        dueDate: task.dueDate ? new Date(task.dueDate) : null,
+        priority: (task.priority as TaskPriority | null) || null,
+        estimatedTime: task.estimatedTime ?? null,
+        done: task.done || false,
+      }))
+    } else if (initialPatientId && !taskId) {
+      updateForm(prev => ({ ...prev, patientId: initialPatientId }))
+    }
+  }, [taskData?.task, isEditMode, initialPatientId, taskId, updateForm])
+
+  const patients = patientsData?.patients || []
+
+  const dueDate = useFormObserverKey({ formStore: form.store, formKey: 'dueDate' })?.value ?? null
+  const estimatedTime = useFormObserverKey({ formStore: form.store, formKey: 'estimatedTime' })?.value ?? null
+  const expectedFinishDate = useMemo(() => {
+    if (!dueDate || !estimatedTime) return null
+    const finishDate = new Date(dueDate)
+    finishDate.setMinutes(finishDate.getMinutes() + estimatedTime)
+    return finishDate
+  }, [dueDate, estimatedTime])
+
+  if (isEditMode && isLoadingTask) {
+    return <LoadingContainer/>
+  }
+
+  const priorities = [
+    { value: 'P1', label: translation('priority', { priority: 'P1' }) },
+    { value: 'P2', label: translation('priority', { priority: 'P2' }) },
+    { value: 'P3', label: translation('priority', { priority: 'P3' }) },
+    { value: 'P4', label: translation('priority', { priority: 'P4' }) },
+  ]
+
+  return (
+    <>
+      <FormProvider state={form}>
+        <form onSubmit={event => { event.preventDefault(); form.submit() }}>
+          <div className="flex flex-col gap-6 pt-4 pb-24">
+            <div className="flex items-center gap-3">
+              <Visibility isVisible={isEditMode}>
+                <FormObserver>
+                  {({ values: { done, priority } }) => (
+                    <Checkbox
+                      id="task-done"
+                      value={done || false}
+                      onValueChange={(checked) => {
+                        // TODO replace with form.update when it allows setting the update trigger
+                        form.store.setValue('done', checked, true)
+                      }}
+                      className={clsx('rounded-full scale-125',
+                        PriorityUtils.toCheckboxColor(priority as TaskPriority | null | undefined))}
+                    />
+                  )}
+                </FormObserver>
+              </Visibility>
+              <div className="flex-1">
+                <FormField<TaskFormValues, 'title'>
+                  name="title"
+                  label={translation('task')}
+                  required
+                  showRequiredIndicator={!isEditMode}
+                >
+                  {({ dataProps, focusableElementProps, interactionStates }) => (
+                    <Input
+                      {...dataProps} {...focusableElementProps} {...interactionStates}
+                      placeholder={translation('taskTitlePlaceholder')}
+                      className="flex-1 text-lg py-3"
+                    />
+                  )}
+                </FormField>
+              </div>
+            </div>
+
+            <FormField<TaskFormValues, 'patientId'>
+              name="patientId"
+              label={translation('patient')}
+              required
+              showRequiredIndicator={!isEditMode}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => {
+                return (!isEditMode) ? (
+                  <Select
+                    {...dataProps as FormFieldDataHandling<string>} {...focusableElementProps} {...interactionStates}
+                  >
+                    {patients.map(patient => {
+                      return (
+                        <SelectOption key={patient.id} value={patient.id}>
+                          {patient.name}
+                        </SelectOption>
+                      )
+                    })}
+                  </Select>
+                ) : (
+                  <div id={focusableElementProps.id}>
+                    <Button
+                      color="neutral"
+                      onClick={() => setIsShowingPatientDialog(true)}
+                      className="w-fit"
+                    >
+                      <User className="size-4"/>
+                      { taskData?.task?.patient?.name}
+                    </Button>
+                  </div>
+                )
+              }}
+            </FormField>
+
+            <FormField<TaskFormValues, 'assigneeId'>
+              name="assigneeId"
+              label={translation('assignedTo')}
+            >
+              {({ dataProps }) => (
+                // TODO add interaction states to AssigneeSelect
+                <AssigneeSelect
+                  value={dataProps.value ?? ''}
+                  onValueChanged={(value) => {
+                    updateForm(prev => {
+                      if(value.startsWith('team:')) {
+                        return ({
+                          ...prev, assigneeId: null, assigneeTeamId: value.replace('team:', '') })
+                      } else {
+                        return ({ ...prev, assigneeId: value, assigneeTeamId: null })
+                      }
+                    })
+                  }}
+                  allowTeams={true}
+                  allowUnassigned={true}
+                />
+              )}
+            </FormField>
+
+            <FormField<TaskFormValues, 'dueDate'>
+              name="dueDate"
+              label={translation('dueDate')}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => (
+                <DateTimeInput
+                  {...dataProps} {...focusableElementProps} {...interactionStates}
+                  value={dataProps.value ?? undefined}
+                  isControlled={true}
+                  mode="dateTime"
+                />
+              )}
+            </FormField>
+
+            <FormField<TaskFormValues, 'priority'>
+              name="priority"
+              label={translation('priorityLabel') ?? 'Priority'}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => {
+                const priorityValue = dataProps.value || 'none'
+                return (
+                  <Select
+                    {...dataProps as FormFieldDataHandling<string>} {...focusableElementProps} {...interactionStates}
+                    value={priorityValue === null ? 'none' : priorityValue}
+                    onValueChange={(value) => {
+                      const priority = value === 'none' ? null : (value as TaskPriority)
+                      dataProps.onValueChange?.(priority)
+                      dataProps.onEditComplete?.(priority)
+                    }}
+                  >
+                    <SelectOption value="none" iconAppearance="right">{translation('priorityNone')}</SelectOption>
+                    {priorities.map(({ value, label }) => (
+                      <SelectOption key={value} value={value} iconAppearance="right">
+                        <div className="flex items-center gap-2">
+                          <span className={`w-2 h-2 rounded-full ${PriorityUtils.toBackgroundColor(value as TaskPriority | null | undefined)}`} />
+                          <span>{label}</span>
+                        </div>
+                      </SelectOption>
+                    ))}
+                  </Select>
+                )
+              }}
+            </FormField>
+
+            <FormField<TaskFormValues, 'estimatedTime'>
+              name="estimatedTime"
+              label={translation('estimatedTime') ?? 'Estimated Time (minutes)'}
+            >
+              {({ dataProps: { value, onValueChange, onEditComplete }, focusableElementProps, interactionStates }) => (
+                <Input
+                  {...focusableElementProps} {...interactionStates}
+                  type="number"
+                  min="0"
+                  step="1"
+                  value={value?.toString() || ''}
+                  placeholder="e.g. 30"
+                  onChange={(e) => {
+                    const numValue = e.target.value === '' ? null : parseInt(e.target.value, 10)
+                    onValueChange?.(isNaN(numValue as number) ? null : numValue)
+                  }}
+                  onBlur={() => {
+                    onEditComplete?.(value)
+                  }}
+                />
+              )}
+            </FormField>
+
+            {expectedFinishDate && (
+              <div className="flex items-center gap-2">
+                <Flag className="size-4" />
+                <SmartDate date={expectedFinishDate} mode="relative" showTime={true} />
+              </div>
+            )}
+
+            <FormField<TaskFormValues, 'description'>
+              name="description"
+              label={translation('description')}
+            >
+              {({ dataProps, focusableElementProps, interactionStates }) => (
+                <Textarea
+                  {...dataProps} {...focusableElementProps} {...interactionStates}
+                  value={dataProps.value || ''}
+                  placeholder={translation('descriptionPlaceholder')}
+                  minLength={4}
+                />
+              )}
+            </FormField>
+
+            {isEditMode && taskId && (
+              <div className="pt-6 mt-6 border-t border-divider flex justify-end gap-2">
+                <Button
+                  onClick={() => {
+                    if (taskId) {
+                      deleteTask({ id: taskId })
+                    }
+                  }}
+                  disabled={isDeleting}
+                  color="negative"
+                  coloringStyle="outline"
+                >
+                  {isDeleting ? 'Deleting...' : translation('delete')}
+                </Button>
+              </div>
+            )}
+          </div>
+
+          {!isEditMode && (
+            <div className="flex-none pt-4 mt-auto border-t border-divider flex justify-end gap-2">
+              <Button
+                type="submit"
+                disabled={isCreating}
+              >
+                {isCreating ? 'Creating...' : translation('create')}
+              </Button>
+            </div>
+          )}
+
+          <ErrorDialog
+            isOpen={errorDialog.isOpen}
+            onClose={() => setErrorDialog({ isOpen: false })}
+            message={errorDialog.message}
+          />
+        </form>
+        <Drawer
+          isOpen={isShowingPatientDialog}
+          onClose={() => setIsShowingPatientDialog(false)}
+          alignment="right"
+          titleElement={translation('editPatient')}
+          description={undefined}
+        >
+          <PatientDetailView
+            patientId={taskData?.task?.patient?.id}
+            onClose={() => setIsShowingPatientDialog(false)}
+            onSuccess={() => {}}
+          />
+        </Drawer>
+      </FormProvider>
+    </>
+  )
+}
diff --git a/web/components/tasks/TaskDetailView.tsx b/web/components/tasks/TaskDetailView.tsx
index 9b066b17..8b195511 100644
--- a/web/components/tasks/TaskDetailView.tsx
+++ b/web/components/tasks/TaskDetailView.tsx
@@ -1,55 +1,19 @@
-import { useEffect, useState, useMemo } from 'react'
+import { useMemo, useCallback } from 'react'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import type { CreateTaskInput, UpdateTaskInput, TaskPriority } from '@/api/gql/generated'
 import {
-  PatientState,
   PropertyEntity,
-  useAssignTaskMutation,
-  useAssignTaskToTeamMutation,
-  useCompleteTaskMutation,
-  useCreateTaskMutation,
-  useDeleteTaskMutation,
-  useGetLocationsQuery,
-  useGetPatientsQuery,
   useGetPropertyDefinitionsQuery,
   useGetTaskQuery,
-  useGetUsersQuery,
-  useReopenTaskMutation,
-  useUnassignTaskMutation,
-  useUnassignTaskFromTeamMutation,
-  UpdateTaskDocument,
-  type GetTaskQuery,
-  type PropertyValueInput,
-  type UpdateTaskMutation,
-  type UpdateTaskMutationVariables
+  type PropertyValueInput
 } from '@/api/gql/generated'
-import { useQueryClient } from '@tanstack/react-query'
 import {
-  Button,
-  Checkbox,
-  DateTimeInput,
-  FormElementWrapper,
-  Input,
-  LoadingButton,
-  LoadingContainer,
-  Select,
-  SelectOption,
-  Tab,
-  TabView,
-  Textarea
+  TabList,
+  TabPanel,
+  TabSwitcher
 } from '@helpwave/hightide'
-import { useTasksContext } from '@/hooks/useTasksContext'
-import { User, Flag } from 'lucide-react'
-import { SmartDate } from '@/utils/date'
-import { AssigneeSelect } from './AssigneeSelect'
-import { SidePanel } from '@/components/layout/SidePanel'
-import { localToUTCWithSameTime, PatientDetailView } from '@/components/patients/PatientDetailView'
-import { PropertyList } from '@/components/PropertyList'
-import { ErrorDialog } from '@/components/ErrorDialog'
-import { useAtomicMutation } from '@/hooks/useAtomicMutation'
-import { fetcher } from '@/api/gql/fetcher'
-import { UserInfoPopup } from '@/components/UserInfoPopup'
-import clsx from 'clsx'
+import { PropertyList, type PropertyValue } from '@/components/tables/PropertyList'
+import { TaskDataEditor } from './TaskDataEditor'
+import { useOptimisticUpdateTaskMutation } from '@/api/optimistic-updates/GetTask'
 
 interface TaskDetailViewProps {
   taskId: string | null,
@@ -58,43 +22,12 @@ interface TaskDetailViewProps {
   initialPatientId?: string,
 }
 
-const getPriorityCheckboxColor = (priority: TaskPriority | null | undefined): string => {
-  if (!priority) return ''
-  switch (priority) {
-    case 'P1':
-      return 'border-green-500 text-green-500 checked:bg-green-500'
-    case 'P2':
-      return 'border-blue-500 text-blue-500 checked:bg-blue-500'
-    case 'P3':
-      return 'border-orange-500 text-orange-500 checked:bg-orange-500'
-    case 'P4':
-      return 'border-red-500 text-red-500 checked:bg-red-500'
-    default:
-      return ''
-  }
-}
-
 export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }: TaskDetailViewProps) => {
   const translation = useTasksTranslation()
-  const queryClient = useQueryClient()
-  const { selectedRootLocationIds } = useTasksContext()
-  const [isShowingPatientDialog, setIsShowingPatientDialog] = useState<boolean>(false)
-  const [errorDialog, setErrorDialog] = useState<{ isOpen: boolean, message?: string }>({ isOpen: false })
-  const [selectedUserPopupId, setSelectedUserPopupId] = useState<string | null>(null)
-  const isEditMode = !!taskId
-
-  const handleUserInfoClick = (userId: string) => {
-    setSelectedUserPopupId(userId)
-  }
 
-  const handleCloseUserInfoPopup = () => {
-    setSelectedUserPopupId(null)
-  }
-
-  const [titleError, setTitleError] = useState<string | null>(null)
-  const [patientIdError, setPatientIdError] = useState<string | null>(null)
+  const isEditMode = !!taskId
 
-  const { data: taskData, isLoading: isLoadingTask } = useGetTaskQuery(
+  const { data: taskData } = useGetTaskQuery(
     { id: taskId! },
     {
       enabled: isEditMode,
@@ -102,22 +35,15 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     }
   )
 
-  const { data: patientsData } = useGetPatientsQuery(
-    {
-      rootLocationIds: selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined,
-      states: [PatientState.Admitted, PatientState.Wait],
-    },
-    {
-      enabled: !isEditMode,
-    }
-  )
-
-  const { data: usersData } = useGetUsersQuery(undefined, {})
-  const { data: locationsData } = useGetLocationsQuery(undefined, {})
-
-
   const { data: propertyDefinitionsData } = useGetPropertyDefinitionsQuery()
 
+  const { mutate: updateTask } = useOptimisticUpdateTaskMutation({
+    id: taskId!,
+    onSuccess: () => {
+      onSuccess()
+    },
+  })
+
   const hasAvailableProperties = useMemo(() => {
     if (!propertyDefinitionsData?.propertyDefinitions) return false
     return propertyDefinitionsData.propertyDefinitions.some(
@@ -125,701 +51,90 @@ export const TaskDetailView = ({ taskId, onClose, onSuccess, initialPatientId }:
     )
   }, [propertyDefinitionsData])
 
-  const { mutate: createTask, isLoading: isCreating } = useCreateTaskMutation({
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      await queryClient.invalidateQueries({ queryKey: ['GetOverviewData'] })
-      onSuccess()
-      onClose()
-    },
-    onError: (error) => {
-      setErrorDialog({ isOpen: true, message: error instanceof Error ? error.message : 'Failed to create task' })
-    },
-  })
-
-  const { updateField, flush } = useAtomicMutation<UpdateTaskMutation, { id: string, data: UpdateTaskInput }>({
-    mutationFn: async (variables) => {
-      return fetcher<UpdateTaskMutation, UpdateTaskMutationVariables>(
-        UpdateTaskDocument,
-        variables
-      )()
-    },
-    queryKey: ['GetTask', { id: taskId }],
-    timeoutMs: 3000,
-    immediateFields: ['assigneeId', 'assigneeTeamId'] as unknown as (keyof { id: string, data: UpdateTaskInput })[],
-    onChangeFields: ['priority', 'done'] as unknown as (keyof { id: string, data: UpdateTaskInput })[],
-    onBlurFields: ['title', 'description'] as unknown as (keyof { id: string, data: UpdateTaskInput })[],
-    onCloseFields: ['dueDate'] as unknown as (keyof { id: string, data: UpdateTaskInput })[],
-    getChecksum: (data) => data?.updateTask?.checksum || null,
-    invalidateQueries: [['GetTask', { id: taskId }], ['GetTasks'], ['GetPatients'], ['GetOverviewData'], ['GetGlobalData']],
-  })
-
-  const { mutate: assignTask } = useAssignTaskMutation({
-    onMutate: async (variables) => {
-      if (!taskId) return
-      await queryClient.cancelQueries({ queryKey: ['GetTask', { id: taskId }] })
-      const previousData = queryClient.getQueryData<GetTaskQuery>(['GetTask', { id: taskId }])
-      const user = usersData?.users?.find(u => u.id === variables.userId)
-      if (previousData?.task && user) {
-        queryClient.setQueryData<GetTaskQuery>(['GetTask', { id: taskId }], {
-          ...previousData,
-          task: {
-            ...previousData.task,
-            assignee: {
-              __typename: 'UserType' as const,
-              id: user.id,
-              name: user.name,
-              avatarUrl: user.avatarUrl,
-              lastOnline: user.lastOnline,
-              isOnline: user.isOnline ?? false,
-            },
-            assigneeTeam: null,
-          },
-        })
-      }
-      return { previousData }
-    },
-    onError: (_error, _variables, context) => {
-      if (context?.previousData && taskId) {
-        queryClient.setQueryData(['GetTask', { id: taskId }], context.previousData)
-      }
-    },
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-    },
-  })
-
-  const { mutate: unassignTask } = useUnassignTaskMutation({
-    onMutate: async () => {
-      if (!taskId) return
-      await queryClient.cancelQueries({ queryKey: ['GetTask', { id: taskId }] })
-      const previousData = queryClient.getQueryData<GetTaskQuery>(['GetTask', { id: taskId }])
-      if (previousData?.task) {
-        queryClient.setQueryData<GetTaskQuery>(['GetTask', { id: taskId }], {
-          ...previousData,
-          task: {
-            ...previousData.task,
-            assignee: null,
-            assigneeTeam: null,
-          },
-        })
-      }
-      return { previousData }
-    },
-    onError: (_error, _variables, context) => {
-      if (context?.previousData && taskId) {
-        queryClient.setQueryData(['GetTask', { id: taskId }], context.previousData)
-      }
-    },
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-    },
-  })
-
-  const { mutate: assignTaskToTeam } = useAssignTaskToTeamMutation({
-    onMutate: async (variables) => {
-      if (!taskId) return
-      await queryClient.cancelQueries({ queryKey: ['GetTask', { id: taskId }] })
-      const previousData = queryClient.getQueryData<GetTaskQuery>(['GetTask', { id: taskId }])
-      const team = locationsData?.locationNodes?.find(loc => loc.id === variables.teamId && loc.kind === 'TEAM')
-      if (previousData?.task && team) {
-        queryClient.setQueryData<GetTaskQuery>(['GetTask', { id: taskId }], {
-          ...previousData,
-          task: {
-            ...previousData.task,
-            assignee: null,
-            assigneeTeam: {
-              __typename: 'LocationNodeType' as const,
-              id: team.id,
-              title: team.title,
-              kind: team.kind,
-            },
-          },
-        })
-      }
-      return { previousData }
-    },
-    onError: (_error, _variables, context) => {
-      if (context?.previousData && taskId) {
-        queryClient.setQueryData(['GetTask', { id: taskId }], context.previousData)
-      }
-    },
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-    },
-  })
-
-  const { mutate: unassignTaskFromTeam } = useUnassignTaskFromTeamMutation({
-    onMutate: async () => {
-      if (!taskId) return
-      await queryClient.cancelQueries({ queryKey: ['GetTask', { id: taskId }] })
-      const previousData = queryClient.getQueryData<GetTaskQuery>(['GetTask', { id: taskId }])
-      if (previousData?.task) {
-        queryClient.setQueryData<GetTaskQuery>(['GetTask', { id: taskId }], {
-          ...previousData,
-          task: {
-            ...previousData.task,
-            assignee: null,
-            assigneeTeam: null,
-          },
-        })
-      }
-      return { previousData }
-    },
-    onError: (_error, _variables, context) => {
-      if (context?.previousData && taskId) {
-        queryClient.setQueryData(['GetTask', { id: taskId }], context.previousData)
-      }
-    },
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-    },
-  })
-
-  const { mutate: completeTask } = useCompleteTaskMutation({
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetTask', { id: taskId }] })
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      await queryClient.invalidateQueries({ queryKey: ['GetOverviewData'] })
-      const patientId = taskData?.task?.patient?.id
-      if (patientId) {
-        await queryClient.invalidateQueries({ queryKey: ['GetPatient', { id: patientId }] })
-      }
-      onSuccess()
-    },
-  })
-
-  const { mutate: reopenTask } = useReopenTaskMutation({
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetTask', { id: taskId }] })
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      await queryClient.invalidateQueries({ queryKey: ['GetOverviewData'] })
-      const patientId = taskData?.task?.patient?.id
-      if (patientId) {
-        await queryClient.invalidateQueries({ queryKey: ['GetPatient', { id: patientId }] })
-      }
-      onSuccess()
-    },
-  })
-
-  const { mutate: deleteTask, isLoading: isDeleting } = useDeleteTaskMutation({
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ['GetGlobalData'] })
-      onSuccess()
-      onClose()
-    },
-  })
-
-  const [formData, setFormData] = useState<Partial<CreateTaskInput & { done: boolean, assigneeTeamId?: string | null }>>({
-    title: '',
-    description: '',
-    patientId: initialPatientId || '',
-    assigneeId: null,
-    assigneeTeamId: null,
-    dueDate: null,
-    priority: null,
-    estimatedTime: null,
-    done: false,
-  })
-
-  useEffect(() => {
-    if (taskData?.task && isEditMode) {
-      const task = taskData.task
-      setFormData({
-        title: task.title,
-        description: task.description || '',
-        patientId: task.patient?.id || '',
-        assigneeId: task.assignee?.id || null,
-        assigneeTeamId: task.assigneeTeam?.id || null,
-        dueDate: task.dueDate ? new Date(task.dueDate) : null,
-        priority: (task.priority as TaskPriority | null) || null,
-        estimatedTime: task.estimatedTime ?? null,
-        done: task.done || false,
-      })
-    } else if (initialPatientId && !taskId) {
-      setFormData(prev => ({ ...prev, patientId: initialPatientId }))
-    }
-  }, [taskData?.task, isEditMode, initialPatientId, taskId])
-
-  useEffect(() => {
-    return () => {
-      if (isEditMode) {
-        flush()
-      }
-    }
-  }, [isEditMode, flush])
-
-  const updateLocalState = (updates: Partial<CreateTaskInput & { done: boolean, assigneeTeamId?: string | null }>) => {
-    setFormData(prev => ({ ...prev, ...updates }))
-  }
-
-  const validateTitle = (value: string): boolean => {
-    if (!value || !value.trim()) {
-      setTitleError(translation('taskTitlePlaceholder') + ' is required')
-      return false
-    }
-    setTitleError(null)
-    return true
-  }
-
-  const validatePatientId = (value: string | null | undefined): boolean => {
-    if (!value || !value.trim()) {
-      setPatientIdError(translation('patient') + ' is required')
-      return false
+  const convertPropertyValueToInput = useCallback((definitionId: string, value: PropertyValue | null): PropertyValueInput | null => {
+    if (!value) return null
+    return {
+      definitionId,
+      textValue: value.textValue ?? undefined,
+      numberValue: value.numberValue ?? undefined,
+      booleanValue: value.boolValue ?? undefined,
+      dateValue: value.dateValue?.toISOString().split('T')[0] ?? undefined,
+      dateTimeValue: value.dateTimeValue?.toISOString() ?? undefined,
+      selectValue: value.singleSelectValue ?? undefined,
+      multiSelectValues: value.multiSelectValue ?? undefined,
     }
-    setPatientIdError(null)
-    return true
-  }
-
-  const isFormValid = useMemo(() => {
-    if (isEditMode) return true
-    const titleValid = formData.title?.trim() || false
-    const patientIdValid = !!formData.patientId
-    return titleValid && patientIdValid
-  }, [formData.title, formData.patientId, isEditMode])
-
-  const handleFieldUpdate = (updates: Partial<UpdateTaskInput>, triggerType?: 'onChange' | 'onBlur' | 'onClose') => {
-    if (!isEditMode || !taskId) return
-    updateField({ id: taskId, data: updates }, triggerType)
-  }
-
-  const handleAssigneeChange = (value: string) => {
-    if (value === 'unassigned') {
-      updateLocalState({ assigneeId: null, assigneeTeamId: null })
-      if (isEditMode && taskId) {
-        if (taskData?.task?.assigneeTeam) {
-          unassignTaskFromTeam({ id: taskId })
-        } else {
-          unassignTask({ id: taskId })
-        }
+  }, [])
+
+  const handlePropertyValueChange = useCallback((definitionId: string, value: PropertyValue | null) => {
+    if (!isEditMode || !taskId || !taskData?.task) return
+
+    const currentProperties = taskData.task.properties || []
+    const propertyInputs: PropertyValueInput[] = []
+
+    // Add all existing properties except the one being changed
+    for (const prop of currentProperties) {
+      if (prop.definition.id !== definitionId) {
+        propertyInputs.push({
+          definitionId: prop.definition.id,
+          textValue: prop.textValue ?? undefined,
+          numberValue: prop.numberValue ?? undefined,
+          booleanValue: prop.booleanValue ?? undefined,
+          dateValue: prop.dateValue ?? undefined,
+          dateTimeValue: prop.dateTimeValue ?? undefined,
+          selectValue: prop.selectValue ?? undefined,
+          multiSelectValues: prop.multiSelectValues ?? undefined,
+        })
       }
-      return
     }
 
-    const isTeam = value.startsWith('team:')
-    const assigneeId = isTeam ? value.replace('team:', '') : value
-
-    if (isTeam) {
-      updateLocalState({ assigneeId: null, assigneeTeamId: assigneeId })
-      if (isEditMode && taskId) {
-        assignTaskToTeam({ id: taskId, teamId: assigneeId })
-      }
-    } else {
-      updateLocalState({ assigneeId, assigneeTeamId: null })
-      if (isEditMode && taskId) {
-        assignTask({ id: taskId, userId: assigneeId })
+    // Add the changed property if it's not null
+    if (value !== null) {
+      const newPropertyInput = convertPropertyValueToInput(definitionId, value)
+      if (newPropertyInput) {
+        propertyInputs.push(newPropertyInput)
       }
     }
-  }
 
-  const handleSubmit = () => {
-    const titleValid = validateTitle(formData.title || '')
-    const patientIdValid = validatePatientId(formData.patientId)
-
-    if (!titleValid || !patientIdValid) {
-      return
-    }
-
-    createTask({
+    updateTask({
+      id: taskId,
       data: {
-        title: formData.title,
-        patientId: formData.patientId,
-        description: formData.description,
-        assigneeId: formData.assigneeId,
-        assigneeTeamId: formData.assigneeTeamId,
-        dueDate: formData.dueDate ? localToUTCWithSameTime(formData.dueDate)?.toISOString() : null,
-        priority: (formData.priority as TaskPriority | null) || undefined,
-        estimatedTime: formData.estimatedTime,
-        properties: formData.properties
-      } as CreateTaskInput & { priority?: TaskPriority | null, estimatedTime?: number | null }
+        properties: propertyInputs,
+      },
     })
-  }
-
-  const patients = patientsData?.patients || []
+  }, [isEditMode, taskId, taskData?.task, convertPropertyValueToInput, updateTask])
 
-  const expectedFinishDate = useMemo(() => {
-    if (!formData.dueDate || !formData.estimatedTime) return null
-    const finishDate = new Date(formData.dueDate)
-    finishDate.setMinutes(finishDate.getMinutes() + formData.estimatedTime)
-    return finishDate
-  }, [formData.dueDate, formData.estimatedTime])
-
-  if (isEditMode && isLoadingTask) {
-    return <LoadingContainer/>
-  }
 
   return (
-    <div className="flex flex-col h-full bg-surface">
-      <div className="flex-grow overflow-hidden flex flex-col">
-        <TabView className="h-full flex flex-col">
-          <Tab label={translation('overview')} className="h-full overflow-y-auto pr-2">
-            <div className="flex flex-col gap-6 pt-4 pb-24">
-              <div className="flex items-center gap-3 ml-4">
-                {isEditMode && (
-                  <Checkbox
-                    id="task-done"
-                    checked={formData.done || false}
-                    onCheckedChange={(checked) => {
-                      if (!taskId) return
-                      updateLocalState({ done: checked })
-                      if (checked) {
-                        completeTask({ id: taskId })
-                      } else {
-                        reopenTask({ id: taskId })
-                      }
-                    }}
-                    className={clsx('rounded-full scale-125', getPriorityCheckboxColor(formData.priority as TaskPriority | null | undefined))}
-                  />
-                )}
-                <div className="flex-1">
-                  <FormElementWrapper
-                    label=""
-                    error={titleError || undefined}
-                    isShowingError={!!titleError}
-                  >
-                    {({ isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => (
-                      <Input
-                        {...bag}
-                        id="task-title"
-                        name="task-title"
-                        value={formData.title || ''}
-                        placeholder={translation('taskTitlePlaceholder')}
-                        required
-                        onChange={e => {
-                          updateLocalState({ title: e.target.value })
-                          if (isShowingError) {
-                            validateTitle(e.target.value)
-                          }
-                        }}
-                        onBlur={() => {
-                          if (!isEditMode) {
-                            validateTitle(formData.title || '')
-                          } else if (taskId) {
-                            handleFieldUpdate({ title: formData.title }, 'onBlur')
-                          }
-                        }}
-                        className="flex-1 text-lg py-3"
-                      />
-                    )}
-                  </FormElementWrapper>
-                </div>
-              </div>
-
-              <FormElementWrapper
-                label={translation('patient')}
-                error={patientIdError || undefined}
-                isShowingError={!!patientIdError}
-              >
-                {({ isShowingError: _isShowingError, setIsShowingError: _setIsShowingError, ...bag }) => {
-                  return (!isEditMode) ? (
-                    <Select
-                      {...bag}
-                      value={formData.patientId}
-                      onValueChanged={(value) => {
-                        updateLocalState({ patientId: value })
-                        validatePatientId(value)
-                      }}
-                      disabled={isEditMode}
-                    >
-                      {patients.map(patient => {
-                        return (
-                          <SelectOption key={patient.id} value={patient.id}>
-                            {patient.name}
-                          </SelectOption>
-                        )
-                      })}
-                    </Select>
-                  ) : (
-                    <div id={bag.id}>
-                      <Button
-                        color="neutral"
-                        onClick={() => setIsShowingPatientDialog(true)}
-                        className="w-fit"
-                      >
-                        <User className="size-4"/>
-                        { taskData?.task?.patient?.name}
-                      </Button>
-                    </div>
-                  )
-                }}
-              </FormElementWrapper>
-
-              <FormElementWrapper label={translation('assignedTo')}>
-                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => {
-                  const currentAssigneeValue = taskData?.task?.assigneeTeam?.id
-                    ? `team:${taskData.task.assigneeTeam.id}`
-                    : (formData.assigneeId || taskData?.task?.assignee?.id || 'unassigned')
-                  return (
-                    <AssigneeSelect
-                      {...bag}
-                      value={currentAssigneeValue}
-                      onValueChanged={handleAssigneeChange}
-                      allowTeams={true}
-                      allowUnassigned={true}
-                      onUserInfoClick={handleUserInfoClick}
-                    />
-                  )
-                }}
-              </FormElementWrapper>
-
-              <FormElementWrapper label={translation('dueDate')}>
-                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
-                  <DateTimeInput
-                    {...bag}
-                    date={formData.dueDate ? new Date(formData.dueDate) : undefined}
-                    mode="dateTime"
-                    onValueChange={(date) => {
-                      updateLocalState({ dueDate: date })
-                    }}
-                    onEditCompleted={(date) => {
-                      updateLocalState({ dueDate: date })
-                      if (isEditMode && taskId) {
-                        handleFieldUpdate({ dueDate: date ? localToUTCWithSameTime(date)?.toISOString() : null }, 'onClose')
-                      }
-                    }}
-                    onRemove={() => {
-                      updateLocalState({ dueDate: null })
-                      if (isEditMode && taskId) {
-                        handleFieldUpdate({ dueDate: null }, 'onClose')
-                      }
-                    }}
-                  />
-                )}
-              </FormElementWrapper>
-
-              <FormElementWrapper label={translation('priorityLabel') ?? 'Priority'}>
-                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => {
-                  const getPriorityDotColor = (priority: string | null | undefined): string => {
-                    if (!priority) return ''
-                    switch (priority) {
-                      case 'P1':
-                        return 'bg-green-500'
-                      case 'P2':
-                        return 'bg-blue-500'
-                      case 'P3':
-                        return 'bg-orange-500'
-                      case 'P4':
-                        return 'bg-red-500'
-                      default:
-                        return ''
-                    }
-                  }
-                  return (
-                    <Select
-                      {...bag}
-                      value={formData.priority || 'none'}
-                      onValueChanged={(value) => {
-                        const priorityValue = value === 'none' ? null : (value as TaskPriority)
-                        updateLocalState({ priority: priorityValue })
-                        if (isEditMode && taskId) {
-                          handleFieldUpdate({ priority: priorityValue }, 'onChange')
-                        }
-                      }}
-                    >
-                      <SelectOption value="none">{translation('priorityNone')}</SelectOption>
-                      <SelectOption value="P1">
-                        <div className="flex items-center gap-2">
-                          <span className={`w-2 h-2 rounded-full ${getPriorityDotColor('P1')}`} />
-                          <span>{translation('priority', { priority: 'P1' })}</span>
-                        </div>
-                      </SelectOption>
-                      <SelectOption value="P2">
-                        <div className="flex items-center gap-2">
-                          <span className={`w-2 h-2 rounded-full ${getPriorityDotColor('P2')}`} />
-                          <span>{translation('priority', { priority: 'P2' })}</span>
-                        </div>
-                      </SelectOption>
-                      <SelectOption value="P3">
-                        <div className="flex items-center gap-2">
-                          <span className={`w-2 h-2 rounded-full ${getPriorityDotColor('P3')}`} />
-                          <span>{translation('priority', { priority: 'P3' })}</span>
-                        </div>
-                      </SelectOption>
-                      <SelectOption value="P4">
-                        <div className="flex items-center gap-2">
-                          <span className={`w-2 h-2 rounded-full ${getPriorityDotColor('P4')}`} />
-                          <span>{translation('priority', { priority: 'P4' })}</span>
-                        </div>
-                      </SelectOption>
-                    </Select>
-                  )
-                }}
-              </FormElementWrapper>
-
-              <FormElementWrapper label={translation('estimatedTime') ?? 'Estimated Time (minutes)'}>
-                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
-                  <Input
-                    {...bag}
-                    type="number"
-                    min="0"
-                    step="1"
-                    value={formData.estimatedTime?.toString() || ''}
-                    placeholder="e.g. 30"
-                    onChange={(e) => {
-                      const value = e.target.value === '' ? null : parseInt(e.target.value, 10)
-                      updateLocalState({ estimatedTime: isNaN(value as number) ? null : value })
-                    }}
-                    onBlur={() => {
-                      if (isEditMode && taskId) {
-                        handleFieldUpdate({
-                          estimatedTime: formData.estimatedTime,
-                        })
-                      }
-                    }}
-                  />
-                )}
-              </FormElementWrapper>
-
-              {expectedFinishDate && (
-                <div className="flex items-center gap-2">
-                  <Flag className="size-4" />
-                  <SmartDate date={expectedFinishDate} mode="relative" showTime={true} />
-                </div>
-              )}
-
-              <FormElementWrapper label={translation('description')}>
-                {({ isShowingError: _1, setIsShowingError: _2, ...bag }) => (
-                  <Textarea
-                    {...bag}
-                    value={formData.description || ''}
-                    placeholder={translation('descriptionPlaceholder')}
-                    onChange={e => updateLocalState({ description: e.target.value })}
-                    onBlur={() => {
-                      if (isEditMode && taskId) {
-                        handleFieldUpdate({ description: formData.description }, 'onBlur')
-                      }
-                    }}
-                    minLength={4}
-                  />
-                )}
-              </FormElementWrapper>
-
-              {isEditMode && taskId && (
-                <div className="pt-6 mt-6 border-t border-divider flex justify-end gap-2">
-                  <LoadingButton
-                    onClick={() => {
-                      if (taskId) {
-                        deleteTask({ id: taskId })
-                      }
-                    }}
-                    isLoading={isDeleting}
-                    color="negative"
-                    coloringStyle="outline"
-                  >
-                    {translation('delete')}
-                  </LoadingButton>
-                </div>
-              )}
+    <div className="flex-grow overflow-hidden flex flex-col">
+      <TabSwitcher>
+        <TabList/>
+        <TabPanel label={translation('overview')} className="h-full overflow-y-auto px-1">
+          <TaskDataEditor
+            id={taskId}
+            initialPatientId={initialPatientId}
+            onSuccess={onSuccess}
+            onClose={onClose}
+          />
+        </TabPanel>
+        {isEditMode && hasAvailableProperties && (
+          <TabPanel label={translation('properties')} className="h-full overflow-y-auto pr-2">
+            <div className="flex flex-col gap-4 pt-4">
+              <PropertyList
+                subjectId={taskId!}
+                subjectType="task"
+                fullWidthAddButton={true}
+                propertyValues={taskData?.task?.properties?.map(p => ({
+                  ...p,
+                  definition: {
+                    ...p.definition,
+                  },
+                }))}
+                onPropertyValueChange={handlePropertyValueChange}
+              />
             </div>
-          </Tab>
-          {isEditMode && hasAvailableProperties && (
-            <Tab label={translation('properties')} className="h-full overflow-y-auto pr-2">
-              <div className="flex flex-col gap-4 pt-4">
-                <PropertyList
-                  subjectId={taskId!}
-                  subjectType="task"
-                  fullWidthAddButton={true}
-                  propertyValues={taskData?.task?.properties?.map(p => ({
-                    definition: {
-                      id: p.definition.id,
-                      name: p.definition.name,
-                      description: p.definition.description,
-                      fieldType: p.definition.fieldType,
-                      isActive: p.definition.isActive,
-                      allowedEntities: p.definition.allowedEntities,
-                      options: p.definition.options,
-                    },
-                    textValue: p.textValue,
-                    numberValue: p.numberValue,
-                    booleanValue: p.booleanValue,
-                    dateValue: p.dateValue,
-                    dateTimeValue: p.dateTimeValue,
-                    selectValue: p.selectValue,
-                    multiSelectValues: p.multiSelectValues,
-                  }))}
-                  onPropertyValueChange={(definitionId, value) => {
-                    if (!taskId) return
-
-                    const existingProperties = taskData?.task?.properties?.map(p => ({
-                      definitionId: p.definition.id,
-                      textValue: p.textValue,
-                      numberValue: p.numberValue,
-                      booleanValue: p.booleanValue,
-                      dateValue: p.dateValue,
-                      dateTimeValue: p.dateTimeValue,
-                      selectValue: p.selectValue,
-                      multiSelectValues: p.multiSelectValues,
-                    })) || []
-
-                    if (value === null) {
-                      const updatedProperties = existingProperties.filter(p => p.definitionId !== definitionId)
-                      handleFieldUpdate({ properties: updatedProperties })
-                      return
-                    }
-
-                    const propertyInput: PropertyValueInput = {
-                      definitionId,
-                      textValue: value.textValue !== undefined ? (value.textValue !== null && value.textValue.trim() !== '' ? value.textValue : '') : null,
-                      numberValue: value.numberValue ?? null,
-                      booleanValue: value.boolValue ?? null,
-                      dateValue: value.dateValue && !isNaN(value.dateValue.getTime()) ? value.dateValue.toISOString().split('T')[0] : null,
-                      dateTimeValue: value.dateTimeValue && !isNaN(value.dateTimeValue.getTime()) ? value.dateTimeValue.toISOString() : null,
-                      selectValue: value.singleSelectValue || null,
-                      multiSelectValues: (value.multiSelectValue && value.multiSelectValue.length > 0) ? value.multiSelectValue : null,
-                    }
-
-                    const updatedProperties = [
-                      ...existingProperties.filter(p => p.definitionId !== definitionId),
-                      propertyInput,
-                    ]
-
-                    handleFieldUpdate({ properties: updatedProperties })
-                  }}
-                />
-              </div>
-            </Tab>
-          )}
-        </TabView>
-      </div>
-
-      <SidePanel
-        isOpen={isShowingPatientDialog}
-        onClose={() => setIsShowingPatientDialog(false)}
-        title={translation('editPatient')}
-      >
-        <PatientDetailView
-          patientId={formData.patientId}
-          onClose={() => setIsShowingPatientDialog(false)}
-          onSuccess={onSuccess}
-        />
-      </SidePanel>
-
-      {!isEditMode && (
-        <div className="flex-none pt-4 mt-auto border-t border-divider flex justify-end gap-2">
-          <LoadingButton
-            onClick={handleSubmit}
-            isLoading={isCreating}
-            disabled={!isFormValid}
-          >
-            {translation('create')}
-          </LoadingButton>
-        </div>
-      )}
-
-      <ErrorDialog
-        isOpen={errorDialog.isOpen}
-        onClose={() => setErrorDialog({ isOpen: false })}
-        message={errorDialog.message}
-      />
-      <UserInfoPopup
-        userId={selectedUserPopupId}
-        isOpen={!!selectedUserPopupId}
-        onClose={handleCloseUserInfoPopup}
-      />
+          </TabPanel>
+        )}
+      </TabSwitcher>
     </div>
   )
 }
diff --git a/web/eslint.config.js b/web/eslint.config.js
index f141562b..3a0c9e58 100644
--- a/web/eslint.config.js
+++ b/web/eslint.config.js
@@ -8,6 +8,10 @@ export default [
       'next-env.d.ts',
     ],
   },
-
+  {
+    rules: {
+      indent: ['warn', 2],
+    },
+  },
   ...config.nextExtension,
 ]
diff --git a/web/globals.css b/web/globals.css
index 16347731..b9afde5d 100644
--- a/web/globals.css
+++ b/web/globals.css
@@ -1,263 +1,11 @@
 @import 'tailwindcss';
 
-@import "./style/colors.css";
 @import "@helpwave/hightide/style/uncompiled/globals.css";
+@import "./style/index.css";
 @source "./node_modules/@helpwave/hightide";
 
 @layer components {
   body {
     @apply w-screen max-w-screen h-screen max-h-screen overflow-hidden;
   }
-
-  *:focus-visible:focus-visible {
-    @apply focus-style-none;
-  }
-}
-
-@utility input-element {
-  @apply border-border;
-}
-
-@media print {
-  @page {
-    size: A4 landscape;
-    margin: 0;
-  }
-
-  * {
-    -webkit-print-color-adjust: exact !important;
-    print-color-adjust: exact !important;
-  }
-
-  html, body {
-    width: 100% !important;
-    height: auto !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-    max-height: none !important;
-    max-width: 100% !important;
-    background: white !important;
-    color: black !important;
-  }
-
-  html {
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-  }
-
-  body {
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-  }
-
-  .print-header {
-    display: none !important;
-  }
-
-  .print-content {
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    width: 100% !important;
-    max-width: 100% !important;
-    height: auto !important;
-    max-height: none !important;
-  }
-
-  .print-content > div[class*="overflow"] {
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    width: 100% !important;
-    max-width: 100% !important;
-    height: auto !important;
-    max-height: none !important;
-  }
-
-  .print-table {
-    width: 100% !important;
-    min-width: 0 !important;
-    max-width: 100% !important;
-    font-size: 0.55rem;
-    margin: 0 !important;
-    padding: 0 !important;
-    page-break-inside: auto;
-    height: auto !important;
-    max-height: none !important;
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-  }
-
-  [class*="min-w-"] {
-    min-width: 0 !important;
-  }
-
-  .print-table table {
-    width: 100% !important;
-    min-width: 0 !important;
-    max-width: 100% !important;
-    border-collapse: collapse;
-    border: 1px solid #000;
-    table-layout: fixed;
-    margin: 0 !important;
-    padding: 0 !important;
-    height: auto !important;
-    max-height: none !important;
-  }
-
-  .print-table table > * {
-    min-width: 0 !important;
-  }
-
-  .print-table table th,
-  .print-table table td {
-    min-width: 0 !important;
-    max-width: 100% !important;
-  }
-
-  .print-table thead {
-    display: table-header-group;
-  }
-
-  .print-table thead tr {
-    page-break-after: avoid;
-    break-after: avoid;
-  }
-
-  .print-table thead tr th {
-    font-size: 0.6rem;
-    padding: 0.25rem 0.3rem;
-    border: 1px solid #000;
-    text-align: left;
-    background-color: #f0f0f0 !important;
-    font-weight: bold;
-    position: sticky;
-    top: 0;
-    z-index: 1;
-    min-width: 0 !important;
-    max-width: 100% !important;
-  }
-
-  .print-table tbody {
-    display: table-row-group;
-  }
-
-  .print-table tbody tr {
-    page-break-inside: auto;
-    break-inside: auto;
-    display: table-row !important;
-  }
-
-  .print-table tbody tr:not([class*="FillerRow"]):not(:empty) {
-    display: table-row !important;
-  }
-
-  .print-table tbody tr td {
-    font-size: 0.55rem;
-    padding: 0.2rem 0.3rem;
-    border: 1px solid #000;
-    text-align: left;
-    background: white !important;
-    color: black !important;
-    word-wrap: break-word;
-    overflow-wrap: break-word;
-    hyphens: auto;
-    min-width: 0 !important;
-    max-width: 100% !important;
-  }
-
-  .print-table tbody tr:nth-child(even) td {
-    background-color: #f9f9f9 !important;
-  }
-
-  .print-content .grid {
-    display: none !important;
-  }
-
-  .print-button,
-  button,
-  [role="button"],
-  [role="dialog"],
-  [data-radix-portal],
-  input[type="search"],
-  [class*="SearchBar"],
-  [class*="Checkbox"],
-  [class*="Tooltip"] {
-    display: none !important;
-  }
-
-  .print-container {
-    height: auto !important;
-    max-height: none !important;
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-    width: 100% !important;
-    max-width: 100% !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    display: block !important;
-  }
-
-  .print-container > * {
-    overflow: hidden !important;
-    overflow-x: hidden !important;
-    overflow-y: hidden !important;
-    max-height: none !important;
-    max-width: 100% !important;
-  }
-
-  .print-container * {
-    box-shadow: none !important;
-    text-shadow: none !important;
-  }
-
-  a[href]:after {
-    content: "";
-  }
-
-  img {
-    max-width: 100% !important;
-    height: auto !important;
-  }
-
-  .print-content [class*="Chip"] {
-    border: 1px solid #000 !important;
-    background: white !important;
-    color: black !important;
-    font-size: 0.55rem;
-    padding: 0.1rem 0.25rem;
-    display: inline-block;
-  }
-
-  .print-content [class*="ProgressIndicator"] {
-    display: none !important;
-  }
-
-  .print-content [class*="Avatar"] {
-    display: none !important;
-  }
-
-  [class*="FillerRow"],
-  [class*="FillerRowElement"] {
-    display: none !important;
-  }
-
-  .print-table tbody tr:has(td:only-child) {
-    display: none !important;
-  }
-
-  .print-table tbody tr:empty {
-    display: none !important;
-  }
 }
\ No newline at end of file
diff --git a/web/hooks/useAtomicMutation.ts b/web/hooks/useAtomicMutation.ts
deleted file mode 100644
index 69a92246..00000000
--- a/web/hooks/useAtomicMutation.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import { useState, useCallback, useRef, useEffect } from 'react'
-import { useQueryClient } from '@tanstack/react-query'
-import type { SafeMutationOptions } from './useSafeMutation'
-import { useSafeMutation } from './useSafeMutation'
-
-export interface AtomicMutationOptions<TData, TVariables> extends Omit<SafeMutationOptions<TData, TVariables, unknown>, 'mutationFn' | 'onMutate' | 'onSuccess' | 'onError'> {
-  mutationFn: (variables: TVariables) => Promise<TData>,
-  timeoutMs?: number,
-  immediateFields?: (keyof TVariables)[],
-  onChangeFields?: (keyof TVariables)[],
-  onBlurFields?: (keyof TVariables)[],
-  onCloseFields?: (keyof TVariables)[],
-  getChecksum?: (data: TData) => string | null | undefined,
-  optimisticUpdate?: (variables: TVariables) => {
-    queryKey: unknown[],
-    updateFn: (oldData: unknown) => unknown,
-  }[],
-}
-
-export function useAtomicMutation<TData, TVariables extends Record<string, unknown>>({
-  mutationFn,
-  timeoutMs = 3000,
-  immediateFields = [],
-  onChangeFields = [],
-  onBlurFields = [],
-  onCloseFields = [],
-  getChecksum,
-  ...safeMutationOptions
-}: AtomicMutationOptions<TData, TVariables>) {
-  const queryClient = useQueryClient()
-  const [pendingUpdates, setPendingUpdates] = useState<Partial<TVariables>>({})
-  const timeoutRef = useRef<NodeJS.Timeout | null>(null)
-  const pendingUpdatesRef = useRef<Partial<TVariables>>({})
-
-  const { mutate, isLoading } = useSafeMutation({
-    ...safeMutationOptions,
-    optimisticUpdate: safeMutationOptions.optimisticUpdate,
-    mutationFn: async (variables: TVariables) => {
-      const currentData = queryClient.getQueryData<TData>(safeMutationOptions.queryKey || [])
-      const checksum = currentData && getChecksum ? getChecksum(currentData) : undefined
-
-      let variablesWithChecksum = { ...variables }
-
-      if (checksum && 'data' in variablesWithChecksum && variablesWithChecksum['data'] && typeof variablesWithChecksum['data'] === 'object' && !Array.isArray(variablesWithChecksum['data'])) {
-        variablesWithChecksum = {
-          ...variablesWithChecksum,
-          ['data']: { ...variablesWithChecksum['data'] as Record<string, unknown>, checksum } as TVariables['data']
-        } as TVariables
-      }
-
-      return mutationFn(variablesWithChecksum)
-    },
-  })
-
-  const executeMutation = useCallback((updates: Partial<TVariables>) => {
-    if (Object.keys(updates).length === 0) {
-      return
-    }
-
-    const mutationVariables = { ...updates } as TVariables
-    const dataKey = 'data' as keyof TVariables
-    if (dataKey in mutationVariables && mutationVariables[dataKey] && typeof mutationVariables[dataKey] === 'object' && !Array.isArray(mutationVariables[dataKey])) {
-      const dataObj = mutationVariables[dataKey] as Record<string, unknown>
-      if (Object.keys(dataObj).length === 0) {
-        return
-      }
-    }
-
-    const idKey = 'id' as keyof TVariables
-    if (!(idKey in mutationVariables) || !mutationVariables[idKey]) {
-      if (safeMutationOptions.queryKey && safeMutationOptions.queryKey[1] && typeof safeMutationOptions.queryKey[1] === 'object' && 'id' in safeMutationOptions.queryKey[1]) {
-        (mutationVariables as Record<string, unknown>)['id'] = (safeMutationOptions.queryKey[1] as { id: string }).id
-      }
-    }
-
-    if (!(dataKey in mutationVariables) || !mutationVariables[dataKey]) {
-      return
-    }
-
-    mutate(mutationVariables)
-  }, [mutate, safeMutationOptions.queryKey])
-
-  const updateField = useCallback((updates: Partial<TVariables>, triggerType?: 'onChange' | 'onBlur' | 'onClose') => {
-    const mergedPending: Record<string, unknown> = { ...pendingUpdatesRef.current as Record<string, unknown> }
-
-    for (const [key, value] of Object.entries(updates)) {
-      if (key === 'data' && 'data' in mergedPending && mergedPending['data'] && typeof mergedPending['data'] === 'object' && value && typeof value === 'object' && !Array.isArray(value) && !Array.isArray(mergedPending['data'])) {
-        mergedPending['data'] = { ...(mergedPending['data'] as Record<string, unknown>), ...(value as Record<string, unknown>) }
-      } else {
-        mergedPending[key] = value
-      }
-    }
-
-    pendingUpdatesRef.current = mergedPending as Partial<TVariables>
-    setPendingUpdates(mergedPending as Partial<TVariables>)
-
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current)
-    }
-
-    const checkHasImmediateField = (updatesToCheck: Partial<TVariables>, fieldsToCheck: (keyof TVariables)[]): boolean => {
-      if ('data' in updatesToCheck && updatesToCheck['data'] && typeof updatesToCheck['data'] === 'object' && !Array.isArray(updatesToCheck['data'])) {
-        const dataObj = updatesToCheck['data'] as Record<string, unknown>
-        return Object.keys(dataObj).some(dataKey => fieldsToCheck.includes(dataKey as keyof TVariables))
-      }
-      return Object.keys(updatesToCheck).some(key => fieldsToCheck.includes(key as keyof TVariables))
-    }
-
-    const allImmediateFields = [...immediateFields, ...onChangeFields]
-    const hasImmediateFields = checkHasImmediateField(updates, allImmediateFields)
-
-    if (triggerType === 'onChange' && onChangeFields.length > 0) {
-      const hasOnChangeFields = checkHasImmediateField(updates, onChangeFields)
-      if (hasOnChangeFields) {
-        executeMutation(mergedPending as Partial<TVariables>)
-        pendingUpdatesRef.current = {} as Partial<TVariables>
-        setPendingUpdates({})
-        return
-      }
-    }
-
-    if (triggerType === 'onBlur' && onBlurFields.length > 0) {
-      const hasOnBlurFields = checkHasImmediateField(updates, onBlurFields)
-      if (hasOnBlurFields) {
-        executeMutation(mergedPending as Partial<TVariables>)
-        pendingUpdatesRef.current = {} as Partial<TVariables>
-        setPendingUpdates({})
-        return
-      }
-    }
-
-    if (triggerType === 'onClose' && onCloseFields.length > 0) {
-      const hasOnCloseFields = checkHasImmediateField(updates, onCloseFields)
-      if (hasOnCloseFields) {
-        executeMutation(mergedPending as Partial<TVariables>)
-        pendingUpdatesRef.current = {} as Partial<TVariables>
-        setPendingUpdates({})
-        return
-      }
-    }
-
-    if (hasImmediateFields) {
-      const immediateUpdates: Partial<TVariables> = {}
-      const delayedUpdates: Partial<TVariables> = {}
-
-      for (const [key, value] of Object.entries(updates)) {
-        if (key === 'data' && value && typeof value === 'object' && !Array.isArray(value)) {
-          const immediateData: Record<string, unknown> = {}
-          const delayedData: Record<string, unknown> = {}
-          const currentPending = pendingUpdatesRef.current as Record<string, unknown>
-          const currentData = ('data' in currentPending && currentPending['data'] ? currentPending['data'] as Record<string, unknown> : {}) || {}
-
-          for (const [dataKey, dataValue] of Object.entries(value as Record<string, unknown>)) {
-            if (allImmediateFields.includes(dataKey as keyof TVariables)) {
-              immediateData[dataKey] = dataValue
-            } else {
-              delayedData[dataKey] = dataValue
-            }
-          }
-
-          if (Object.keys(immediateData).length > 0) {
-            (immediateUpdates as Record<string, unknown>)['data'] = { ...currentData, ...immediateData }
-          }
-          if (Object.keys(delayedData).length > 0) {
-            (delayedUpdates as Record<string, unknown>)['data'] = { ...currentData, ...delayedData }
-          }
-        } else if (allImmediateFields.includes(key as keyof TVariables)) {
-          (immediateUpdates as Record<string, unknown>)[key] = value
-        } else {
-          (delayedUpdates as Record<string, unknown>)[key] = value
-        }
-      }
-
-      if (Object.keys(immediateUpdates).length > 0) {
-        const mergedImmediate: Record<string, unknown> = { ...pendingUpdatesRef.current as Record<string, unknown> }
-        for (const [key, value] of Object.entries(immediateUpdates)) {
-          if (key === 'data' && 'data' in mergedImmediate && mergedImmediate['data'] && typeof mergedImmediate['data'] === 'object' && !Array.isArray(mergedImmediate['data']) && value && typeof value === 'object' && !Array.isArray(value)) {
-            mergedImmediate['data'] = { ...(mergedImmediate['data'] as Record<string, unknown>), ...(value as Record<string, unknown>) }
-          } else {
-            mergedImmediate[key] = value
-          }
-        }
-        executeMutation(mergedImmediate as Partial<TVariables>)
-
-        const remainingDelayed: Record<string, unknown> = { ...delayedUpdates as Record<string, unknown> }
-        if ('id' in mergedImmediate && mergedImmediate['id']) {
-          remainingDelayed['id'] = mergedImmediate['id']
-        }
-        pendingUpdatesRef.current = remainingDelayed as Partial<TVariables>
-        setPendingUpdates(remainingDelayed as Partial<TVariables>)
-      }
-
-      if (Object.keys(delayedUpdates).length > 0) {
-        timeoutRef.current = setTimeout(() => {
-          const mergedDelayed: Record<string, unknown> = { ...pendingUpdatesRef.current as Record<string, unknown> }
-          for (const [key, value] of Object.entries(delayedUpdates)) {
-            if (key === 'data' && 'data' in mergedDelayed && mergedDelayed['data'] && typeof mergedDelayed['data'] === 'object' && !Array.isArray(mergedDelayed['data']) && value && typeof value === 'object' && !Array.isArray(value)) {
-              mergedDelayed['data'] = { ...(mergedDelayed['data'] as Record<string, unknown>), ...(value as Record<string, unknown>) }
-            } else {
-              mergedDelayed[key] = value
-            }
-          }
-          executeMutation(mergedDelayed as Partial<TVariables>)
-          pendingUpdatesRef.current = {} as Partial<TVariables>
-          setPendingUpdates({})
-        }, timeoutMs)
-      }
-    } else {
-      timeoutRef.current = setTimeout(() => {
-        executeMutation(pendingUpdatesRef.current)
-        pendingUpdatesRef.current = {} as Partial<TVariables>
-        setPendingUpdates({})
-      }, timeoutMs)
-    }
-  }, [executeMutation, timeoutMs, immediateFields, onChangeFields, onBlurFields, onCloseFields])
-
-  useEffect(() => {
-    return () => {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current)
-      }
-    }
-  }, [])
-
-  const flush = useCallback(() => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current)
-    }
-    if (Object.keys(pendingUpdatesRef.current).length > 0) {
-      executeMutation(pendingUpdatesRef.current)
-      pendingUpdatesRef.current = {}
-      setPendingUpdates({})
-    }
-  }, [executeMutation])
-
-  return {
-    updateField,
-    flush,
-    isUpdating: isLoading,
-    pendingUpdates,
-  }
-}
-
diff --git a/web/hooks/useAuth.tsx b/web/hooks/useAuth.tsx
index 1a341b1a..640740b5 100644
--- a/web/hooks/useAuth.tsx
+++ b/web/hooks/useAuth.tsx
@@ -31,10 +31,10 @@ type AuthProviderProps = PropsWithChildren & {
 }
 
 export const AuthProvider = ({
-                               children,
-                               unprotectedURLs = [],
-                               ignoredURLs = []
-                             }: AuthProviderProps) => {
+  children,
+  unprotectedURLs = [],
+  ignoredURLs = []
+}: AuthProviderProps) => {
   const [authState, setAuthState] = useState<AuthState>({ isLoading: true })
   const { isLoading, identity } = authState
 
diff --git a/web/hooks/useFormFieldMutation.ts b/web/hooks/useFormFieldMutation.ts
deleted file mode 100644
index 390edd2c..00000000
--- a/web/hooks/useFormFieldMutation.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useQueryClient } from '@tanstack/react-query'
-import { useSafeMutation } from './useSafeMutation'
-import type { SafeMutationOptions } from './useSafeMutation'
-
-export interface FormFieldMutationOptions<TData, TVariables> extends Omit<SafeMutationOptions<TData, TVariables, { previousData?: TData }>, 'mutationFn' | 'onMutate'> {
-  mutationFn: (variables: TVariables) => Promise<TData>,
-  queryKey: unknown[],
-  getOptimisticUpdate?: (variables: TVariables) => (oldData: TData | undefined) => TData | undefined,
-}
-
-export function useFormFieldMutation<TData, TVariables extends Record<string, unknown>>({
-  mutationFn,
-  queryKey,
-  getOptimisticUpdate,
-  ...safeMutationOptions
-}: FormFieldMutationOptions<TData, TVariables>) {
-  const queryClient = useQueryClient()
-
-  return useSafeMutation<TData, TVariables, { previousData?: TData }>({
-    ...safeMutationOptions,
-    mutationFn,
-    queryKey,
-    onMutate: async (variables) => {
-      if (getOptimisticUpdate) {
-        const optimisticUpdate = getOptimisticUpdate(variables)
-        await queryClient.cancelQueries({ queryKey })
-        const previousData = queryClient.getQueryData<TData>(queryKey)
-        const optimisticData = optimisticUpdate(previousData)
-        if (optimisticData !== undefined) {
-          queryClient.setQueryData(queryKey, optimisticData)
-        }
-        return { previousData }
-      }
-      return { previousData: undefined }
-    },
-    onError: async (error, variables, context) => {
-      if (context?.previousData !== undefined) {
-        queryClient.setQueryData(queryKey, context.previousData)
-      }
-      if (safeMutationOptions.onError) {
-        await safeMutationOptions.onError(error, variables, context)
-      }
-    },
-  })
-}
-
diff --git a/web/hooks/usePaginatedQuery.ts b/web/hooks/usePaginatedQuery.ts
index 60794d66..5f5283a7 100644
--- a/web/hooks/usePaginatedQuery.ts
+++ b/web/hooks/usePaginatedQuery.ts
@@ -23,6 +23,7 @@ export interface PaginatedGraphQLQueryOptions<TQueryResult, TItem, TVariables ex
   baseVariables: TVariables,
   pageSize: number,
   extractItems: (queryResult: TQueryResult) => TItem[],
+  extractTotalCount?: (queryResult: TQueryResult) => number | undefined,
   mode?: PaginationMode,
   enabled?: boolean,
   refetchInterval?: number | false,
@@ -42,6 +43,7 @@ export interface PaginatedQueryResult<TData> {
   totalPages?: number,
   currentPage?: number,
   goToPage?: (page: number) => void,
+  totalCount?: number,
 }
 
 function useInfinitePaginatedQuery<TData, TVariables extends Record<string, unknown>>({
@@ -65,7 +67,8 @@ function useInfinitePaginatedQuery<TData, TVariables extends Record<string, unkn
     refetch,
   } = useInfiniteQuery({
     queryKey: [...queryKey, variables],
-    queryFn: ({ pageParam = 0 }) => queryFn(pageParam, variables),
+    queryFn: ({ pageParam }) => queryFn(pageParam as number, variables),
+    initialPageParam: 0,
     getNextPageParam: (lastPage, allPages) => {
       const lastPageData = Array.isArray(lastPage) ? lastPage : []
       if (lastPageData.length < pageSize) {
@@ -223,23 +226,36 @@ export function usePaginatedGraphQLQuery<TQueryResult, TItem, TVariables extends
   baseVariables,
   pageSize,
   extractItems,
+  extractTotalCount,
   mode = 'infinite',
   enabled = true,
   refetchInterval,
   refetchOnWindowFocus = true,
   refetchOnMount = true,
 }: PaginatedGraphQLQueryOptions<TQueryResult, TItem, TVariables>): PaginatedQueryResult<TItem> {
+  const [totalCount, setTotalCount] = React.useState<number | undefined>(undefined)
+
   const queryFn = React.useCallback(
     async (page: number, variables: TVariables): Promise<TItem[]> => {
       const paginatedVariables = {
         ...variables,
-        limit: pageSize,
-        offset: page * pageSize,
+        pagination: {
+          pageIndex: page,
+          pageSize: pageSize,
+        },
       }
       const result = await fetcher<TQueryResult, typeof paginatedVariables>(document, paginatedVariables)()
+
+      if (extractTotalCount) {
+        const count = extractTotalCount(result)
+        if (count !== undefined) {
+          setTotalCount(count)
+        }
+      }
+
       return extractItems(result)
     },
-    [document, pageSize, extractItems]
+    [document, pageSize, extractItems, extractTotalCount]
   )
 
   const result = usePaginatedQuery<TItem[], TVariables>({
@@ -257,6 +273,7 @@ export function usePaginatedGraphQLQuery<TQueryResult, TItem, TVariables extends
   return {
     ...result,
     data: result.data as TItem[],
+    totalCount,
   }
 }
 
diff --git a/web/hooks/useSafeMutation.ts b/web/hooks/useSafeMutation.ts
index 0b2a8472..2599736e 100644
--- a/web/hooks/useSafeMutation.ts
+++ b/web/hooks/useSafeMutation.ts
@@ -1,11 +1,11 @@
+import type { UseMutationOptions } from '@tanstack/react-query'
 import { useQueryClient, useMutation } from '@tanstack/react-query'
 import { cleanGraphQLInput, extractConflictError } from '@/utils/graphql'
 
 export type ConflictResolutionStrategy = 'auto-merge' | 'manual' | 'overwrite'
 
-export interface SafeMutationOptions<TData, TVariables, TContext> {
+export interface SafeMutationOptions<TData, TVariables, TContext> extends Omit<UseMutationOptions<TData, Error, TVariables, TContext>, 'mutationFn'> {
   mutationFn: (variables: TVariables) => Promise<TData>,
-  onMutate?: (variables: TVariables) => Promise<TContext> | TContext,
   onSuccess?: (data: TData, variables: TVariables, context: TContext | undefined) => void | Promise<void>,
   onError?: (error: Error, variables: TVariables, context: TContext | undefined) => void | Promise<void>,
   onConflict?: (
@@ -20,8 +20,7 @@ export interface SafeMutationOptions<TData, TVariables, TContext> {
     context: TContext | undefined
   ) => Promise<'keep-local' | 'use-server' | 'merge'>,
   conflictResolutionStrategy?: ConflictResolutionStrategy,
-  queryKey?: unknown[],
-  invalidateQueries?: unknown[][],
+  affectedQueryKeys?: unknown[][],
   optimisticUpdate?: (variables: TVariables) => {
     queryKey: unknown[],
     updateFn: (oldData: unknown) => unknown,
@@ -40,18 +39,19 @@ export function useSafeMutation<
   onConflict,
   handleConflict,
   conflictResolutionStrategy = 'manual',
-  queryKey,
-  invalidateQueries = [],
+  affectedQueryKeys = [],
   optimisticUpdate,
+  ...options
 }: SafeMutationOptions<TData, TVariables, TContext>) {
   const queryClient = useQueryClient()
 
   return useMutation<TData, Error, TVariables, TContext & { previousData?: Map<unknown[], unknown> }>({
+    ...options,
     mutationFn: async (variables) => {
       const cleanedVariables = cleanGraphQLInput(variables as Record<string, unknown>) as TVariables
       return mutationFn(cleanedVariables)
     },
-    onMutate: async (variables) => {
+    onMutate: async (variables, options) => {
       const previousData = new Map<unknown[], unknown>()
 
       if (optimisticUpdate) {
@@ -67,15 +67,11 @@ export function useSafeMutation<
         }
       }
 
-      const context = onMutate ? await onMutate(variables) : undefined as TContext
+      const context = onMutate ? await onMutate(variables, options) : undefined as TContext
       return { ...context, previousData } as TContext & { previousData: Map<unknown[], unknown> }
     },
     onSuccess: async (data, variables, context) => {
-      if (queryKey) {
-        await queryClient.invalidateQueries({ queryKey })
-      }
-
-      for (const key of invalidateQueries) {
+      for (const key of affectedQueryKeys) {
         await queryClient.invalidateQueries({ queryKey: key })
       }
 
@@ -107,11 +103,7 @@ export function useSafeMutation<
               const cleanedVariables = cleanGraphQLInput(variables as Record<string, unknown>) as TVariables
               const result = await mutationFn(cleanedVariables)
 
-              if (queryKey) {
-                await queryClient.invalidateQueries({ queryKey })
-              }
-
-              for (const key of invalidateQueries) {
+              for (const key of affectedQueryKeys) {
                 await queryClient.invalidateQueries({ queryKey: key })
               }
 
@@ -120,11 +112,7 @@ export function useSafeMutation<
               }
               return
             } else if (choice === 'use-server') {
-              if (queryKey) {
-                await queryClient.invalidateQueries({ queryKey })
-              }
-
-              for (const key of invalidateQueries) {
+              for (const key of affectedQueryKeys) {
                 await queryClient.invalidateQueries({ queryKey: key })
               }
               return
@@ -153,11 +141,7 @@ export function useSafeMutation<
               const cleanedVariables = cleanGraphQLInput(variables as Record<string, unknown>) as TVariables
               const result = await mutationFn(cleanedVariables)
 
-              if (queryKey) {
-                await queryClient.invalidateQueries({ queryKey })
-              }
-
-              for (const key of invalidateQueries) {
+              for (const key of affectedQueryKeys) {
                 await queryClient.invalidateQueries({ queryKey: key })
               }
 
diff --git a/web/hooks/useStateWithLocalStorage.ts b/web/hooks/useStateWithLocalStorage.ts
new file mode 100644
index 00000000..8c6b7eb1
--- /dev/null
+++ b/web/hooks/useStateWithLocalStorage.ts
@@ -0,0 +1,37 @@
+import type { Dispatch, SetStateAction } from 'react'
+import { useState, useEffect } from 'react'
+
+const loadFromLocalStorage = <T>(key: string, defaultValue: T): T => {
+  const value = localStorage.getItem(key)
+  if (!value) return defaultValue
+  try {
+    return JSON.parse(value) as T
+  } catch {
+    return defaultValue
+  }
+}
+
+const saveToLocalStorage = <T>(key: string, value: T) => {
+  localStorage.setItem(key, JSON.stringify(value))
+}
+
+export interface useStateWithLocalStorageProps<T> {
+  key: string,
+  defaultValue: T,
+}
+
+export const useStateWithLocalStorage = <T>({
+  key,
+  defaultValue
+}: useStateWithLocalStorageProps<T>): [T, Dispatch<SetStateAction<T>>] => {
+  const [value, setValue] = useState<T>(() => loadFromLocalStorage(key, defaultValue))
+
+  if('task-list-column-filters' === key) {
+    console.log('loading from localStorage', key, value)
+  }
+
+  useEffect(() => {
+    saveToLocalStorage(key, value)
+  }, [key,value])
+  return [value, setValue]
+}
\ No newline at end of file
diff --git a/web/i18n/translations.ts b/web/i18n/translations.ts
index d4d6812b..9759ebe8 100644
--- a/web/i18n/translations.ts
+++ b/web/i18n/translations.ts
@@ -18,6 +18,7 @@ export type TasksTranslationEntries = {
   'admitPatient': string,
   'age': string,
   'anonymous': string,
+  'anonymousSubmission': string,
   'archivedPropertyDescription': string,
   'archiveProperty': string,
   'assignedLocation': string,
@@ -26,6 +27,7 @@ export type TasksTranslationEntries = {
   'authenticationFailed': string,
   'birthdate': string,
   'cancel': string,
+  'cardView': string,
   'chooseLanguage': string,
   'chooseTheme': string,
   'clearCache': string,
@@ -152,6 +154,8 @@ export type TasksTranslationEntries = {
   'place': string,
   'position': string,
   'preferences': string,
+  'print': string,
+  'printOnlyAvailableInTableMode': string,
   'priority': (values: { priority: string }) => string,
   'priorityLabel': string,
   'priorityNone': string,
@@ -172,6 +176,7 @@ export type TasksTranslationEntries = {
   'retakeSurvey': string,
   'returnHome': string,
   'rooms': string,
+  'rShow': (values: { name: string }) => string,
   'save': string,
   'searchLocations': string,
   'searchUsersOrTeams': string,
@@ -194,8 +199,8 @@ export type TasksTranslationEntries = {
   'sex': string,
   'shiftHandover': string,
   'shiftHandoverDescription': string,
-  'showAllTasks': string,
   'showAllPatients': string,
+  'showAllTasks': string,
   'showDone': string,
   'showTeamTasks': string,
   'sPropertySubjectType': (values: { subject: string }) => string,
@@ -205,11 +210,14 @@ export type TasksTranslationEntries = {
   'status': string,
   'stopRecording': string,
   'subjectType': string,
+  'submissionDetails': string,
   'submit': string,
   'submitAnonymously': string,
+  'submittingAs': (values: { name: string }) => string,
   'surveyDescription': string,
   'surveyTitle': string,
   'system': string,
+  'tableView': string,
   'task': string,
   'tasks': string,
   'taskStatus': (values: { status: string }) => string,
@@ -247,6 +255,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'admitPatient': `Patient aufnehmen`,
     'age': `Alter`,
     'anonymous': `Anonym`,
+    'anonymousSubmission': `Anonyme Übermittlung`,
     'archivedPropertyDescription': `Archivierte Eigenschaften können nicht mehr neu Objekten hinzugeügt werden.`,
     'archiveProperty': `Eigenschaft Archivieren`,
     'assignedLocation': `Zugewiesener Standort`,
@@ -255,6 +264,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'authenticationFailed': `Authentifizierung fehlgeschlagen`,
     'birthdate': `Geburtsdatum`,
     'cancel': `Abbrechen`,
+    'cardView': `Kachelansicht`,
     'chooseLanguage': `Sprache wählen`,
     'chooseTheme': `Design wählen`,
     'clearCache': `Cache leeren`,
@@ -472,6 +482,8 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'place': `Ort`,
     'position': `Position`,
     'preferences': `Präferenzen`,
+    'print': `Drucken`,
+    'printOnlyAvailableInTableMode': `Drucken ist nur im Tabellenmodus verfügbar`,
     'priority': ({ priority }): string => {
       return TranslationGen.resolveSelect(priority, {
         'P1': `Normal`,
@@ -506,6 +518,9 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'retakeSurvey': `Umfrage erneut durchführen`,
     'returnHome': `Zur Homepage`,
     'rooms': `Zimmer`,
+    'rShow': ({ name }): string => {
+      return `${name} anzeigen`
+    },
     'save': `Speichern`,
     'searchLocations': `Standorte suchen...`,
     'searchUsersOrTeams': `Benutzer oder Teams suchen...`,
@@ -528,8 +543,8 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'sex': `Geschlecht`,
     'shiftHandover': `Schichtübergabe`,
     'shiftHandoverDescription': `Wählen Sie einen Benutzer aus, um alle Ihnen zugewiesenen offenen Aufgaben zu übertragen.`,
-    'showAllTasks': `Alle Aufgaben anzeigen`,
     'showAllPatients': `Alle Patienten anzeigen`,
+    'showAllTasks': `Alle Aufgaben anzeigen`,
     'showDone': `Erledigte anzeigen`,
     'showTeamTasks': `Team-Aufgaben anzeigen`,
     'sPropertySubjectType': ({ subject }): string => {
@@ -556,11 +571,16 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'status': `Status`,
     'stopRecording': `Aufnahme stoppen`,
     'subjectType': `Subjekt Type`,
+    'submissionDetails': `Übermittlungsdetails`,
     'submit': `Absenden`,
     'submitAnonymously': `Anonym absenden`,
+    'submittingAs': ({ name }): string => {
+      return `Übermitteln als ${name}`
+    },
     'surveyDescription': `Ihr Feedback ist wertvoll für uns. Bitte nehmen Sie sich einen Moment Zeit, um unsere Umfrage auszufüllen.`,
     'surveyTitle': `Helfen Sie uns, helpwave tasks zu verbessern`,
     'system': `System`,
+    'tableView': `Tabellenansicht`,
     'task': `Aufgabe`,
     'tasks': `Aufgaben`,
     'taskStatus': ({ status }): string => {
@@ -610,6 +630,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'admitPatient': `Admit Patient`,
     'age': `Age`,
     'anonymous': `Anonymous`,
+    'anonymousSubmission': `Anonymous Submission`,
     'archivedPropertyDescription': `Archived Properties can no longer be assigned to objects.`,
     'archiveProperty': `Archive Property`,
     'assignedLocation': `Assigned Location`,
@@ -618,6 +639,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'authenticationFailed': `Authentication Failed`,
     'birthdate': `Birthdate`,
     'cancel': `Cancel`,
+    'cardView': `Card View`,
     'chooseLanguage': `Choose Language`,
     'chooseTheme': `Choose Theme`,
     'clearCache': `Clear Cache`,
@@ -835,6 +857,8 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'place': `Place`,
     'position': `Position`,
     'preferences': `Preferences`,
+    'print': `Print`,
+    'printOnlyAvailableInTableMode': `Print is only available in table mode`,
     'priority': ({ priority }): string => {
       return TranslationGen.resolveSelect(priority, {
         'P1': `Normal`,
@@ -853,7 +877,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'public': `public`,
     'publish': `publish`,
     'rAdd': ({ name }): string => {
-      return `Add ${name}!`
+      return `Add ${name}`
     },
     'rClickToAdd': ({ name }): string => {
       return `Click to add ${name}!`
@@ -868,6 +892,9 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'retakeSurvey': `Retake Survey`,
     'returnHome': `Return Home`,
     'rooms': `Rooms`,
+    'rShow': ({ name }): string => {
+      return `Show ${name}`
+    },
     'save': `Save`,
     'searchLocations': `Search locations...`,
     'searchUsersOrTeams': `Search users or teams...`,
@@ -890,8 +917,8 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'sex': `Sex`,
     'shiftHandover': `Shift Handover`,
     'shiftHandoverDescription': `Select a user to transfer all open tasks assigned to you.`,
-    'showAllTasks': `Show All Tasks`,
     'showAllPatients': `Show all patients`,
+    'showAllTasks': `Show All Tasks`,
     'showDone': `Show done`,
     'showTeamTasks': `Show Team Tasks`,
     'sPropertySubjectType': ({ subject }): string => {
@@ -918,11 +945,16 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'status': `Status`,
     'stopRecording': `Stop Recording`,
     'subjectType': `Subject Type`,
+    'submissionDetails': `Submission Details`,
     'submit': `Submit`,
     'submitAnonymously': `Submit anonymously`,
+    'submittingAs': ({ name }): string => {
+      return `Submitting as ${name}`
+    },
     'surveyDescription': `Your feedback is valuable to us. Please take a moment to complete our survey.`,
     'surveyTitle': `Help us to improve helpwave tasks`,
     'system': `System`,
+    'tableView': `Table View`,
     'task': `Task`,
     'tasks': `Tasks`,
     'taskStatus': ({ status }): string => {
diff --git a/web/locales/de-DE.arb b/web/locales/de-DE.arb
index 7b436805..59f4ef4c 100644
--- a/web/locales/de-DE.arb
+++ b/web/locales/de-DE.arb
@@ -228,10 +228,12 @@
   "time.today": "Heute",
   "myFavorites": "Meine Favoriten",
   "freeBeds": "Freie Betten",
+  "cardView": "Kachelansicht",
   "occupancy": "Belegung",
   "properties": "Eigenschaften",
   "addProperty": "Eigenschaften hinzufügen",
   "type": "Typ",
+  "tableView": "Tabellenansicht",
   "subjectType": "Subjekt Type",
   "active": "Aktiv",
   "inactive": "Inaktiv",
@@ -243,6 +245,14 @@
       }
     }
   },
+  "rShow": "{name} anzeigen",
+  "@rShow": {
+    "placeholders": {
+      "name": {
+        "type": "string"
+      }
+    }
+  },
   "rAdd": "{name} hinzufügen",
   "@rAdd": {
     "placeholders": {
@@ -390,6 +400,8 @@
   },
   "priorityLabel": "Priorität",
   "priorityNone": "Keine",
+  "print": "Drucken",
+  "printOnlyAvailableInTableMode": "Drucken ist nur im Tabellenmodus verfügbar",
   "deletePatient": "Patient löschen",
   "deletePatientConfirmation": "Sind Sie sicher, dass Sie diesen Patienten löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
   "feedbackDescription": "Teilen Sie Ihr Feedback, melden Sie Fehler oder schlagen Sie Verbesserungen vor.",
@@ -410,6 +422,16 @@
   "estimatedTime": "Geschätzte Zeit (Minuten)",
   "ok": "OK",
   "submitAnonymously": "Anonym absenden",
+  "submissionDetails": "Übermittlungsdetails",
+  "submittingAs": "Übermitteln als {name}",
+  "@submittingAs": {
+    "placeholders": {
+      "name": {
+        "type": "string"
+      }
+    }
+  },
+  "anonymousSubmission": "Anonyme Übermittlung",
   "conflictDetected": "Konflikt erkannt",
   "overwrite": "Überschreiben",
   "userInformation": "Benutzerinformationen"
diff --git a/web/locales/en-US.arb b/web/locales/en-US.arb
index ae30435e..e02eea7e 100644
--- a/web/locales/en-US.arb
+++ b/web/locales/en-US.arb
@@ -228,10 +228,12 @@
   "time.today": "Today",
   "myFavorites": "My Favorites",
   "freeBeds": "Free Beds",
+  "cardView": "Card View",
   "occupancy": "Occupancy",
   "properties": "Properties",
   "addProperty": "Add Property",
   "type": "Type",
+  "tableView": "Table View",
   "subjectType": "Subject Type",
   "active": "Active",
   "inactive": "Inactive",
@@ -243,7 +245,15 @@
       }
     }
   },
-  "rAdd": "Add {name}!",
+  "rShow": "Show {name}",
+  "@rShow": {
+    "placeholders": {
+      "name": {
+        "type": "string"
+      }
+    }
+  },
+  "rAdd": "Add {name}",
   "@rAdd": {
     "placeholders": {
       "name": {
@@ -391,6 +401,8 @@
   },
   "priorityLabel": "Priority",
   "priorityNone": "None",
+  "print": "Print",
+  "printOnlyAvailableInTableMode": "Print is only available in table mode",
   "deletePatient": "Delete Patient",
   "deletePatientConfirmation": "Are you sure you want to delete this patient? This action cannot be undone.",
   "feedbackDescription": "Share your feedback, report bugs, or suggest improvements.",
@@ -411,5 +423,15 @@
   "estimatedTime": "Estimated Time (minutes)",
   "ok": "OK",
   "submitAnonymously": "Submit anonymously",
+  "submissionDetails": "Submission Details",
+  "submittingAs": "Submitting as {name}",
+  "@submittingAs": {
+    "placeholders": {
+      "name": {
+        "type": "string"
+      }
+    }
+  },
+  "anonymousSubmission": "Anonymous Submission",
   "userInformation": "User Information"
 }
diff --git a/web/package-lock.json b/web/package-lock.json
index 8b3352b2..6fb89170 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -8,28 +8,28 @@
       "name": "@helpwave/tasks",
       "version": "0.1.0",
       "dependencies": {
-        "@apollo/client": "4.0.9",
+        "@apollo/client": "4.0.11",
         "@dnd-kit/core": "6.3.1",
         "@dnd-kit/modifiers": "9.0.0",
         "@dnd-kit/sortable": "7.0.2",
-        "@helpwave/hightide": "0.5.4",
+        "@helpwave/hightide": "0.6.15",
         "@helpwave/internationalization": "0.4.0",
         "@tailwindcss/postcss": "4.1.3",
-        "@tanstack/react-query": "4.36.1",
-        "@tanstack/react-query-devtools": "4.36.1",
+        "@tanstack/react-query": "5.90.16",
+        "@tanstack/react-query-devtools": "5.91.2",
         "@tanstack/react-table": "8.21.3",
-        "@types/formidable": "^3.4.6",
+        "@types/formidable": "3.4.6",
         "clsx": "2.1.1",
         "dotenv": "17.2.3",
-        "formidable": "^3.5.4",
+        "formidable": "3.5.4",
         "lucide-react": "0.468.0",
         "next": "16.0.10",
         "next-runtime-env": "3.3.0",
         "oidc-client-ts": "3.4.1",
         "postcss": "8.5.3",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
-        "sharp": "^0.34.5",
+        "react": "19.2.3",
+        "react-dom": "19.2.3",
+        "sharp": "0.34.5",
         "tailwindcss": "4.1.17",
         "typescript": "5.7.2",
         "zod": "3.25.73"
@@ -41,10 +41,11 @@
         "@graphql-codegen/typescript-operations": "5.0.6",
         "@graphql-codegen/typescript-react-query": "6.1.1",
         "@helpwave/eslint-config": "0.0.11",
-        "@playwright/test": "^1.57.0",
+        "@playwright/test": "1.57.0",
         "@types/node": "20.17.10",
-        "@types/react": "18.3.17",
-        "@types/react-dom": "18.3.5",
+        "@types/react": "19.2.7",
+        "@types/react-dom": "19.2.3",
+        "autoprefixer": "10.4.23",
         "eslint": "9.39.1",
         "graphql": "16.12.0",
         "graphql-request": "7.3.5"
@@ -63,9 +64,9 @@
       }
     },
     "node_modules/@apollo/client": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.0.9.tgz",
-      "integrity": "sha512-Lh2drMzFE9x5jVS8RKmlGL5SORkvpyUJIT+wTErxDUR2HpWePiBfhhcHHRSlZFiCR866ewCv4euTc4IDF0GWxw==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.0.11.tgz",
+      "integrity": "sha512-jyW5j3DEYnFlYA1Lk9Szd7O/od1DptnbZnj03DQXxuQb+Gnop0w/uQxVRKaU7bPhvVuBnlAtZYPOykArX+xWdg==",
       "license": "MIT",
       "workspaces": [
         "dist",
@@ -2439,9 +2440,9 @@
       }
     },
     "node_modules/@helpwave/hightide": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@helpwave/hightide/-/hightide-0.5.4.tgz",
-      "integrity": "sha512-KREwVgXKbFzw7kPnuTJqOY8ViwD6rCEMHWZB7l8vcIwMBwL/8kY3xiQjT/JzzAnbqhxMsANSj1Gp6YQnkuSBFA==",
+      "version": "0.6.15",
+      "resolved": "https://registry.npmjs.org/@helpwave/hightide/-/hightide-0.6.15.tgz",
+      "integrity": "sha512-kZ3c+OgUeqYx7Il3FfSlsrINSrFeoUWrMVcBwakF3B2kBaP643eQaRPHtkwQd/H7dlftnmYLnsRsMrfydk4Cyg==",
       "license": "MPL-2.0",
       "dependencies": {
         "@helpwave/internationalization": "0.4.0",
@@ -2449,7 +2450,6 @@
         "@tanstack/react-table": "8.21.3",
         "clsx": "2.1.1",
         "lucide-react": "0.561.0",
-        "postcss": "8.5.3",
         "react": "19.2.3",
         "react-dom": "19.2.3",
         "tailwindcss": "4.1.18"
@@ -2464,33 +2464,6 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/@helpwave/hightide/node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@helpwave/hightide/node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
-      "license": "MIT",
-      "dependencies": {
-        "scheduler": "^0.27.0"
-      },
-      "peerDependencies": {
-        "react": "^19.2.3"
-      }
-    },
-    "node_modules/@helpwave/hightide/node_modules/scheduler": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
-      "license": "MIT"
-    },
     "node_modules/@helpwave/hightide/node_modules/tailwindcss": {
       "version": "4.1.18",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz",
@@ -4729,26 +4702,20 @@
       "integrity": "sha512-2Q+rw9vy1WFXu5cIxlvsabCwhU2qUwodGq03ODhLJ0jW4ek5BUtoCsnLB0qG+m8AHgEsSJcJGDSDe06FXlP74g==",
       "license": "MIT"
     },
-    "node_modules/@tanstack/match-sorter-utils": {
-      "version": "8.19.4",
-      "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.19.4.tgz",
-      "integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
+    "node_modules/@tanstack/query-core": {
+      "version": "5.90.16",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.16.tgz",
+      "integrity": "sha512-MvtWckSVufs/ja463/K4PyJeqT+HMlJWtw6PrCpywznd2NSgO3m4KwO9RqbFqGg6iDE8vVMFWMeQI4Io3eEYww==",
       "license": "MIT",
-      "dependencies": {
-        "remove-accents": "0.5.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@tanstack/query-core": {
-      "version": "4.36.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.36.1.tgz",
-      "integrity": "sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==",
+    "node_modules/@tanstack/query-devtools": {
+      "version": "5.92.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.92.0.tgz",
+      "integrity": "sha512-N8D27KH1vEpVacvZgJL27xC6yPFUy0Zkezn5gnB3L3gRCxlDeSuiya7fKge8Y91uMTnC8aSxBQhcK6ocY7alpQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -4756,50 +4723,36 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "4.36.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.36.1.tgz",
-      "integrity": "sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw==",
+      "version": "5.90.16",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.16.tgz",
+      "integrity": "sha512-bpMGOmV4OPmif7TNMteU/Ehf/hoC0Kf98PDc0F4BZkFrEapRMEqI/V6YS0lyzwSV6PQpY1y4xxArUIfBW5LVxQ==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "4.36.1",
-        "use-sync-external-store": "^1.2.0"
+        "@tanstack/query-core": "5.90.16"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-native": "*"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
+        "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "4.36.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.36.1.tgz",
-      "integrity": "sha512-WYku83CKP3OevnYSG8Y/QO9g0rT75v1om5IvcWUwiUZJ4LanYGLVCZ8TdFG5jfsq4Ej/lu2wwDAULEUnRIMBSw==",
+      "version": "5.91.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.91.2.tgz",
+      "integrity": "sha512-ZJ1503ay5fFeEYFUdo7LMNFzZryi6B0Cacrgr2h1JRkvikK1khgIq6Nq2EcblqEdIlgB/r7XDW8f8DQ89RuUgg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/match-sorter-utils": "^8.7.0",
-        "superjson": "^1.10.0",
-        "use-sync-external-store": "^1.2.0"
+        "@tanstack/query-devtools": "5.92.0"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^4.36.1",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@tanstack/react-query": "^5.90.14",
+        "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-table": {
@@ -4886,32 +4839,24 @@
         "undici-types": "~6.19.2"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.15",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
-      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/react": {
-      "version": "18.3.17",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.17.tgz",
-      "integrity": "sha512-opAQ5no6LqJNo9TqnxBKsgnkIYHozW9KSTlFVoSUJYh1Fl/sswkEoqIugRSm7tbh6pABtYjGAjW+GOS23j8qbw==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
-        "csstype": "^3.0.2"
+        "csstype": "^3.2.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
-      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
+      "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@types/react": "^18.0.0"
+        "@types/react": "^19.2.0"
       }
     },
     "node_modules/@types/ws": {
@@ -5542,6 +5487,43 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/autoprefixer": {
+      "version": "10.4.23",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz",
+      "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.28.1",
+        "caniuse-lite": "^1.0.30001760",
+        "fraction.js": "^5.3.4",
+        "picocolors": "^1.1.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -5780,9 +5762,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001759",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001759.tgz",
-      "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==",
+      "version": "1.0.30001762",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz",
+      "integrity": "sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==",
       "funding": [
         {
           "type": "opencollective",
@@ -6077,21 +6059,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/copy-anything": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
-      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
-      "license": "MIT",
-      "dependencies": {
-        "is-what": "^4.1.8"
-      },
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/cosmiconfig": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
@@ -7195,6 +7162,20 @@
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
+    "node_modules/fraction.js": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
+      "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -8522,18 +8503,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-what": {
-      "version": "4.1.16",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
-      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -9103,9 +9072,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -9717,6 +9686,42 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/next-runtime-env/node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/next-runtime-env/node_modules/react-dom": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/next-runtime-env/node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
     "node_modules/next-runtime-env/node_modules/styled-jsx": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz",
@@ -10335,6 +10340,13 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -10399,28 +10411,24 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
+      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
+      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.2.3"
       }
     },
     "node_modules/react-is": {
@@ -10496,12 +10504,6 @@
         "node": "*"
       }
     },
-    "node_modules/remove-accents": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
-      "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
-      "license": "MIT"
-    },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -10693,13 +10695,10 @@
       "license": "MIT"
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -11249,18 +11248,6 @@
         }
       }
     },
-    "node_modules/superjson": {
-      "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-1.13.3.tgz",
-      "integrity": "sha512-mJiVjfd2vokfDxsQPOwJ/PtanO87LhpYY88ubI5dUB1Ab58Txbyje3+jpm+/83R/fevaq/107NNhtYBLuoTrFg==",
-      "license": "MIT",
-      "dependencies": {
-        "copy-anything": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11703,15 +11690,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/use-sync-external-store": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
-      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/web-streams-polyfill": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
diff --git a/web/package.json b/web/package.json
index caab296e..d0fe687d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -12,28 +12,28 @@
     "generate-graphql": "graphql-codegen"
   },
   "dependencies": {
-    "@apollo/client": "4.0.9",
+    "@apollo/client": "4.0.11",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/modifiers": "9.0.0",
     "@dnd-kit/sortable": "7.0.2",
-    "@helpwave/hightide": "0.5.4",
+    "@helpwave/hightide": "0.6.15",
     "@helpwave/internationalization": "0.4.0",
     "@tailwindcss/postcss": "4.1.3",
-    "@tanstack/react-query": "4.36.1",
-    "@tanstack/react-query-devtools": "4.36.1",
+    "@tanstack/react-query": "5.90.16",
+    "@tanstack/react-query-devtools": "5.91.2",
     "@tanstack/react-table": "8.21.3",
-    "@types/formidable": "^3.4.6",
+    "@types/formidable": "3.4.6",
     "clsx": "2.1.1",
     "dotenv": "17.2.3",
-    "formidable": "^3.5.4",
+    "formidable": "3.5.4",
     "lucide-react": "0.468.0",
     "next": "16.0.10",
     "next-runtime-env": "3.3.0",
     "oidc-client-ts": "3.4.1",
     "postcss": "8.5.3",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "sharp": "^0.34.5",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "sharp": "0.34.5",
     "tailwindcss": "4.1.17",
     "typescript": "5.7.2",
     "zod": "3.25.73"
@@ -45,12 +45,13 @@
     "@graphql-codegen/typescript-operations": "5.0.6",
     "@graphql-codegen/typescript-react-query": "6.1.1",
     "@helpwave/eslint-config": "0.0.11",
-    "@playwright/test": "^1.57.0",
+    "@playwright/test": "1.57.0",
     "@types/node": "20.17.10",
-    "@types/react": "18.3.17",
-    "@types/react-dom": "18.3.5",
+    "@types/react": "19.2.7",
+    "@types/react-dom": "19.2.3",
+    "autoprefixer": "10.4.23",
     "eslint": "9.39.1",
     "graphql": "16.12.0",
     "graphql-request": "7.3.5"
   }
-}
+}
\ No newline at end of file
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index e2577e25..e3596cbe 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -3,8 +3,7 @@ import type { AppProps } from 'next/app'
 import { Inter, Space_Grotesk as SpaceGrotesk } from 'next/font/google'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import {
-  LocaleProvider,
-  ThemeProvider
+  HightideProvider
 } from '@helpwave/hightide'
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools/production'
 import titleWrapper from '@/utils/titleWrapper'
@@ -27,7 +26,13 @@ const spaceGrotesk = SpaceGrotesk({
   variable: '--font-space-grotesk'
 })
 
-const queryClient = new QueryClient()
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: true,
+    },
+  },
+})
 
 const config = getConfig()
 
@@ -46,40 +51,38 @@ function MyApp({
   }, [])
 
   return (
-    <LocaleProvider>
-      <ThemeProvider>
-        <QueryClientProvider client={queryClient}>
-          <Head>
-            <title>{titleWrapper()}</title>
-            <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5, user-scalable=yes, viewport-fit=cover" />
-            <style
-              dangerouslySetInnerHTML={{
-                __html: `
+    <HightideProvider>
+      <QueryClientProvider client={queryClient}>
+        <Head>
+          <title>{titleWrapper()}</title>
+          <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5, user-scalable=yes, viewport-fit=cover" />
+          <style
+            dangerouslySetInnerHTML={{
+              __html: `
                   :root {
                     --font-inter: ${inter.style.fontFamily};
                     --font-space: ${spaceGrotesk.style.fontFamily};
                   }
                 `,
-                            }}
-                        />
-                    </Head>
-                    <AuthProvider
-                      ignoredURLs={[
-                        '/auth/callback',
-                      ]}
-                    >
-                      <TasksContextProvider>
-                        <SubscriptionProvider>
-                          <Component {...pageProps} />
-                          <InstallPrompt />
-                        </SubscriptionProvider>
-                      </TasksContextProvider>
-                    </AuthProvider>
-                    {config.env === 'development' && <ReactQueryDevtools position="bottom-left" />}
-                </QueryClientProvider>
-            </ThemeProvider>
-        </LocaleProvider>
-    )
+            }}
+          />
+        </Head>
+        <AuthProvider
+          ignoredURLs={[
+            '/auth/callback',
+          ]}
+        >
+          <TasksContextProvider>
+            <SubscriptionProvider>
+              <Component {...pageProps} />
+              <InstallPrompt />
+            </SubscriptionProvider>
+          </TasksContextProvider>
+        </AuthProvider>
+        {config.env === 'development' && <ReactQueryDevtools buttonPosition="bottom-left" />}
+      </QueryClientProvider>
+    </HightideProvider>
+  )
 }
 
 export default MyApp
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index e32a6deb..0eba4420 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -2,39 +2,27 @@ import type { NextPage } from 'next'
 import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
-import { ContentPanel } from '@/components/layout/ContentPanel'
 import { useGetOverviewDataQuery } from '@/api/gql/generated'
-import { Avatar, Button, CheckboxUncontrolled, FillerRowElement, Table } from '@helpwave/hightide'
-import { CurrentTime, SmartDate } from '@/utils/date'
+import { Avatar } from '@helpwave/hightide'
+import { CurrentTime } from '@/utils/date'
 import { ClockIcon, ListCheckIcon, UsersIcon } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import type { ColumnDef } from '@tanstack/table-core'
+import { useCallback, useMemo, useState, type ReactNode } from 'react'
 import { useTasksContext } from '@/hooks/useTasksContext'
 import Link from 'next/link'
-import { SidePanel } from '@/components/layout/SidePanel'
+import { Drawer } from '@helpwave/hightide'
 import { PatientDetailView } from '@/components/patients/PatientDetailView'
 import { TaskDetailView } from '@/components/tasks/TaskDetailView'
-import { LocationChips } from '@/components/patients/LocationChips'
 import { CompleteTaskDocument, ReopenTaskDocument, type CompleteTaskMutation, type ReopenTaskMutation, type CompleteTaskMutationVariables, type ReopenTaskMutationVariables, type GetOverviewDataQuery, type GetGlobalDataQuery } from '@/api/gql/generated'
 import { useSafeMutation } from '@/hooks/useSafeMutation'
 import { fetcher } from '@/api/gql/fetcher'
-import clsx from 'clsx'
 import { useQueryClient } from '@tanstack/react-query'
+import { RecentTasksTable } from '@/components/tables/RecentTasksTable'
+import { RecentPatientsTable } from '@/components/tables/RecentPatientsTable'
+import clsx from 'clsx'
 
-const isOverdue = (dueDate: Date | undefined | null, done: boolean): boolean => {
-  if (!dueDate || done) return false
-  return new Date(dueDate).getTime() < Date.now()
-}
 
-const isCloseToDueDate = (dueDate: Date | undefined | null, done: boolean): boolean => {
-  if (!dueDate || done) return false
-  const now = Date.now()
-  const dueTime = new Date(dueDate).getTime()
-  const oneHour = 60 * 60 * 1000
-  return dueTime > now && dueTime - now <= oneHour
-}
 
-const getGreetingKey = (): string => {
+const getGreetingKey = () => {
   const hour = new Date().getHours()
   if (hour >= 6 && hour < 12) return 'dashboardWelcomeMorning'
   if (hour >= 12 && hour < 14) return 'dashboardWelcomeNoon'
@@ -43,10 +31,63 @@ const getGreetingKey = (): string => {
   return 'dashboardWelcomeNight'
 }
 
+interface GreetingSectionProps {
+  userName?: string | null,
+  userAvatarUrl?: string | null,
+}
+
+const GreetingSection = ({ userName, userAvatarUrl }: GreetingSectionProps) => {
+  const translation = useTasksTranslation()
+
+  return (
+    <div className="flex-row-4 items-center">
+      <Avatar
+        size="lg"
+        image={userAvatarUrl ? { avatarUrl: userAvatarUrl, alt: userName ?? '' } : undefined}
+      />
+      <div className="flex-col-1">
+        <h1 className="typography-title-lg">{translation(getGreetingKey(), { name: userName ?? '' })}</h1>
+        <p className="typography-body text-description">{translation('dashboardWelcomeDescription')}</p>
+      </div>
+    </div>
+  )
+}
+
+interface StatCardProps {
+  label: string,
+  value: ReactNode,
+  icon: ReactNode,
+  iconWrapperClassName?: string,
+  className?: string,
+}
+
+const StatCard = ({ label, value, icon, iconWrapperClassName, className }: StatCardProps) => {
+  return (
+    <div className={clsx('bg-surface rounded-lg p-4 shadow-sm flex-row-4 items-center border border-border h-full', className)}>
+      <div className={clsx('p-3 rounded-full', iconWrapperClassName)}>
+        {icon}
+      </div>
+      <div className="flex-col-0">
+        <span className="typography-label-sm text-description">{label}</span>
+        <span className="typography-title-lg">{value}</span>
+      </div>
+    </div>
+  )
+}
+
 const Dashboard: NextPage = () => {
   const translation = useTasksTranslation()
   const { user, myTasksCount, totalPatientsCount, selectedRootLocationIds } = useTasksContext()
-  const { data } = useGetOverviewDataQuery(undefined, {})
+  const { data } = useGetOverviewDataQuery({
+    recentPatientsFiltering: undefined,
+    recentPatientsSorting: undefined,
+    recentPatientsPagination: undefined,
+    recentPatientsSearch: undefined,
+    recentTasksFiltering: undefined,
+    recentTasksSorting: undefined,
+    recentTasksPagination: undefined,
+    recentTasksSearch: undefined,
+  }, {})
   const queryClient = useQueryClient()
   const selectedRootLocationIdsForQuery = selectedRootLocationIds && selectedRootLocationIds.length > 0 ? selectedRootLocationIds : undefined
 
@@ -91,7 +132,7 @@ const Dashboard: NextPage = () => {
       }
       return updates
     },
-    invalidateQueries: [['GetOverviewData'], ['GetTasks'], ['GetPatients'], ['GetGlobalData']],
+    affectedQueryKeys: [['GetOverviewData'], ['GetTasks'], ['GetPatients'], ['GetGlobalData']],
   })
 
   const { mutate: reopenTask } = useSafeMutation<ReopenTaskMutation, ReopenTaskMutationVariables>({
@@ -132,224 +173,68 @@ const Dashboard: NextPage = () => {
       }
       return updates
     },
-    invalidateQueries: [['GetOverviewData'], ['GetTasks'], ['GetPatients'], ['GetGlobalData']],
+    affectedQueryKeys: [['GetOverviewData'], ['GetTasks'], ['GetPatients'], ['GetGlobalData']],
   })
 
   const recentPatients = useMemo(() => data?.recentPatients ?? [], [data])
   const recentTasks = useMemo(() => data?.recentTasks ?? [], [data])
 
-  const taskColumns = useMemo<ColumnDef<typeof recentTasks[0]>[]>(() => [
-    {
-      id: 'done',
-      header: translation('status'),
-      accessorKey: 'done',
-      cell: ({ row }) => (
-        <div onClick={(e) => e.stopPropagation()}>
-          <CheckboxUncontrolled
-            checked={row.original.done}
-            onCheckedChange={(checked) => {
-              if (!checked) {
-                completeTask({ id: row.original.id })
-              } else {
-                reopenTask({ id: row.original.id })
-              }
-            }}
-            className={clsx('rounded-full')}
-          />
-        </div>
-      ),
-      minSize: 110,
-      size: 110,
-      maxSize: 110,
-      enableResizing: false,
-    },
-    {
-      id: 'title',
-      header: translation('task'),
-      accessorKey: 'title',
-      cell: ({ row }) => {
-        return row.original.title
-      },
-      minSize: 200,
-    },
-    {
-      id: 'patient',
-      header: translation('patient'),
-      accessorKey: 'patient',
-      cell: ({ row }) => {
-        const patient = row.original.patient
-        if (!patient) return <span>-</span>
-
-        return (
-          <Button
-            color="neutral"
-            size="small"
-            onClick={(e) => {
-              e.stopPropagation()
-              setSelectedPatientId(patient.id)
-            }}
-            className="flex-row-0 justify-start w-fit"
-          >
-            {patient.name}
-          </Button>
-        )
-      },
-      minSize: 150,
-    },
-    {
-      id: 'dueDate',
-      header: translation('dueDate'),
-      accessorKey: 'dueDate',
-      cell: ({ row }) => {
-        if (!row.original.dueDate) return <span className="text-description">-</span>
-        const overdue = isOverdue(row.original.dueDate, row.original.done)
-        const closeToDue = isCloseToDueDate(row.original.dueDate, row.original.done)
-        let colorClass = ''
-        if (overdue) {
-          colorClass = '!text-red-500'
-        } else if (closeToDue) {
-          colorClass = '!text-orange-500'
-        }
-        return (
-          <SmartDate
-            date={new Date(row.original.dueDate)}
-            mode="relative"
-            className={clsx(colorClass)}
-          />
-        )
-      },
-      minSize: 150,
-      size: 150,
-      maxSize: 200,
-    },
-    {
-      id: 'date',
-      header: translation('updated'),
-      cell: ({ row }) => (
-        <SmartDate date={row.original.updateDate ? new Date(row.original.updateDate) : new Date()}/>
-      ),
-      minSize: 100,
-    }
-  ], [translation, completeTask, reopenTask])
-
-  const patientColumns = useMemo<ColumnDef<typeof recentPatients[0]>[]>(() => [
-    {
-      id: 'name',
-      header: translation('name'),
-      accessorKey: 'name',
-      minSize: 150,
-    },
-    {
-      id: 'location',
-      header: translation('location'),
-      accessorKey: 'position',
-      cell: ({ row }) => (
-        <LocationChips locations={row.original.position ? [row.original.position] : []} small />
-      ),
-      minSize: 150,
-    },
-    {
-      id: 'updated',
-      header: translation('updated'),
-      accessorKey: 'tasks',
-      cell: ({ row }) => {
-        const tasks = row.original.tasks || []
-        const updateDates = tasks
-          .map(t => t.updateDate ? new Date(t.updateDate) : null)
-          .filter((d): d is Date => d !== null)
-          .sort((a, b) => b.getTime() - a.getTime())
-
-        const mostRecentDate = updateDates[0]
-        if (!mostRecentDate) return <span className="text-description">-</span>
-
-        return <SmartDate date={mostRecentDate} />
-      },
-      minSize: 100,
-    }
-  ], [translation])
 
   return (
     <Page pageTitle={titleWrapper(translation('homePage'))}>
-      <div className="flex-col-8 p-4">
-        <div className="flex-row-4 items-center">
-          <Avatar
-            size="lg"
-            fullyRounded
-            image={user?.avatarUrl ? { avatarUrl: user.avatarUrl, alt: user.name } : undefined}
-          />
-          <div className="flex-col-1">
-            <h1 className="typography-title-lg">{translation(getGreetingKey() as 'dashboardWelcomeMorning' | 'dashboardWelcomeNoon' | 'dashboardWelcomeAfternoon' | 'dashboardWelcomeEvening' | 'dashboardWelcomeNight', { name: user?.name ?? '' })}</h1>
-            <p className="typography-body text-description">{translation('dashboardWelcomeDescription')}</p>
-          </div>
-        </div>
-
-        <div className="flex flex-col sm:flex-row flex-wrap gap-4">
+      <div className="flex-col-8">
+        <GreetingSection userName={user?.name} userAvatarUrl={user?.avatarUrl} />
 
-          <Link href="/tasks" className="min-w-[200px] min-h-[80px] flex-1 w-full sm:w-auto">
-            <div className="bg-surface rounded-lg p-4 shadow-sm flex-row-4 items-center border border-border h-full">
-              <div className="p-3 bg-primary/10 rounded-full text-primary">
-                <ListCheckIcon size={24}/>
-              </div>
-              <div className="flex-col-0">
-                <span className="typography-label-sm text-description">{translation('myOpenTasks')}</span>
-                <span className="typography-title-lg">{myTasksCount}</span>
-              </div>
-            </div>
+        <div className="flex flex-wrap gap-4">
+          <Link href="/tasks" className="min-w-60 min-h-20 flex-1 w-full sm:w-auto rounded-lg">
+            <StatCard
+              label={translation('myOpenTasks')}
+              value={myTasksCount}
+              icon={<ListCheckIcon className="size-force-5"/>}
+              iconWrapperClassName="bg-primary/10 text-primary"
+            />
           </Link>
 
-          <Link href="/patients" className="min-w-[200px] min-h-[80px] flex-1 w-full sm:w-auto">
-            <div className="bg-surface rounded-lg p-4 shadow-sm flex-row-4 items-center border border-border h-full">
-              <div className="p-3 bg-green-500/10 rounded-full text-green-600">
-                <UsersIcon size={24}/>
-              </div>
-              <div className="flex-col-0">
-                <span className="typography-label-sm text-description">{translation('totalPatients')}</span>
-                <span className="typography-title-lg">{totalPatientsCount}</span>
-              </div>
-            </div>
+          <Link href="/patients" className="min-w-60 min-h-20 flex-1 w-full sm:w-auto rounded-lg">
+            <StatCard
+              label={translation('totalPatients')}
+              value={totalPatientsCount}
+              icon={<UsersIcon className="size-force-5"/>}
+              iconWrapperClassName="bg-positive/10 text-positive"
+            />
           </Link>
 
-          <div className="min-w-[200px] min-h-[80px] flex-1 w-full sm:w-auto bg-surface rounded-lg p-4 shadow-sm flex-row-4 items-center border border-border">
-            <div className="p-3 bg-blue-500/10 rounded-full text-blue-600">
-              <ClockIcon size={24}/>
-            </div>
-            <div className="flex-col-0">
-              <span className="typography-label-sm text-description">{translation('currentTime')}</span>
-              <span className="typography-title-lg">
-                <CurrentTime/>
-              </span>
-            </div>
+          <div className="min-w-60 min-h-20 flex-1 w-full sm:w-auto">
+            <StatCard
+              label={translation('currentTime')}
+              value={<CurrentTime/>}
+              icon={<ClockIcon className="size-force-5"/>}
+              iconWrapperClassName="bg-secondary/10 text-secondary"
+            />
           </div>
         </div>
 
-        <div className="flex flex-col xl:flex-row gap-4 xl:gap-6 mt-4">
-          <ContentPanel titleElement={translation('recentTasks')} description={translation('tasksUpdatedRecently')} className="xl:w-[calc(60%-14.4px)] flex-shrink-0">
-            <div className="overflow-x-auto -mx-4 px-4 lg:mx-0 lg:px-0">
-              <Table
-                className="cursor-pointer w-full"
-                data={recentTasks}
-                columns={taskColumns}
-                fillerRow={() => (<FillerRowElement className="min-h-6"/>)}
-                onRowClick={(row) => setSelectedTaskId(row.original.id)}
-              />
-            </div>
-          </ContentPanel>
+        <div className="flex flex-wrap gap-4 2xl:flex-row 2xl:flex-nowrap print-content">
+          <RecentTasksTable
+            tasks={recentTasks}
+            completeTask={useCallback((id) => completeTask({ id }), [completeTask])}
+            reopenTask={useCallback((id) => reopenTask({ id }), [reopenTask])}
+            onSelectPatient={setSelectedPatientId}
+            onSelectTask={setSelectedTaskId}
+            className="w-full 2xl:min-w-150 flex-1"
+          />
 
-          <ContentPanel titleElement={translation('recentPatients')} description={translation('patientsUpdatedRecently')} className="xl:w-[calc(40%-9.6px)] flex-shrink-0">
-            <div className="overflow-x-auto -mx-4 px-4 lg:mx-0 lg:px-0">
-              <Table
-                className="cursor-pointer w-full"
-                data={recentPatients}
-                columns={patientColumns}
-                fillerRow={() => (<FillerRowElement className="min-h-6"/>)}
-                onRowClick={(row) => setSelectedPatientId(row.original.id)}
-              />
-            </div>
-          </ContentPanel>
+          <RecentPatientsTable
+            patients={recentPatients}
+            onSelectPatient={setSelectedPatientId}
+            className="w-full 2xl: min-w-100 2xl:w-2/5"
+          />
         </div>
 
-        <SidePanel
-          title={translation('editPatient')}
+        <Drawer
+          alignment="right"
+          titleElement={translation('editPatient')}
+          description={undefined}
           isOpen={!!selectedPatientId}
           onClose={() => setSelectedPatientId(null)}
         >
@@ -360,10 +245,12 @@ const Dashboard: NextPage = () => {
               onSuccess={() => {}}
             />
           )}
-        </SidePanel>
+        </Drawer>
 
-        <SidePanel
-          title={translation('editTask')}
+        <Drawer
+          alignment="right"
+          titleElement={translation('editTask')}
+          description={undefined}
           isOpen={!!selectedTaskId}
           onClose={() => setSelectedTaskId(null)}
         >
@@ -374,7 +261,7 @@ const Dashboard: NextPage = () => {
               onSuccess={() => {}}
             />
           )}
-        </SidePanel>
+        </Drawer>
 
       </div>
     </Page>
diff --git a/web/pages/location/[id].tsx b/web/pages/location/[id].tsx
index 77863e84..5ab0cc5b 100644
--- a/web/pages/location/[id].tsx
+++ b/web/pages/location/[id].tsx
@@ -3,9 +3,10 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { LoadingContainer, Tab, TabView, Chip, Button } from '@helpwave/hightide'
-import { PatientList } from '@/components/patients/PatientList'
-import { TaskList, type TaskViewModel } from '@/components/tasks/TaskList'
+import { LoadingContainer, TabSwitcher, Chip, Button, TabPanel } from '@helpwave/hightide'
+import { PatientList } from '@/components/tables/PatientList'
+import type { TaskViewModel } from '@/components/tables/TaskList'
+import { TaskList } from '@/components/tables/TaskList'
 import { useGetLocationNodeQuery, useGetPatientsQuery, useGetTasksQuery, type LocationType } from '@/api/gql/generated'
 import { useMemo, useState } from 'react'
 import { useRouter } from 'next/router'
@@ -166,15 +167,13 @@ const LocationPage: NextPage = () => {
                 <span className="typography-title-lg font-bold">{locationTitle}</span>
                 {locationKind && (
                   <Chip
-                    size="small"
-                    color="none"
-                    className={`text-[8px] font-bold px-0.5 py-0.5 rounded uppercase tracking-wider ${getKindStyles(locationKind)}`}
+                    size="sm"
+                    color={undefined}
+                    className={`text-[0.625rem] font-bold px-1 py-0.5 rounded-md uppercase tracking-wider ${getKindStyles(locationKind)}`}
                   >
                     {translation('locationType', { type: locationKind })}
                   </Chip>
                 )}
-              </div>
-              {parentChain.length > 0 && (
                 <div className="flex flex-wrap items-center -space-x-1 scale-75 origin-top-left">
                   {parentChain.map((parent, index) => (
                     <div key={parent.id} className="flex items-center">
@@ -183,7 +182,7 @@ const LocationPage: NextPage = () => {
                     </div>
                   ))}
                 </div>
-              )}
+              </div>
             </div>
           )
         }
@@ -197,11 +196,11 @@ const LocationPage: NextPage = () => {
           </div>
         )}
         {!isLoading && !isError && (
-          <TabView>
-            <Tab label={translation('patients')}>
-              <PatientList rootLocationIds={id ? [id] : undefined} />
-            </Tab>
-            <Tab label={translation('tasks')}>
+          <TabSwitcher>
+            <TabPanel label={translation('patients')}>
+              <PatientList />
+            </TabPanel>
+            <TabPanel label={translation('tasks')}>
               <TaskList
                 tasks={tasks}
                 onRefetch={handleRefetch}
@@ -219,8 +218,8 @@ const LocationPage: NextPage = () => {
                   ) : undefined
                 }
               />
-            </Tab>
-          </TabView>
+            </TabPanel>
+          </TabSwitcher>
         )}
       </ContentPanel>
     </Page>
diff --git a/web/pages/patients/index.tsx b/web/pages/patients/index.tsx
index 7d310a63..3eb0006a 100644
--- a/web/pages/patients/index.tsx
+++ b/web/pages/patients/index.tsx
@@ -4,7 +4,7 @@ import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
 import { useTasksContext } from '@/hooks/useTasksContext'
-import { PatientList } from '@/components/patients/PatientList'
+import { PatientList } from '@/components/tables/PatientList'
 import { useRouter } from 'next/router'
 
 const PatientsPage: NextPage = () => {
diff --git a/web/pages/properties/index.tsx b/web/pages/properties/index.tsx
index c971a61e..d8e79d08 100644
--- a/web/pages/properties/index.tsx
+++ b/web/pages/properties/index.tsx
@@ -3,12 +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 { Button, Chip, FillerRowElement, LoadingContainer, Table } from '@helpwave/hightide'
-import { useMemo, useState } from 'react'
+import { Button, Chip, FillerCell, LoadingContainer, Table } from '@helpwave/hightide'
+import { useCallback, useMemo, useState } from 'react'
 import type { ColumnDef } from '@tanstack/table-core'
 import { EditIcon, PlusIcon } from 'lucide-react'
-import { SidePanel } from '@/components/layout/SidePanel'
-import type { Property } from '@/components/PropertyList'
+import { Drawer } from '@helpwave/hightide'
+import type { Property } from '@/components/tables/PropertyList'
 import { PropertyDetailView } from '@/components/properties/PropertyDetailView'
 import { useGetPropertyDefinitionsQuery, FieldType, PropertyEntity } from '@/api/gql/generated'
 
@@ -84,28 +84,30 @@ const PropertiesPage: NextPage = () => {
       minSize: 200,
       size: 250,
       maxSize: 300,
+      filterFn: 'text',
     },
     {
       id: 'fieldType',
       header: translation('type'),
-      accessorKey: 'fieldType',
+      accessorFn: ({ fieldType }) => fieldType.toString(),
       cell: ({ row }) => {
         const value = row.original.fieldType
 
         return (
-          <Chip size="small" className="coloring-tonal" color="primary">
+          <Chip className="coloring-tonal" color="primary">
             <span>{translation('sPropertyType', { type: value })}</span>
           </Chip>
         )
       },
-      minSize: 100,
-      size: 100,
-      maxSize: 150,
+      minSize: 160,
+      size: 160,
+      maxSize: 250,
+      filterFn: 'text',
     },
     {
       id: 'subjectType',
       header: translation('subjectType'),
-      accessorKey: 'subjectType',
+      accessorFn: ({ subjectType }) => subjectType.toString(),
       cell: ({ row }) => {
         const data = row.original
         return (
@@ -114,14 +116,15 @@ const PropertiesPage: NextPage = () => {
           </span>
         )
       },
-      minSize: 150,
-      size: 150,
+      minSize: 200,
+      size: 200,
       maxSize: 250,
+      filterFn: 'text',
     },
     {
       id: 'active',
       header: translation('status'),
-      accessorKey: 'isArchived',
+      accessorFn: ({ isArchived }) => !isArchived,
       cell: ({ row }) => {
         return (
           <Chip className="coloring-tonal" color={row.original.isArchived ? 'negative' : 'positive'}>
@@ -131,6 +134,7 @@ const PropertiesPage: NextPage = () => {
       },
       minSize: 100,
       size: 120,
+      filterFn: 'boolean',
     },
     {
       id: 'actions',
@@ -159,24 +163,36 @@ const PropertiesPage: NextPage = () => {
         titleElement={translation('properties')}
         description={data ?  translation('nPatient', { count: data.length }) : (<LoadingContainer/>) }
         actionElement={(
-          <Button startIcon={<PlusIcon/>} onClick={handleAdd}>
+          <Button onClick={handleAdd}>
+            <PlusIcon/>
             {translation('rAdd', { name: translation('property') })}
           </Button>
         )}
       >
         <div className="overflow-x-auto -mx-4 px-4 lg:mx-0 lg:px-0">
           <Table
-            className="w-full h-full min-w-[600px]"
-            data={data ?? []}
-            columns={columns}
-            fillerRow={() => (<FillerRowElement className="min-h-12"/>)}
+            className="w-full h-full min-w-150"
+            table={{
+              data: data ?? [],
+              columns,
+              isUsingFillerRows: true,
+              fillerRowCell: useCallback(() => (<FillerCell className="min-h-12"/>), []),
+              initialState: {
+                pagination: {
+                  pageSize: 25,
+                }
+              }
+            }}
           />
         </div>
       </ContentPanel>
-      <SidePanel
+
+      <Drawer
+        alignment="right"
+        titleElement={translation(!selected ? 'rAdd': 'rEdit', { name: translation('property') })}
+        description={undefined}
         isOpen={isPanelOpen}
         onClose={handleClose}
-        title={translation(!selected ? 'rAdd': 'rEdit', { name: translation('property') })}
       >
         <PropertyDetailView
           id={selected?.id}
@@ -184,7 +200,7 @@ const PropertiesPage: NextPage = () => {
           onClose={handleClose}
           onSuccess={refetch}
         />
-      </SidePanel>
+      </Drawer>
     </Page>
   )
 }
diff --git a/web/pages/settings/index.tsx b/web/pages/settings/index.tsx
index 1c34ec91..8a29bb99 100644
--- a/web/pages/settings/index.tsx
+++ b/web/pages/settings/index.tsx
@@ -176,8 +176,7 @@ const SettingsPage: NextPage = () => {
           <section className="flex-row-4 items-center p-4 bg-surface-1 rounded-lg border border-divider">
             <div className="relative">
               <AvatarStatusComponent
-                size="xl"
-                fullyRounded
+                size="lg"
                 image={previewUrl ? { avatarUrl: previewUrl, alt: user?.name || '' } : (user?.avatarUrl ? { avatarUrl: user.avatarUrl, alt: user?.name || '' } : undefined)}
                 isOnline={user?.isOnline ?? null}
               />
@@ -207,17 +206,17 @@ const SettingsPage: NextPage = () => {
                   <Button
                     color="neutral"
                     coloringStyle="outline"
-                    size="small"
-                    startIcon={<Upload className="w-4 h-4" />}
+                    size="sm"
                     className="pointer-events-none"
                   >
+                    <Upload className="w-4 h-4" />
                     {selectedFile ? 'Change Picture' : 'Upload Picture'}
                   </Button>
                 </label>
                 {selectedFile && (
                   <Button
                     color="primary"
-                    size="small"
+                    size="sm"
                     onClick={handleUpload}
                     disabled={isUploading}
                   >
@@ -257,8 +256,8 @@ const SettingsPage: NextPage = () => {
                 coloringStyle="outline"
                 className="justify-start h-auto py-4"
                 onClick={() => router.push('/properties')}
-                startIcon={<TableProperties className="mr-2" />}
               >
+                <TableProperties className="mr-2" />
                 <div className="flex-col-1 items-start">
                   <span className="typography-label-lg">{translation('properties')}</span>
                   <span className="typography-body-sm text-description font-normal">
@@ -277,7 +276,7 @@ const SettingsPage: NextPage = () => {
                 <span className="typography-label-lg">{translation('language')}</span>
                 <Select
                   value={locale}
-                  onValueChanged={(language: string) => setLocale(language as HightideTranslationLocales)}
+                  onValueChange={(language: string) => setLocale(language as HightideTranslationLocales)}
                   buttonProps={{
                     selectedDisplay: (l) => LocalizationUtil.languagesLocalNames[l as HightideTranslationLocales],
                     className: 'w-full'
@@ -292,10 +291,10 @@ const SettingsPage: NextPage = () => {
               </div>
 
               <div className="flex-col-2">
-                <span className="typography-label-lg">{translation('themes', { count: 1 })}</span>
+                <span className="typography-label-lg">{translation('pThemes', { count: 1 })}</span>
                 <Select
                   value={theme}
-                  onValueChanged={(theme) => setTheme(theme as ThemeType)}
+                  onValueChange={(theme) => setTheme(theme as ThemeType)}
                   iconAppearance="right"
                   buttonProps={{
                     selectedDisplay: (value) => (
@@ -328,8 +327,8 @@ const SettingsPage: NextPage = () => {
                   color="neutral"
                   coloringStyle="outline"
                   onClick={handleRetakeSurvey}
-                  startIcon={<ClipboardList className="w-4 h-4" />}
                 >
+                  <ClipboardList className="w-4 h-4" />
                   {translation('retakeSurvey')}
                 </Button>
               )}
@@ -337,8 +336,8 @@ const SettingsPage: NextPage = () => {
                 color="neutral"
                 coloringStyle="outline"
                 onClick={() => setIsFeedbackDialogOpen(true)}
-                startIcon={<MessageSquareText className="w-4 h-4" />}
               >
+                <MessageSquareText className="w-4 h-4" />
                 {translation('feedback')}
               </Button>
             </div>
@@ -354,8 +353,8 @@ const SettingsPage: NextPage = () => {
                   const accountUrl = `${config.auth.issuer}/account`
                   window.open(accountUrl, '_blank', 'noopener,noreferrer')
                 }}
-                startIcon={<Shield className="w-4 h-4" />}
               >
+                <Shield className="w-4 h-4" />
                 {translation('security') ?? 'Security'}
               </Button>
 
@@ -363,8 +362,8 @@ const SettingsPage: NextPage = () => {
                 color="neutral"
                 coloringStyle="outline"
                 onClick={() => logout()}
-                startIcon={<LogOut className="w-4 h-4" />}
               >
+                <LogOut className="w-4 h-4" />
                 {translation('logout')}
               </Button>
 
@@ -372,8 +371,8 @@ const SettingsPage: NextPage = () => {
                 color="negative"
                 coloringStyle="outline"
                 onClick={handleClearCache}
-                startIcon={<Trash2 className="w-4 h-4" />}
               >
+                <Trash2 className="w-4 h-4" />
                 {translation('clearCache')}
               </Button>
             </div>
diff --git a/web/pages/tasks/index.tsx b/web/pages/tasks/index.tsx
index 1cda5e47..5b915eb1 100644
--- a/web/pages/tasks/index.tsx
+++ b/web/pages/tasks/index.tsx
@@ -3,9 +3,10 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { TaskList, type TaskViewModel } from '@/components/tasks/TaskList'
+import type { TaskViewModel } from '@/components/tables/TaskList'
+import { TaskList } from '@/components/tables/TaskList'
 import { useMemo } from 'react'
-import { GetTasksDocument, type GetTasksQuery } from '@/api/gql/generated'
+import { GetTasksDocument, type GetTasksQuery, type FullTextSearchInput } from '@/api/gql/generated'
 import { useRouter } from 'next/router'
 import { useTasksContext } from '@/hooks/useTasksContext'
 import { usePaginatedGraphQLQuery } from '@/hooks/usePaginatedQuery'
@@ -14,7 +15,7 @@ const TasksPage: NextPage = () => {
   const translation = useTasksTranslation()
   const router = useRouter()
   const { selectedRootLocationIds, user, myTasksCount } = useTasksContext()
-  const { data: tasksData, refetch } = usePaginatedGraphQLQuery<GetTasksQuery, GetTasksQuery['tasks'][0], { rootLocationIds?: string[], assigneeId?: string }>({
+  const { data: tasksData, refetch, totalCount } = usePaginatedGraphQLQuery<GetTasksQuery, GetTasksQuery['tasks'][0], { rootLocationIds?: string[], assigneeId?: string, search?: FullTextSearchInput }>({
     queryKey: ['GetTasks'],
     document: GetTasksDocument,
     baseVariables: {
@@ -23,6 +24,7 @@ const TasksPage: NextPage = () => {
     },
     pageSize: 50,
     extractItems: (result) => result.tasks,
+    extractTotalCount: (result) => result.tasksTotal ?? undefined,
     mode: 'infinite',
     enabled: !!selectedRootLocationIds && !!user,
     refetchOnWindowFocus: true,
@@ -52,6 +54,7 @@ const TasksPage: NextPage = () => {
       assignee: task.assignee
         ? { id: task.assignee.id, name: task.assignee.name, avatarURL: task.assignee.avatarUrl, isOnline: task.assignee.isOnline ?? null }
         : undefined,
+      properties: task.properties ?? [],
     }))
   }, [tasksData])
 
@@ -67,6 +70,7 @@ const TasksPage: NextPage = () => {
           showAssignee={false}
           initialTaskId={taskId}
           onInitialTaskOpened={() => router.replace('/tasks', undefined, { shallow: true })}
+          totalCount={totalCount}
         />
       </ContentPanel>
     </Page>
diff --git a/web/pages/teams/[id].tsx b/web/pages/teams/[id].tsx
index 157c8e9d..5e7839fd 100644
--- a/web/pages/teams/[id].tsx
+++ b/web/pages/teams/[id].tsx
@@ -3,9 +3,10 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { Button, LoadingContainer, Tab, TabView } from '@helpwave/hightide'
-import { PatientList } from '@/components/patients/PatientList'
-import { TaskList, type TaskViewModel } from '@/components/tasks/TaskList'
+import { Button, LoadingContainer, TabPanel, TabSwitcher } from '@helpwave/hightide'
+import { PatientList } from '@/components/tables/PatientList'
+import type { TaskViewModel } from '@/components/tables/TaskList'
+import { TaskList } from '@/components/tables/TaskList'
 import { useGetLocationNodeQuery, useGetPatientsQuery, useGetTasksQuery } from '@/api/gql/generated'
 import { useMemo, useState } from 'react'
 import { useRouter } from 'next/router'
@@ -97,11 +98,11 @@ const TeamPage: NextPage = () => {
           </div>
         )}
         {!isLoading && !isError && (
-          <TabView>
-            <Tab label={translation('patients')}>
+          <TabSwitcher>
+            <TabPanel label={translation('patients')}>
               <PatientList />
-            </Tab>
-            <Tab label={translation('tasks')}>
+            </TabPanel>
+            <TabPanel label={translation('tasks')}>
               <TaskList
                 tasks={tasks}
                 onRefetch={handleRefetch}
@@ -117,8 +118,8 @@ const TeamPage: NextPage = () => {
                   </Button>
                 )}
               />
-            </Tab>
-          </TabView>
+            </TabPanel>
+          </TabSwitcher>
         )}
       </ContentPanel>
     </Page>
diff --git a/web/pages/waitingroom/index.tsx b/web/pages/waitingroom/index.tsx
index f3ff9137..d5c65fa5 100644
--- a/web/pages/waitingroom/index.tsx
+++ b/web/pages/waitingroom/index.tsx
@@ -3,7 +3,7 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { PatientList } from '@/components/patients/PatientList'
+import { PatientList } from '@/components/tables/PatientList'
 import { useRouter } from 'next/router'
 import { PatientState } from '@/api/gql/generated'
 
diff --git a/web/pages/wards/[id].tsx b/web/pages/wards/[id].tsx
index 8ca30a5b..f52ee73f 100644
--- a/web/pages/wards/[id].tsx
+++ b/web/pages/wards/[id].tsx
@@ -3,9 +3,10 @@ import { Page } from '@/components/layout/Page'
 import titleWrapper from '@/utils/titleWrapper'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import { ContentPanel } from '@/components/layout/ContentPanel'
-import { LoadingContainer, Tab, TabView } from '@helpwave/hightide'
-import { PatientList } from '@/components/patients/PatientList'
-import { TaskList, type TaskViewModel } from '@/components/tasks/TaskList'
+import { LoadingContainer, TabSwitcher, TabPanel } from '@helpwave/hightide'
+import { PatientList } from '@/components/tables/PatientList'
+import type { TaskViewModel } from '@/components/tables/TaskList'
+import { TaskList } from '@/components/tables/TaskList'
 import { useGetLocationNodeQuery, GetPatientsDocument, type GetPatientsQuery } from '@/api/gql/generated'
 import { useMemo } from 'react'
 import { useRouter } from 'next/router'
@@ -31,9 +32,9 @@ const WardPage: NextPage = () => {
     pageSize: 50,
     extractItems: (result) => result.patients,
     mode: 'infinite',
-      enabled: !!id,
-      refetchOnWindowFocus: true,
-      refetchOnMount: true,
+    enabled: !!id,
+    refetchOnWindowFocus: true,
+    refetchOnMount: true,
   })
 
   const tasks: TaskViewModel[] = useMemo(() => {
@@ -80,18 +81,18 @@ const WardPage: NextPage = () => {
           </div>
         )}
         {!isLoading && !isError && (
-          <TabView>
-            <Tab label={translation('patients')}>
+          <TabSwitcher>
+            <TabPanel label={translation('patients')}>
               <PatientList />
-            </Tab>
-            <Tab label={translation('tasks')}>
+            </TabPanel>
+            <TabPanel label={translation('tasks')}>
               <TaskList
                 tasks={tasks}
                 onRefetch={refetchPatients}
                 showAssignee={true}
               />
-            </Tab>
-          </TabView>
+            </TabPanel>
+          </TabSwitcher>
         )}
       </ContentPanel>
     </Page>
diff --git a/web/postcss.config.mjs b/web/postcss.config.mjs
index c8e889a2..478530e9 100644
--- a/web/postcss.config.mjs
+++ b/web/postcss.config.mjs
@@ -1,6 +1,7 @@
 const config = {
   plugins: {
     '@tailwindcss/postcss': {},
+    'autoprefixer': {},
   }
 }
 
diff --git a/web/style/colors.css b/web/style/colors.css
index 555e380a..7c42222f 100644
--- a/web/style/colors.css
+++ b/web/style/colors.css
@@ -14,34 +14,132 @@
   --color-gender-neutral: var(--color-blue-500);
   --color-gender-on-neutral: var(--color-white);
   --color-gender-neutral-hover: var(--color-blue-600);
+
+  --color-location-hospital: var(--color-red-100);
+  --color-location-on-hospital: var(--color-red-700);
+
+  --color-location-practice: var(--color-indigo-100);
+  --color-location-on-practice: var(--color-indigo-700);
+
+  --color-location-clinic: var(--color-blue-100);
+  --color-location-on-clinic: var(--color-blue-700);
+
+  --color-location-team: var(--color-purple-100);
+  --color-location-on-team: var(--color-purple-700);
+
+  --color-location-ward: var(--color-orange-100);
+  --color-location-on-ward: var(--color-orange-700);
+
+  --color-location-room: var(--color-gray-100);
+  --color-location-on-room: var(--color-gray-700);
+
+  --color-location-bed: var(--color-emerald-100);
+  --color-location-on-bed: var(--color-emerald-700);
+
+  --color-priority-p1: var(--color-green-500);
+  --color-priority-on-p1: var(--color-green-700);
+
+  --color-priority-p2: var(--color-blue-500);
+  --color-priority-on-p2: var(--color-blue-700);
+
+  --color-priority-p3: var(--color-orange-500);
+  --color-priority-on-p3: var(--color-orange-700);
+
+  --color-priority-p4: var(--color-red-500);
+  --color-priority-on-p4: var(--color-red-700);
 }
 
 @layer base {
+
   /* Here are overrides for the light theme */
   @variant dark {
     /* Header */
     --color-header-background: var(--color-black);
     --color-header-text: var(--color-white);
+
+    /* Location colors */
+    --color-location-hospital: var(--color-red-900);
+    --color-location-on-hospital: var(--color-red-300);
+
+    --color-location-practice: var(--color-indigo-900);
+    --color-location-on-practice: var(--color-indigo-300);
+
+    --color-location-clinic: var(--color-blue-900);
+    --color-location-on-clinic: var(--color-blue-300);
+
+    --color-location-team: var(--color-purple-900);
+    --color-location-on-team: var(--color-purple-300);
+
+    --color-location-ward: var(--color-orange-900);
+    --color-location-on-ward: var(--color-orange-300);
+
+    --color-location-room: var(--color-gray-800);
+    --color-location-on-room: var(--color-gray-300);
+
+    --color-location-bed: var(--color-emerald-900);
+    --color-location-on-bed: var(--color-emerald-300);
   }
 }
 
 @utility gender-male {
-  @apply reset-coloring-variables;
+  @apply coloring-reset-variables;
   --coloring-color: var(--color-gender-male);
   --coloring-on-color: var(--color-gender-on-male);
   --coloring-hover: var(--color-gender-male-hover);
 }
 
 @utility gender-female {
-  @apply reset-coloring-variables;
+  @apply coloring-reset-variables;
   --coloring-color: var(--color-gender-female);
   --coloring-on-color: var(--color-gender-on-female);
   --coloring-hover: var(--color-gender-female-hover);
 }
 
 @utility gender-neutral {
-  @apply reset-coloring-variables;
+  @apply coloring-reset-variables;
   --coloring-color: var(--color-gender-neutral);
   --coloring-on-color: var(--color-gender-on-neutral);
   --coloring-hover: var(--color-gender-neutral-hover);
+}
+
+@utility location-hospital {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-hospital);
+  --coloring-on-color: var(--color-location-on-hospital);
+}
+
+@utility location-practice {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-practice);
+  --coloring-on-color: var(--color-location-on-practice);
+}
+
+@utility location-clinic {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-clinic);
+  --coloring-on-color: var(--color-location-on-clinic);
+}
+
+@utility location-team {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-team);
+  --coloring-on-color: var(--color-location-on-team);
+}
+
+@utility location-ward {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-ward);
+  --coloring-on-color: var(--color-location-on-ward);
+}
+
+@utility location-room {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-room);
+  --coloring-on-color: var(--color-location-on-room);
+}
+
+@utility location-bed {
+  @apply coloring-reset-variables;
+  --coloring-color: var(--color-location-bed);
+  --coloring-on-color: var(--color-location-on-bed);
 }
\ No newline at end of file
diff --git a/web/style/index.css b/web/style/index.css
new file mode 100644
index 00000000..900d0d09
--- /dev/null
+++ b/web/style/index.css
@@ -0,0 +1,2 @@
+@import "./colors.css";
+@import "./table-printing.css";
\ No newline at end of file
diff --git a/web/style/table-printing.css b/web/style/table-printing.css
new file mode 100644
index 00000000..e0b916e2
--- /dev/null
+++ b/web/style/table-printing.css
@@ -0,0 +1,161 @@
+@media print {
+    @page {
+        size: A4 landscape;
+        margin: 0;
+    }
+
+    * {
+        -webkit-print-color-adjust: exact !important;
+        print-color-adjust: exact !important;
+    }
+
+    * {
+        min-width: auto !important;
+        text-decoration: none !important;
+    }
+
+    html,
+    body {
+        width: 100% !important;
+        height: auto !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        overflow: hidden !important;
+        overflow-x: hidden !important;
+        overflow-y: hidden !important;
+        max-height: none !important;
+        max-width: 100% !important;
+        background: white !important;
+        color: black !important;
+    }
+
+    body * {
+        visibility: hidden;
+    }
+
+    .print-content,
+    .print-content * {
+        visibility: visible;
+    }
+
+    .print-content {
+        position: absolute;
+        width: 100% !important;
+        max-width: 100% !important;
+        left: 0 !important;
+        top: 0 !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        height: auto !important;
+        max-height: none !important;
+    }
+
+    .print-content table {
+        width: 100% !important;
+        max-width: 100% !important;
+
+        height: auto !important;
+        max-height: none !important;
+
+        margin: 0 !important;
+        padding: 0 !important;
+
+        font-size: 0.55rem;
+        page-break-inside: auto;
+
+        table-layout: fixed;
+        border-collapse: collapse;
+        border: 1px solid #000;
+
+        overflow: hidden !important;
+        overflow-x: hidden !important;
+        overflow-y: hidden !important;
+    }
+
+    .print-content thead tr {
+        page-break-after: avoid;
+        break-after: avoid;
+    }
+
+    /* TODO consider this, if all columns should have the same width
+    .print-content colgroup col {
+        width: auto !important;
+    }
+    */
+
+    .print-content thead tr th {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+        width: auto !important;
+        max-width: 100% !important;
+
+        font-size: 0.6rem !important;
+        text-align: left;
+        font-weight: bold;
+
+        padding: 0.25rem 0.3rem !important;
+        border: 1px solid #000 !important;
+        border-radius: 0 !important;
+
+        color: black !important;
+        background-color: #f0f0f0 !important;
+    }
+
+
+    .print-content tbody tr {
+        page-break-inside: avoid;
+        break-inside: avoid;
+    }
+
+    .print-content tbody tr td {
+        max-width: 100% !important;
+
+        font-size: 0.55rem !important;
+        text-align: left;
+        word-wrap: break-word;
+        overflow-wrap: break-word;
+        hyphens: auto;
+
+        padding: 0.2rem 0.3rem !important;
+        border: 1px solid #000 !important;
+        border-radius: 0 !important;
+
+        background: white !important;
+        color: black !important;
+    }
+
+    .print-content tbody tr:nth-child(even) td {
+        background-color: #f9f9f9 !important;
+    }
+
+    .print-content tbody tr.table-body-filler-row,
+    .print-content tbody tr:empty,
+    .print-content tbody tr:has(td:only-child) {
+        display: none !important;
+    }
+
+    .print-button,
+    button {
+        display: none !important;
+    }
+
+    a[href]:after {
+        content: "";
+    }
+
+    img {
+        max-width: 100% !important;
+        height: auto !important;
+    }
+
+    .print-content [data-name="chip"] {
+        font-size: 0.55rem !important;
+        padding: 0.1rem 0.25rem !important;
+
+        border: 1px solid #000 !important;
+
+        background: white !important;
+        color: black !important;
+    }
+}
\ No newline at end of file
diff --git a/web/utils/dueDate.ts b/web/utils/dueDate.ts
new file mode 100644
index 00000000..d2f7f705
--- /dev/null
+++ b/web/utils/dueDate.ts
@@ -0,0 +1,13 @@
+export const DueDateUtils = {
+  isOverdue: (dueDate: Date | undefined | null, done: boolean): boolean => {
+    if (!dueDate || done) return false
+    return new Date(dueDate).getTime() < Date.now()
+  },
+  isCloseToDueDate: (dueDate: Date | undefined | null, done: boolean): boolean => {
+    if (!dueDate || done) return false
+    const now = Date.now()
+    const dueTime = new Date(dueDate).getTime()
+    const oneHour = 60 * 60 * 1000
+    return dueTime > now && dueTime - now <= oneHour
+  }
+}
\ No newline at end of file
diff --git a/web/utils/priority.ts b/web/utils/priority.ts
new file mode 100644
index 00000000..fa60de5f
--- /dev/null
+++ b/web/utils/priority.ts
@@ -0,0 +1,36 @@
+import type { TaskPriority } from '@/api/gql/generated'
+
+function toBackgroundColor(priority: TaskPriority | null | undefined): string {
+  switch (priority) {
+  case 'P1':
+    return 'bg-priority-p1'
+  case 'P2':
+    return 'bg-priority-p2'
+  case 'P3':
+    return 'bg-priority-p3'
+  case 'P4':
+    return 'bg-priority-p4'
+  default:
+    return ''
+  }
+}
+
+function toCheckboxColor(priority: TaskPriority | null | undefined): string {
+  switch (priority) {
+  case 'P1':
+    return 'border-priority-p1 text-priority-p1 data-[checked=true]:bg-priority-p1/30 data-[checked=false]:bg-priority-p1/10'
+  case 'P2':
+    return 'border-priority-p2 text-priority-p2 data-[checked=true]:bg-priority-p2/30 data-[checked=false]:bg-priority-p2/10'
+  case 'P3':
+    return 'border-priority-p3 text-priority-p3 data-[checked=true]:bg-priority-p3/30 data-[checked=false]:bg-priority-p3/10'
+  case 'P4':
+    return 'border-priority-p4 text-priority-p4 data-[checked=true]:bg-priority-p4/30 data-[checked=false]:bg-priority-p4/10'
+  default:
+    return ''
+  }
+}
+
+export const PriorityUtils = {
+  toBackgroundColor,
+  toCheckboxColor,
+}
\ No newline at end of file
diff --git a/web/utils/propertyColumn.tsx b/web/utils/propertyColumn.tsx
new file mode 100644
index 00000000..d169b650
--- /dev/null
+++ b/web/utils/propertyColumn.tsx
@@ -0,0 +1,79 @@
+import type { ColumnDef } from '@tanstack/table-core'
+import { ColumnType, FieldType, type PropertyDefinitionType, type PropertyValueType } from '@/api/gql/generated'
+import { getPropertyFilterFn } from './propertyFilterMapping'
+import { PropertyCell } from '@/components/properties/PropertyCell'
+
+type PropertyValue = PropertyValueType & {
+  definition: PropertyDefinitionType,
+}
+
+type RowWithProperties = {
+  properties?: PropertyValue[] | null,
+}
+
+function getPropertyAccessorValue(
+  property: PropertyValue | undefined,
+  fieldType: FieldType
+): string | number | boolean | string[] | null {
+  if (!property) return null
+  if (fieldType === FieldType.FieldTypeMultiSelect) {
+    return property.multiSelectValues ?? null
+  }
+  return (
+    property.textValue ??
+    property.numberValue ??
+    property.booleanValue ??
+    property.dateValue ??
+    property.dateTimeValue ??
+    property.selectValue ??
+    null
+  )
+}
+
+function getFilterData(prop: PropertyDefinitionType) {
+  const filterFn = getPropertyFilterFn(prop.fieldType)
+  if (filterFn === 'tags' || filterFn === 'tagsSingle') {
+    return {
+      tags: prop.options.map((opt, idx) => ({
+        label: opt,
+        tag: `${prop.id}-opt-${idx}`,
+      })),
+    }
+  }
+  return undefined
+}
+
+export function createPropertyColumn<T extends RowWithProperties>(
+  prop: PropertyDefinitionType
+): ColumnDef<T> {
+  const columnId = `property_${prop.id}`
+  const filterFn = getPropertyFilterFn(prop.fieldType)
+  const filterData = getFilterData(prop)
+
+  return {
+    id: columnId,
+    header: prop.name,
+    accessorFn: (row) => {
+      const property = row.properties?.find(
+        p => p.definition.id === prop.id
+      )
+      return getPropertyAccessorValue(property, prop.fieldType)
+    },
+    cell: ({ row }) => {
+      const property = row.original.properties?.find(
+        p => p.definition.id === prop.id
+      )
+      return (<PropertyCell property={property} fieldType={prop.fieldType} />)
+    },
+    meta: {
+      columnType: ColumnType.Property,
+      propertyDefinitionId: prop.id,
+      fieldType: prop.fieldType,
+      ...(filterData && { filterData }),
+    },
+    minSize: 220,
+    size: 220,
+    maxSize: 300,
+    filterFn,
+  } as ColumnDef<T>
+}
diff --git a/web/utils/propertyFilterMapping.ts b/web/utils/propertyFilterMapping.ts
new file mode 100644
index 00000000..d8956c21
--- /dev/null
+++ b/web/utils/propertyFilterMapping.ts
@@ -0,0 +1,29 @@
+import { FieldType } from '@/api/gql/generated'
+import type { TableFilterCategory } from '@helpwave/hightide'
+
+/**
+ * Maps a FieldType to the appropriate filter function name for TanStack Table.
+ * This ensures consistent filter behavior across all property columns.
+ *
+ * Differentiates between:
+ * - date vs datetime (for proper date/time filtering)
+ * - tags (multi-select) vs tags_single (single select)
+ */
+export function getPropertyFilterFn(fieldType: FieldType): TableFilterCategory {
+  switch (fieldType) {
+  case FieldType.FieldTypeCheckbox:
+    return 'boolean'
+  case FieldType.FieldTypeDate:
+    return 'date'
+  case FieldType.FieldTypeDateTime:
+    return 'dateTime'
+  case FieldType.FieldTypeNumber:
+    return 'number'
+  case FieldType.FieldTypeSelect:
+    return 'tagsSingle'
+  case FieldType.FieldTypeMultiSelect:
+    return 'tags'
+  default:
+    return 'text'
+  }
+}
diff --git a/web/utils/tableToGraphQL.ts b/web/utils/tableToGraphQL.ts
new file mode 100644
index 00000000..77a5243f
--- /dev/null
+++ b/web/utils/tableToGraphQL.ts
@@ -0,0 +1,132 @@
+import type { ColumnDef, TableState } from '@tanstack/table-core'
+import type {
+  FilterInput,
+  SortInput,
+  PaginationInput,
+  FullTextSearchInput,
+  FilterParameter
+} from '@/api/gql/generated'
+import { ColumnType, SortDirection, FilterOperator } from '@/api/gql/generated'
+
+export function mapTableStateToGraphQL<TData>(
+  tableState: TableState | undefined,
+  columns: ColumnDef<TData>[],
+  searchText: string | undefined
+): {
+  filtering: FilterInput[] | undefined,
+  sorting: SortInput[] | undefined,
+  pagination: PaginationInput | undefined,
+  search: FullTextSearchInput | undefined,
+} {
+  const filtering: FilterInput[] = []
+  const sorting: SortInput[] = []
+
+  if (tableState?.columnFilters) {
+    for (const filter of tableState.columnFilters) {
+      const column = columns.find(col => col.id === filter.id)
+      if (!column) continue
+
+      const meta = column.meta as {
+        columnType?: ColumnType,
+        propertyDefinitionId?: string,
+        fieldType?: string,
+      } | undefined
+      const columnType = meta?.columnType ?? ColumnType.DirectAttribute
+
+      if (columnType === ColumnType.Property && !meta?.propertyDefinitionId) {
+        continue
+      }
+
+      const filterValue = filter.value
+      if (filterValue === undefined || filterValue === null || filterValue === '') {
+        continue
+      }
+
+      let operator: FilterOperator
+      let parameter: FilterParameter
+
+      if (Array.isArray(filterValue)) {
+        if (
+          columnType === ColumnType.Property &&
+          meta?.fieldType === 'FIELD_TYPE_MULTI_SELECT'
+        ) {
+          operator = FilterOperator.TagsContains
+        } else {
+          operator = FilterOperator.TagsSingleContains
+        }
+        parameter = {
+          searchTags: filterValue,
+        }
+      } else if (typeof filterValue === 'boolean') {
+        operator = filterValue
+          ? FilterOperator.BooleanIsTrue
+          : FilterOperator.BooleanIsFalse
+        parameter = {}
+      } else if (typeof filterValue === 'string') {
+        operator = FilterOperator.TextContains
+        parameter = {
+          searchText: filterValue,
+          isCaseSensitive: false,
+        }
+      } else {
+        continue
+      }
+
+      filtering.push({
+        column: filter.id,
+        operator,
+        parameter,
+        columnType: columnType,
+        propertyDefinitionId: columnType === ColumnType.Property ? meta?.propertyDefinitionId : undefined,
+      })
+    }
+  }
+
+  if (tableState?.sorting) {
+    for (const sort of tableState.sorting) {
+      const column = columns.find(col => col.id === sort.id)
+      if (!column) continue
+
+      const meta = column.meta as {
+        columnType?: ColumnType,
+        propertyDefinitionId?: string,
+      } | undefined
+      const columnType = meta?.columnType ?? ColumnType.DirectAttribute
+
+      if (columnType === ColumnType.Property && !meta?.propertyDefinitionId) {
+        continue
+      }
+
+      sorting.push({
+        column: sort.id,
+        direction: sort.desc ? SortDirection.Desc : SortDirection.Asc,
+        columnType: columnType,
+        propertyDefinitionId:
+          columnType === ColumnType.Property
+            ? meta?.propertyDefinitionId
+            : undefined,
+      })
+    }
+  }
+
+  const pagination: PaginationInput | undefined = tableState?.pagination
+    ? {
+      pageIndex: tableState.pagination.pageIndex,
+      pageSize: tableState.pagination.pageSize ?? undefined,
+    }
+    : undefined
+
+  const search: FullTextSearchInput | undefined = searchText
+    ? {
+      searchText: searchText,
+      includeProperties: true,
+    }
+    : undefined
+
+  return {
+    filtering: filtering.length > 0 ? filtering : undefined,
+    sorting: sorting.length > 0 ? sorting : undefined,
+    pagination,
+    search,
+  }
+}