diff --git a/messages/en.json b/messages/en.json
index 79d9a7b..a5b0ca4 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -9,9 +9,8 @@
   "admin_contests_card_start": "Start:",
   "admin_contests_card_tasks": "Tasks",
   "admin_contests_card_user_prefix": "User #",
-  "admin_contests_card_view_tasks": "View Contest Tasks",
+  "admin_contests_card_manage_tasks": "Manage Tasks",
   "admin_contests_card_view_requests": "Registration Requests",
-  "admin_contests_card_add_tasks": "Add Tasks to Contest",
   "admin_contests_create_description": "Set up a new programming contest",
   "admin_contests_create_error": "Failed to create contest",
   "admin_contests_create_success": "Contest created successfully!",
@@ -80,6 +79,30 @@
   "admin_contest_tasks_remove_cancel": "Cancel",
   "admin_contest_tasks_remove_success": "Task removed from contest successfully!",
   "admin_contest_tasks_remove_error": "Failed to remove task from contest",
+  "admin_contest_tasks_manage_title": "Manage Contest Tasks",
+  "admin_contest_tasks_added": "Added Tasks",
+  "admin_contest_tasks_search_placeholder": "Search tasks...",
+  "admin_contest_tasks_no_results_title": "No tasks found",
+  "admin_contest_tasks_column_creator": "Creator",
+  "admin_contest_tasks_edit_schedule_title": "Edit Schedule",
+  "admin_contest_tasks_edit_dialog_title": "Edit Task Schedule",
+  "admin_contest_tasks_edit_dialog_description": "Update when this task is available in the contest.",
+  "admin_contest_tasks_update_button": "Save Changes",
+  "admin_contest_tasks_update_success": "Task schedule updated successfully!",
+  "admin_contest_tasks_update_error": "Failed to update task schedule",
+  "admin_contest_tasks_column_id": "ID",
+  "admin_contest_tasks_column_title": "Title",
+  "admin_contest_tasks_column_start_at": "Available From",
+  "admin_contest_tasks_column_end_at": "Available Until",
+  "admin_contest_tasks_column_created_at": "Created At",
+  "admin_contest_tasks_column_actions": "Actions",
+  "admin_contest_tasks_pagination_page": "Page",
+  "admin_contest_tasks_pagination_of": "of",
+  "admin_contest_tasks_pagination_rows_per_page": "Rows per page",
+  "admin_contest_tasks_pagination_total": "{total} total tasks",
+  "admin_contest_tasks_pagination_prev": "Previous",
+  "admin_contest_tasks_pagination_next": "Next",
+  "admin_contest_tasks_pagination_showing_range": "Showing {from}-{to} of {total} tasks",
   "admin_registration_requests_approve": "Approve",
   "admin_registration_requests_email": "Email",
   "admin_registration_requests_load_error": "Failed to load registration requests",
diff --git a/messages/pl.json b/messages/pl.json
index 87befe4..93fd026 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -9,9 +9,8 @@
   "admin_contests_card_start": "Początek:",
   "admin_contests_card_tasks": "Zadania",
   "admin_contests_card_user_prefix": "Użytkownik #",
-  "admin_contests_card_view_tasks": "Zobacz Zadania Konkursu",
+  "admin_contests_card_manage_tasks": "Zarządzaj Zadania",
   "admin_contests_card_view_requests": "Prośby o Rejestrację",
-  "admin_contests_card_add_tasks": "Dodaj Zadania do Konkursu",
   "admin_contests_create_description": "Skonfiguruj nowy konkurs programistyczny",
   "admin_contests_create_error": "Nie udało się utworzyć konkursu",
   "admin_contests_create_success": "Konkurs został pomyślnie utworzony!",
@@ -80,6 +79,30 @@
   "admin_contest_tasks_remove_cancel": "Anuluj",
   "admin_contest_tasks_remove_success": "Zadanie zostało pomyślnie usunięte z konkursu!",
   "admin_contest_tasks_remove_error": "Nie udało się usunąć zadania z konkursu",
+  "admin_contest_tasks_manage_title": "Zarządzaj Zadaniami Konkursu",
+  "admin_contest_tasks_added": "Dodane Zadania",
+  "admin_contest_tasks_search_placeholder": "Szukaj zadań...",
+  "admin_contest_tasks_no_results_title": "Nie znaleziono zadań",
+  "admin_contest_tasks_column_creator": "Autor",
+  "admin_contest_tasks_edit_schedule_title": "Edytuj Harmonogram",
+  "admin_contest_tasks_edit_dialog_title": "Edytuj Harmonogram Zadania",
+  "admin_contest_tasks_edit_dialog_description": "Zaktualizuj, kiedy to zadanie będzie dostępne w konkursie.",
+  "admin_contest_tasks_update_button": "Zapisz Zmiany",
+  "admin_contest_tasks_update_success": "Harmonogram zadania zaktualizowany pomyślnie!",
+  "admin_contest_tasks_update_error": "Nie udało się zaktualizować harmonogramu zadania",
+  "admin_contest_tasks_column_id": "ID",
+  "admin_contest_tasks_column_title": "Tytuł",
+  "admin_contest_tasks_column_start_at": "Dostępne od",
+  "admin_contest_tasks_column_end_at": "Dostępne do",
+  "admin_contest_tasks_column_created_at": "Utworzono",
+  "admin_contest_tasks_column_actions": "Akcje",
+  "admin_contest_tasks_pagination_page": "Strona",
+  "admin_contest_tasks_pagination_of": "z",
+  "admin_contest_tasks_pagination_rows_per_page": "Wierszy na stronę",
+  "admin_contest_tasks_pagination_total": "{total} zadań łącznie",
+  "admin_contest_tasks_pagination_prev": "Poprzednia",
+  "admin_contest_tasks_pagination_next": "Następna",
+  "admin_contest_tasks_pagination_showing_range": "Wyświetlanie {from}-{to} z {total} zadań",
   "admin_registration_requests_approve": "Zatwierdź",
   "admin_registration_requests_email": "Email",
   "admin_registration_requests_load_error": "Nie udało się załadować próśb o rejestrację",
diff --git a/src/lib/components/dashboard/admin/contests/AddedContestTasksList.svelte b/src/lib/components/dashboard/admin/contests/AddedContestTasksList.svelte
new file mode 100644
index 0000000..8839ef8
--- /dev/null
+++ b/src/lib/components/dashboard/admin/contests/AddedContestTasksList.svelte
@@ -0,0 +1,288 @@
+<script lang="ts">
+  import type { ContestTask } from '$lib/dto/task';
+  import { SortDirection, ContestTaskSortKey } from '$lib/dto/pagination';
+  import * as Table from '$lib/components/ui/table';
+  import * as Pagination from '$lib/components/ui/pagination';
+  import * as Tooltip from '$lib/components/ui/tooltip';
+  import { Button } from '$lib/components/ui/button';
+  import { Input } from '$lib/components/ui/input';
+  import ListTodo from '@lucide/svelte/icons/list-todo';
+  import User from '@lucide/svelte/icons/user';
+  import Calendar from '@lucide/svelte/icons/calendar';
+  import Search from '@lucide/svelte/icons/search';
+  import Pencil from '@lucide/svelte/icons/pencil';
+  import ArrowUp from '@lucide/svelte/icons/arrow-up';
+  import ArrowDown from '@lucide/svelte/icons/arrow-down';
+  import * as m from '$lib/paraglide/messages';
+  import { getPaginationPages, getCurrentPage, getTotalPages, getOffset, formatDate } from '$lib/utils';
+  import RemoveTaskFromContestButton from './RemoveTaskFromContestButton.svelte';
+
+  interface AddedContestTasksListProps {
+    contestTasks: ContestTask[];
+    total: number;
+    contestId: number;
+    limit: number;
+    offset: number;
+    sortKey: ContestTaskSortKey;
+    sortDir: SortDirection;
+    search: string;
+    onEdit: (contestTask: ContestTask) => void;
+    onSuccess?: () => void;
+  }
+
+  let {
+    contestTasks,
+    total,
+    contestId,
+    limit = $bindable(),
+    offset = $bindable(),
+    sortKey = $bindable(),
+    sortDir = $bindable(),
+    search = $bindable(),
+    onEdit,
+    onSuccess
+  }: AddedContestTasksListProps = $props();
+
+  let currentPage = $derived(getCurrentPage(offset, limit));
+  let totalPages = $derived(getTotalPages(total, limit));
+
+  let paginationPages = $derived(getPaginationPages(currentPage, totalPages));
+
+  function handleHeaderSort(key: ContestTaskSortKey) {
+    const dir =
+      sortKey === key
+        ? sortDir === SortDirection.Asc
+          ? SortDirection.Desc
+          : SortDirection.Asc
+        : SortDirection.Asc;
+
+    sortKey = key;
+    sortDir = dir;
+    offset = 0;
+  }
+
+  function handleLimitChange(newLimit: number) {
+    limit = newLimit;
+    offset = 0;
+  }
+
+  function getAriaSortValue(key: ContestTaskSortKey): 'ascending' | 'descending' | 'none' {
+    if (sortKey !== key) return 'none';
+    return sortDir === SortDirection.Asc ? 'ascending' : 'descending';
+  }
+
+  const perPageOptions = [5, 10, 20];
+</script>
+
+<div class="space-y-3">
+  <!-- Top bar: range + page size + search -->
+  <div class="flex flex-col gap-2 lg:flex-row lg:items-center lg:justify-between">
+    <div class="relative w-full lg:max-w-xs">
+      <Search class="absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+      <Input
+        type="text"
+        placeholder={m.admin_contest_tasks_search_placeholder()}
+        bind:value={search}
+        class="pl-9"
+      />
+    </div>
+
+    <div class="flex flex-wrap items-center gap-2">
+      <div class="text-xs text-muted-foreground">
+        {m.admin_contest_tasks_pagination_showing_range({
+          from: total === 0 ? 0 : offset + 1,
+          to: Math.min(offset + contestTasks.length, total),
+          total
+        })}
+      </div>
+      <div class="flex items-center gap-1 text-xs">
+        <span class="text-muted-foreground">{m.admin_contest_tasks_pagination_rows_per_page()}:</span>
+        <select
+          class="rounded-md border bg-background px-2 py-1 text-xs"
+          value={limit}
+          onchange={(e) => handleLimitChange(Number((e.target as HTMLSelectElement).value))}
+        >
+          {#each perPageOptions as opt (opt)}
+            <option value={opt}>{opt}</option>
+          {/each}
+        </select>
+      </div>
+      <div class="text-xs font-medium">
+        {m.admin_contest_tasks_pagination_page()}
+        {currentPage}
+        {m.admin_contest_tasks_pagination_of()}
+        {totalPages}
+      </div>
+    </div>
+  </div>
+
+  <!-- Data table -->
+  <Table.Root class="mt-1">
+    <Table.Header>
+      <Table.Row>
+        <Table.Head class="w-14" aria-sort={getAriaSortValue(ContestTaskSortKey.Id)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(ContestTaskSortKey.Id)}
+          >
+            {m.admin_contest_tasks_column_id()}
+            {#if sortKey === ContestTaskSortKey.Id}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head aria-sort={getAriaSortValue(ContestTaskSortKey.Title)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(ContestTaskSortKey.Title)}
+          >
+            {m.admin_contest_tasks_column_title()}
+            {#if sortKey === ContestTaskSortKey.Title}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head class="hidden md:table-cell">
+          {m.admin_contest_tasks_column_creator()}
+        </Table.Head>
+        <Table.Head aria-sort={getAriaSortValue(ContestTaskSortKey.StartAt)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(ContestTaskSortKey.StartAt)}
+          >
+            {m.admin_contest_tasks_column_start_at()}
+            {#if sortKey === ContestTaskSortKey.StartAt}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head aria-sort={getAriaSortValue(ContestTaskSortKey.EndAt)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(ContestTaskSortKey.EndAt)}
+          >
+            {m.admin_contest_tasks_column_end_at()}
+            {#if sortKey === ContestTaskSortKey.EndAt}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head class="text-right">{m.admin_contest_tasks_column_actions()}</Table.Head>
+      </Table.Row>
+    </Table.Header>
+
+    <Table.Body>
+      {#if contestTasks.length === 0}
+        <Table.Row>
+          <Table.Cell colspan={6} class="py-10 text-center text-sm text-muted-foreground">
+            {m.admin_contest_tasks_no_results_title()}
+          </Table.Cell>
+        </Table.Row>
+      {:else}
+        {#each contestTasks as contestTask (contestTask.task.id)}
+        <Table.Row>
+          <Table.Cell class="font-mono text-xs">{contestTask.task.id}</Table.Cell>
+          <Table.Cell>
+            <div class="flex min-w-0 items-center gap-2">
+              <ListTodo class="h-4 w-4 shrink-0 text-primary" />
+              <Tooltip.Root>
+                <Tooltip.Trigger class="min-w-0">
+                  <span class="block max-w-48 truncate font-medium text-foreground">
+                    {contestTask.task.title}
+                  </span>
+                </Tooltip.Trigger>
+                <Tooltip.Content side="top">{contestTask.task.title}</Tooltip.Content>
+              </Tooltip.Root>
+            </div>
+          </Table.Cell>
+          <Table.Cell class="hidden md:table-cell">
+            <div class="flex items-center gap-1.5 text-muted-foreground">
+              <User class="h-3.5 w-3.5 shrink-0" />
+              <span class="max-w-[160px] truncate">{contestTask.creatorName}</span>
+            </div>
+          </Table.Cell>
+          <Table.Cell>
+            <div class="flex items-center gap-1.5 text-muted-foreground">
+              <Calendar class="h-3.5 w-3.5 shrink-0" />
+              <span class="whitespace-nowrap">{formatDate(contestTask.startAt)}</span>
+            </div>
+          </Table.Cell>
+          <Table.Cell class="text-muted-foreground">
+            {#if contestTask.endAt}
+              <div class="flex items-center gap-1.5">
+                <Calendar class="h-3.5 w-3.5 shrink-0" />
+                <span class="whitespace-nowrap">{formatDate(contestTask.endAt)}</span>
+              </div>
+            {:else}
+              <span>{m.admin_contest_tasks_no_end_date()}</span>
+            {/if}
+          </Table.Cell>
+          <Table.Cell class="text-right">
+            <div class="flex items-center justify-end gap-1">
+              <Button
+                variant="ghost"
+                size="icon"
+                class="h-8 w-8 text-muted-foreground"
+                title={m.admin_contest_tasks_edit_schedule_title()}
+                onclick={() => onEdit(contestTask)}
+              >
+                <Pencil class="h-4 w-4" />
+              </Button>
+              <RemoveTaskFromContestButton
+                {contestId}
+                taskId={contestTask.task.id}
+                taskTitle={contestTask.task.title}
+                onSuccess={onSuccess}
+              />
+            </div>
+          </Table.Cell>
+        </Table.Row>
+        {/each}
+      {/if}
+    </Table.Body>
+  </Table.Root>
+
+  {#if total > 0}
+    <div class="flex flex-col items-center gap-2 pt-2">
+    <Pagination.Root
+      count={total}
+      perPage={limit}
+      page={currentPage}
+      siblingCount={1}
+      onPageChange={(p) => {
+        if (p && p !== currentPage) offset = getOffset(p, limit);
+      }}
+    >
+      <Pagination.Content>
+        <Pagination.PrevButton disabled={currentPage === 1}>
+          {m.admin_contest_tasks_pagination_prev()}
+        </Pagination.PrevButton>
+
+        {#each paginationPages as p (p)}
+          {#if p === 'ellipsis'}
+            <Pagination.Item>
+              <Pagination.Ellipsis />
+            </Pagination.Item>
+          {:else}
+            <Pagination.Item>
+              <Pagination.Link page={{ type: 'page', value: p }} isActive={p === currentPage} />
+            </Pagination.Item>
+          {/if}
+        {/each}
+
+        <Pagination.NextButton disabled={currentPage === totalPages}>
+          {m.admin_contest_tasks_pagination_next()}
+        </Pagination.NextButton>
+      </Pagination.Content>
+    </Pagination.Root>
+
+    <div class="text-xs text-muted-foreground">
+      {m.admin_contest_tasks_pagination_total({ total })}
+    </div>
+    </div>
+  {/if}
+</div>
diff --git a/src/lib/components/dashboard/admin/contests/AssignableContestTasksList.svelte b/src/lib/components/dashboard/admin/contests/AssignableContestTasksList.svelte
new file mode 100644
index 0000000..d5b650c
--- /dev/null
+++ b/src/lib/components/dashboard/admin/contests/AssignableContestTasksList.svelte
@@ -0,0 +1,256 @@
+<script lang="ts">
+  import type { Task } from '$lib/dto/task';
+  import { SortDirection, AssignableTaskSortKey } from '$lib/dto/pagination';
+  import * as Table from '$lib/components/ui/table';
+  import * as Pagination from '$lib/components/ui/pagination';
+  import * as Tooltip from '$lib/components/ui/tooltip';
+  import { Button } from '$lib/components/ui/button';
+  import { Input } from '$lib/components/ui/input';
+  import ListTodo from '@lucide/svelte/icons/list-todo';
+  import User from '@lucide/svelte/icons/user';
+  import Calendar from '@lucide/svelte/icons/calendar';
+  import Search from '@lucide/svelte/icons/search';
+  import Plus from '@lucide/svelte/icons/plus';
+  import ArrowUp from '@lucide/svelte/icons/arrow-up';
+  import ArrowDown from '@lucide/svelte/icons/arrow-down';
+  import * as m from '$lib/paraglide/messages';
+  import { getPaginationPages, getCurrentPage, getTotalPages, getOffset, formatDate } from '$lib/utils';
+
+  interface AssignableContestTasksListProps {
+    tasks: Task[];
+    total: number;
+    limit: number;
+    offset: number;
+    sortKey: AssignableTaskSortKey;
+    sortDir: SortDirection;
+    search: string;
+    onAdd: (taskId: number) => void;
+  }
+
+  let {
+    tasks,
+    total,
+    limit = $bindable(),
+    offset = $bindable(),
+    sortKey = $bindable(),
+    sortDir = $bindable(),
+    search = $bindable(),
+    onAdd
+  }: AssignableContestTasksListProps = $props();
+
+  let currentPage = $derived(getCurrentPage(offset, limit));
+  let totalPages = $derived(getTotalPages(total, limit));
+
+  let paginationPages = $derived(getPaginationPages(currentPage, totalPages));
+
+  function handleHeaderSort(key: AssignableTaskSortKey) {
+    const dir =
+      sortKey === key
+        ? sortDir === SortDirection.Asc
+          ? SortDirection.Desc
+          : SortDirection.Asc
+        : SortDirection.Asc;
+
+    sortKey = key;
+    sortDir = dir;
+    offset = 0;
+  }
+
+  function handleLimitChange(newLimit: number) {
+    limit = newLimit;
+    offset = 0;
+  }
+
+  function getAriaSortValue(key: AssignableTaskSortKey): 'ascending' | 'descending' | 'none' {
+    if (sortKey !== key) return 'none';
+    return sortDir === SortDirection.Asc ? 'ascending' : 'descending';
+  }
+
+  const perPageOptions = [5, 10, 20];
+</script>
+
+<div class="space-y-3">
+  <!-- Top bar: range + page size + search -->
+  <div class="flex flex-col gap-2 lg:flex-row lg:items-center lg:justify-between">
+    <div class="relative w-full lg:max-w-xs">
+      <Search class="absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+      <Input
+        type="text"
+        placeholder={m.admin_contest_tasks_search_placeholder()}
+        bind:value={search}
+        class="pl-9"
+      />
+    </div>
+
+    <div class="flex flex-wrap items-center gap-2">
+      <div class="text-xs text-muted-foreground">
+        {m.admin_contest_tasks_pagination_showing_range({
+          from: total === 0 ? 0 : offset + 1,
+          to: Math.min(offset + tasks.length, total),
+          total
+        })}
+      </div>
+      <div class="flex items-center gap-1 text-xs">
+        <span class="text-muted-foreground">{m.admin_contest_tasks_pagination_rows_per_page()}:</span>
+        <select
+          class="rounded-md border bg-background px-2 py-1 text-xs"
+          value={limit}
+          onchange={(e) => handleLimitChange(Number((e.target as HTMLSelectElement).value))}
+        >
+          {#each perPageOptions as opt (opt)}
+            <option value={opt}>{opt}</option>
+          {/each}
+        </select>
+      </div>
+      <div class="text-xs font-medium">
+        {m.admin_contest_tasks_pagination_page()}
+        {currentPage}
+        {m.admin_contest_tasks_pagination_of()}
+        {totalPages}
+      </div>
+    </div>
+  </div>
+
+  <!-- Data table -->
+  <Table.Root class="mt-1">
+    <Table.Header>
+      <Table.Row>
+        <Table.Head class="w-14" aria-sort={getAriaSortValue(AssignableTaskSortKey.Id)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(AssignableTaskSortKey.Id)}
+          >
+            {m.admin_contest_tasks_column_id()}
+            {#if sortKey === AssignableTaskSortKey.Id}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head aria-sort={getAriaSortValue(AssignableTaskSortKey.Title)}>
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(AssignableTaskSortKey.Title)}
+          >
+            {m.admin_contest_tasks_column_title()}
+            {#if sortKey === AssignableTaskSortKey.Title}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head class="hidden md:table-cell">
+          {m.admin_contest_tasks_column_creator()}
+        </Table.Head>
+        <Table.Head
+          class="hidden lg:table-cell"
+          aria-sort={getAriaSortValue(AssignableTaskSortKey.CreatedAt)}
+        >
+          <button
+            class="flex items-center gap-1"
+            type="button"
+            onclick={() => handleHeaderSort(AssignableTaskSortKey.CreatedAt)}
+          >
+            {m.admin_contest_tasks_column_created_at()}
+            {#if sortKey === AssignableTaskSortKey.CreatedAt}{#if sortDir === SortDirection.Asc}<ArrowUp
+                  class="h-3 w-3 text-muted-foreground"
+                />{:else}<ArrowDown class="h-3 w-3 text-muted-foreground" />{/if}{/if}
+          </button>
+        </Table.Head>
+        <Table.Head class="w-20 text-right">{m.admin_contest_tasks_column_actions()}</Table.Head>
+      </Table.Row>
+    </Table.Header>
+
+    <Table.Body>
+      {#if tasks.length === 0}
+        <Table.Row>
+          <Table.Cell colspan={5} class="py-10 text-center text-sm text-muted-foreground">
+            {m.admin_contest_tasks_no_results_title()}
+          </Table.Cell>
+        </Table.Row>
+      {:else}
+        {#each tasks as task (task.id)}
+        <Table.Row>
+          <Table.Cell class="font-mono text-xs">{task.id}</Table.Cell>
+          <Table.Cell>
+            <div class="flex min-w-0 items-center gap-2">
+              <ListTodo class="h-4 w-4 shrink-0 text-primary" />
+              <Tooltip.Root>
+                <Tooltip.Trigger class="min-w-0">
+                  <span class="block max-w-48 truncate font-medium text-foreground">
+                    {task.title}
+                  </span>
+                </Tooltip.Trigger>
+                <Tooltip.Content side="top">{task.title}</Tooltip.Content>
+              </Tooltip.Root>
+            </div>
+          </Table.Cell>
+          <Table.Cell class="hidden md:table-cell">
+            <div class="flex items-center gap-1.5 text-muted-foreground">
+              <User class="h-3.5 w-3.5 shrink-0" />
+              <span class="max-w-[160px] truncate">{task.creatorName}</span>
+            </div>
+          </Table.Cell>
+          <Table.Cell class="hidden text-muted-foreground lg:table-cell">
+            <div class="flex items-center gap-1.5">
+              <Calendar class="h-3.5 w-3.5 shrink-0" />
+              <span class="whitespace-nowrap">{formatDate(task.createdAt)}</span>
+            </div>
+          </Table.Cell>
+          <Table.Cell class="text-right">
+            <Button
+              size="icon"
+              variant="outline"
+              class="h-8 w-8"
+              title={m.admin_contest_tasks_add_button()}
+              onclick={() => onAdd(task.id)}
+            >
+              <Plus class="h-4 w-4" />
+            </Button>
+          </Table.Cell>
+        </Table.Row>
+        {/each}
+      {/if}
+    </Table.Body>
+  </Table.Root>
+
+  {#if total > 0}
+    <div class="flex flex-col items-center gap-2 pt-2">
+    <Pagination.Root
+      count={total}
+      perPage={limit}
+      page={currentPage}
+      siblingCount={1}
+      onPageChange={(p) => {
+        if (p && p !== currentPage) offset = getOffset(p, limit);
+      }}
+    >
+      <Pagination.Content>
+        <Pagination.PrevButton disabled={currentPage === 1}>
+          {m.admin_contest_tasks_pagination_prev()}
+        </Pagination.PrevButton>
+
+        {#each paginationPages as p (p)}
+          {#if p === 'ellipsis'}
+            <Pagination.Item>
+              <Pagination.Ellipsis />
+            </Pagination.Item>
+          {:else}
+            <Pagination.Item>
+              <Pagination.Link page={{ type: 'page', value: p }} isActive={p === currentPage} />
+            </Pagination.Item>
+          {/if}
+        {/each}
+
+        <Pagination.NextButton disabled={currentPage === totalPages}>
+          {m.admin_contest_tasks_pagination_next()}
+        </Pagination.NextButton>
+      </Pagination.Content>
+    </Pagination.Root>
+
+    <div class="text-xs text-muted-foreground">
+      {m.admin_contest_tasks_pagination_total({ total })}
+    </div>
+    </div>
+  {/if}
+</div>
diff --git a/src/lib/components/dashboard/admin/contests/index.ts b/src/lib/components/dashboard/admin/contests/index.ts
index 233ffa3..eaa35cd 100644
--- a/src/lib/components/dashboard/admin/contests/index.ts
+++ b/src/lib/components/dashboard/admin/contests/index.ts
@@ -10,3 +10,5 @@ export { default as RemoveGroupFromContestButton } from './RemoveGroupFromContes
 export { default as AddParticipantsToContestButton } from './AddParticipantsToContestButton.svelte';
 export { default as RemoveParticipantFromContestButton } from './RemoveParticipantFromContestButton.svelte';
 export { default as ParticipantsList } from './ParticipantsList.svelte';
+export { default as AddedContestTasksList } from './AddedContestTasksList.svelte';
+export { default as AssignableContestTasksList } from './AssignableContestTasksList.svelte';
diff --git a/src/lib/components/dashboard/contests/AdminContestCard.svelte b/src/lib/components/dashboard/contests/AdminContestCard.svelte
index 55b804b..6e13c28 100644
--- a/src/lib/components/dashboard/contests/AdminContestCard.svelte
+++ b/src/lib/components/dashboard/contests/AdminContestCard.svelte
@@ -10,7 +10,6 @@
   import UserCheck from '@lucide/svelte/icons/user-check';
   import FileText from '@lucide/svelte/icons/file-text';
   import Edit from '@lucide/svelte/icons/pencil';
-  import Plus from '@lucide/svelte/icons/plus';
   import type { CreatedContest } from '$lib/dto/contest';
   import * as m from '$lib/paraglide/messages';
   import { localizeHref } from '$lib/paraglide/runtime';
@@ -138,15 +137,7 @@
         href={localizeHref(`${AppRoutes.TeacherContests}/${contest.id}/tasks`)}
       >
         <ListTodo class="mr-2 h-4 w-4" />
-        {m.admin_contests_card_view_tasks()}
-      </Button>
-      <Button
-        variant="default"
-        class="w-full transition-all duration-300 hover:-translate-y-0.5 hover:shadow-md"
-        href={localizeHref(`${AppRoutes.TeacherContests}/${contest.id}/assignable-tasks`)}
-      >
-        <Plus class="mr-2 h-4 w-4" />
-        {m.admin_contests_card_add_tasks()}
+        {m.admin_contests_card_manage_tasks()}
       </Button>
       <Button
         variant="default"
diff --git a/src/lib/components/dashboard/utils.ts b/src/lib/components/dashboard/utils.ts
index c8c5b2a..f07aade 100644
--- a/src/lib/components/dashboard/utils.ts
+++ b/src/lib/components/dashboard/utils.ts
@@ -58,6 +58,11 @@ export function getDashboardTitleTranslationFromPathname(pathname: string): stri
     return m.contest_participants_title();
   }
 
+  // Check for contest tasks management page (e.g., /dashboard/teacher/contests/[contestId]/tasks)
+  if (path.match(/^\/dashboard\/teacher\/contests\/\d+\/tasks$/)) {
+    return m.admin_contest_tasks_manage_title();
+  }
+
   // Return the translation for the route, or default to main dashboard title
   return routeTitleMap[path]?.() ?? m.header_dashboard();
 }
diff --git a/src/lib/dto/pagination.ts b/src/lib/dto/pagination.ts
index 227c738..d19711d 100644
--- a/src/lib/dto/pagination.ts
+++ b/src/lib/dto/pagination.ts
@@ -11,3 +11,16 @@ export enum UserSortKey {
   Role = 'role',
   CreatedAt = 'createdAt'
 }
+
+export enum ContestTaskSortKey {
+  Id = 'id',
+  Title = 'title',
+  StartAt = 'start_at',
+  EndAt = 'end_at'
+}
+
+export enum AssignableTaskSortKey {
+  Id = 'id',
+  Title = 'title',
+  CreatedAt = 'created_at'
+}
diff --git a/src/lib/dto/task.ts b/src/lib/dto/task.ts
index 6a1e1a4..b1584dc 100644
--- a/src/lib/dto/task.ts
+++ b/src/lib/dto/task.ts
@@ -4,6 +4,7 @@ export interface Task {
   createdAt: string;
   updatedAt: string;
   createdBy: number;
+  creatorName: string;
   isVisible: boolean;
 }
 
diff --git a/src/lib/services/api/ContestsManagementService.ts b/src/lib/services/api/ContestsManagementService.ts
index 0b822ea..ff41ee6 100644
--- a/src/lib/services/api/ContestsManagementService.ts
+++ b/src/lib/services/api/ContestsManagementService.ts
@@ -129,10 +129,22 @@ export class ContestsManagementService {
     }
   }
 
-  async getAssignableTasks(contestId: number): Promise<Task[]> {
+  async getAssignableTasks(
+    contestId: number,
+    params?: { limit?: number; offset?: number; sort?: string; search?: string }
+  ): Promise<PaginatedData<Task>> {
     try {
-      const response = await this.apiClient.get<ApiResponse<Task[]>>({
-        url: `/contests-management/contests/${contestId}/tasks/assignable-tasks`
+      const queryParams = new URLSearchParams();
+      if (params?.limit) queryParams.append('limit', params.limit.toString());
+      if (params?.offset) queryParams.append('offset', params.offset.toString());
+      if (params?.sort) queryParams.append('sort', params.sort);
+      if (params?.search) queryParams.append('search', params.search);
+
+      const url = `/contests-management/contests/${contestId}/tasks/assignable-tasks${
+        queryParams.toString() ? `?${queryParams.toString()}` : ''
+      }`;
+      const response = await this.apiClient.get<ApiResponse<PaginatedData<Task>>>({
+        url
       });
       return response.data;
     } catch (error) {
@@ -165,6 +177,25 @@ export class ContestsManagementService {
     }
   }
 
+  async updateTaskInContest(
+    contestId: number,
+    taskId: number,
+    data: { startAt: string; endAt: string | null }
+  ): Promise<void> {
+    try {
+      await this.apiClient.put<ApiResponse<{ message: string }>>({
+        url: `/contests-management/contests/${contestId}/tasks/${taskId}`,
+        body: JSON.stringify({ startAt: data.startAt, endAt: data.endAt })
+      });
+    } catch (error) {
+      if (error instanceof ApiError) {
+        console.error('Failed to update task in contest:', error.toJSON());
+        throw error;
+      }
+      throw error;
+    }
+  }
+
   async removeTaskFromContest(contestId: number, taskIds: number | number[]): Promise<void> {
     try {
       const requestData = {
@@ -183,10 +214,23 @@ export class ContestsManagementService {
     }
   }
 
-  async getContestTasks(contestId: number): Promise<ContestTask[]> {
+  async getContestTasks(
+    contestId: number,
+    params?: { limit?: number; offset?: number; sort?: string; search?: string }
+  ): Promise<PaginatedData<ContestTask>> {
     try {
-      const response = await this.apiClient.get<ApiResponse<ContestTask[]>>({
-        url: `/contests-management/contests/${contestId}/tasks`
+      const queryParams = new URLSearchParams();
+      if (params?.limit) queryParams.append('limit', params.limit.toString());
+      if (params?.offset) queryParams.append('offset', params.offset.toString());
+      if (params?.sort) queryParams.append('sort', params.sort);
+      if (params?.search) queryParams.append('search', params.search);
+
+      const url = `/contests-management/contests/${contestId}/tasks${
+        queryParams.toString() ? `?${queryParams.toString()}` : ''
+      }`;
+
+      const response = await this.apiClient.get<ApiResponse<PaginatedData<ContestTask>>>({
+        url
       });
       return response.data;
     } catch (error) {
diff --git a/src/routes/dashboard/teacher/contests/[contestId]/assignable-tasks/+page.svelte b/src/routes/dashboard/teacher/contests/[contestId]/assignable-tasks/+page.svelte
deleted file mode 100644
index e66adec..0000000
--- a/src/routes/dashboard/teacher/contests/[contestId]/assignable-tasks/+page.svelte
+++ /dev/null
@@ -1,331 +0,0 @@
-<script lang="ts">
-  import { LoadingSpinner, ErrorCard, EmptyState } from '$lib/components/common';
-  import { Button } from '$lib/components/ui/button';
-  import { Input } from '$lib/components/ui/input';
-  import { Label } from '$lib/components/ui/label';
-  import { Calendar } from '$lib/components/ui/calendar';
-  import { Checkbox } from '$lib/components/ui/checkbox';
-  import * as Dialog from '$lib/components/ui/dialog';
-  import * as Popover from '$lib/components/ui/popover';
-  import * as Card from '$lib/components/ui/card';
-  import { buttonVariants } from '$lib/components/ui/button';
-  import ListTodo from '@lucide/svelte/icons/list-todo';
-  import Plus from '@lucide/svelte/icons/plus';
-  import CalendarIcon from '@lucide/svelte/icons/calendar';
-  import { toast } from 'svelte-sonner';
-  import * as m from '$lib/paraglide/messages';
-  import { DateFormatter, type DateValue, getLocalTimeZone, today } from '@internationalized/date';
-  import { cn, formatDate, toLocalRFC3339 } from '$lib/utils';
-  import { SvelteDate } from 'svelte/reactivity';
-  import { createParameterizedQuery } from '$lib/utils/query.svelte';
-  import { getContestsManagementInstance } from '$lib/services';
-
-  interface Props {
-    data: {
-      contestId: number;
-    };
-  }
-  let { data }: Props = $props();
-  const contestId = $derived(data.contestId);
-  const contestsService = getContestsManagementInstance();
-
-  const tasksQuery = createParameterizedQuery(
-    () => contestId,
-    async (id) => {
-      if (!contestsService) throw new Error('Service unavailable');
-      return await contestsService.getAssignableTasks(id);
-    }
-  );
-
-  let dialogOpen = $state(false);
-  let selectedTaskId = $state<number | null>(null);
-  let submitting = $state(false);
-
-  // Date formatters
-  const df = new DateFormatter('en-US', {
-    dateStyle: 'long'
-  });
-
-  // Get default date/time values
-  function getDefaultStartDateTime() {
-    const now = new Date();
-    const date = today(getLocalTimeZone());
-    const time = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-    return { date, time };
-  }
-
-  function getDefaultEndDateTime() {
-    const tomorrow = new SvelteDate();
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    const date = today(getLocalTimeZone()).add({ days: 1 });
-    const time = `${String(tomorrow.getHours()).padStart(2, '0')}:${String(tomorrow.getMinutes()).padStart(2, '0')}`;
-    return { date, time };
-  }
-
-  // Date and time states
-  let startDate = $state<DateValue | undefined>(getDefaultStartDateTime().date);
-  let startTime = $state<string>(getDefaultStartDateTime().time);
-  let endDate = $state<DateValue | undefined>(getDefaultEndDateTime().date);
-  let endTime = $state<string | null>(getDefaultEndDateTime().time);
-  let hasEndTime = $state(false);
-
-  function buildDateTime(date: DateValue | undefined, time: string | null): string {
-    if (!date || !time) return '';
-    const [hours, minutes] = time.split(':').map(Number);
-    const dateObj = date.toDate(getLocalTimeZone());
-    dateObj.setHours(hours, minutes, 0, 0);
-    return toLocalRFC3339(dateObj);
-  }
-
-  let startAtValue = $derived(buildDateTime(startDate, startTime));
-  let endAtValue = $derived(hasEndTime ? buildDateTime(endDate, endTime) : '');
-
-  function openDialog(taskId: number) {
-    selectedTaskId = taskId;
-    // Reset to defaults when opening dialog
-    const defaultStart = getDefaultStartDateTime();
-    const defaultEnd = getDefaultEndDateTime();
-    startDate = defaultStart.date;
-    startTime = defaultStart.time;
-    endDate = defaultEnd.date;
-    endTime = defaultEnd.time;
-    hasEndTime = false;
-    dialogOpen = true;
-  }
-
-  async function handleAddTask(event: Event) {
-    event.preventDefault();
-
-    if (!contestsService || !selectedTaskId || !startAtValue) {
-      toast.error(m.admin_contest_tasks_add_error());
-      return;
-    }
-
-    submitting = true;
-    try {
-      await contestsService.addTaskToContest(contestId, {
-        taskId: selectedTaskId,
-        startAt: startAtValue,
-        endAt: hasEndTime ? endAtValue : null
-      });
-      toast.success(m.admin_contest_tasks_add_success());
-      dialogOpen = false;
-      selectedTaskId = null;
-      await tasksQuery.refresh();
-    } catch (error) {
-      console.error('Add task to contest error:', error);
-      toast.error(m.admin_contest_tasks_add_error());
-    } finally {
-      submitting = false;
-    }
-  }
-</script>
-
-<div class="space-y-6">
-  <div class="flex items-center justify-between">
-    <div>
-      <h1 class="text-3xl font-bold text-foreground">
-        {m.admin_contest_tasks_title()}
-      </h1>
-      <p class="mt-2 text-muted-foreground">
-        {m.admin_contest_tasks_subtitle()}
-      </p>
-    </div>
-  </div>
-
-  <!-- Tasks List Section -->
-  <div class="space-y-4">
-    <h2 class="text-2xl font-bold text-foreground">{m.admin_contest_tasks_available()}</h2>
-
-    {#if tasksQuery.error}
-      <ErrorCard
-        title={m.admin_tasks_load_error_title()}
-        error={tasksQuery.error}
-        onRetry={() => tasksQuery.refresh()}
-      />
-    {:else if tasksQuery.loading}
-      <LoadingSpinner />
-    {:else if tasksQuery.current && tasksQuery.current.length === 0}
-      <EmptyState
-        title={m.admin_tasks_no_tasks_title()}
-        description={m.admin_tasks_no_tasks_description()}
-        icon={ListTodo}
-      />
-    {:else if tasksQuery.current}
-      <div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
-        {#each tasksQuery.current as task (task.id)}
-          <Card.Root
-            class="group relative overflow-hidden border-border transition-all duration-300 hover:shadow-lg"
-          >
-            <div
-              class="absolute inset-0 bg-linear-to-br from-primary/5 via-secondary/5 to-primary/10 opacity-30 transition-opacity duration-300 group-hover:opacity-50"
-            ></div>
-
-            <Card.Header class="relative">
-              <div class="flex items-start justify-between gap-2">
-                <span
-                  class="inline-flex items-center rounded-full bg-primary/10 px-2.5 py-0.5 text-xs font-bold text-primary"
-                >
-                  #{task.id}
-                </span>
-              </div>
-              <Card.Title class="mt-3 flex items-start gap-2 text-lg">
-                <ListTodo class="mt-0.5 h-5 w-5 shrink-0 text-primary" />
-                <span class="wrap-break-word">{task.title}</span>
-              </Card.Title>
-            </Card.Header>
-
-            <Card.Content class="relative">
-              <div class="space-y-2 text-sm text-muted-foreground">
-                <p>{m.admin_contest_tasks_created()}: {formatDate(task.createdAt)}</p>
-              </div>
-
-              <div class="mt-4">
-                <Button
-                  onclick={() => openDialog(task.id)}
-                  class="w-full transition-all duration-300 hover:-translate-y-0.5 hover:shadow-md"
-                >
-                  <Plus class="mr-2 h-4 w-4" />
-                  {m.admin_contest_tasks_add_button()}
-                </Button>
-              </div>
-            </Card.Content>
-          </Card.Root>
-        {/each}
-      </div>
-    {/if}
-  </div>
-</div>
-
-<!-- Add Task Dialog -->
-<Dialog.Root bind:open={dialogOpen}>
-  <Dialog.Content class="max-w-2xl">
-    <Dialog.Header>
-      <Dialog.Title>{m.admin_contest_tasks_dialog_title()}</Dialog.Title>
-      <Dialog.Description>
-        {m.admin_contest_tasks_dialog_description()}
-      </Dialog.Description>
-    </Dialog.Header>
-
-    <form class="space-y-6" onsubmit={handleAddTask}>
-      <div class="grid gap-4 sm:grid-cols-2">
-        <!-- Start Date & Time -->
-        <div class="space-y-3">
-          <Label class="h-8">{m.admin_contests_form_start_label()}</Label>
-
-          <div class="space-y-2">
-            <span class="block text-sm text-muted-foreground">
-              {m.admin_contests_form_start_date()}
-            </span>
-            <Popover.Root>
-              <Popover.Trigger
-                class={cn(
-                  buttonVariants({
-                    variant: 'outline',
-                    class: 'w-full justify-start text-left font-normal'
-                  }),
-                  !startDate && 'text-muted-foreground'
-                )}
-              >
-                <CalendarIcon class="mr-2 h-4 w-4" />
-                {startDate
-                  ? df.format(startDate.toDate(getLocalTimeZone()))
-                  : m.admin_contests_form_pick_date()}
-              </Popover.Trigger>
-              <Popover.Content class="w-auto p-0">
-                <Calendar type="single" bind:value={startDate} />
-              </Popover.Content>
-            </Popover.Root>
-          </div>
-
-          <div class="space-y-2">
-            <Label for="startTime" class="text-sm text-muted-foreground">
-              {m.admin_contests_form_start_time()}
-            </Label>
-            <Input
-              type="time"
-              id="startTime"
-              name="startTime"
-              autocomplete="off"
-              bind:value={startTime}
-              required
-              class="scheme-light transition-all duration-200 focus:ring-2 focus:ring-primary dark:scheme-dark"
-            />
-          </div>
-        </div>
-
-        <!-- End Date & Time -->
-        <div class="space-y-3">
-          <div class="flex h-8 items-center gap-2">
-            <Checkbox id="hasEndTime" bind:checked={hasEndTime} />
-            <Label for="hasEndTime" class="cursor-pointer">
-              {m.admin_contests_form_end_label()}
-            </Label>
-          </div>
-
-          {#if hasEndTime}
-            <div class="space-y-2">
-              <span class="block text-sm text-muted-foreground">
-                {m.admin_contests_form_end_date()}
-              </span>
-              <Popover.Root>
-                <Popover.Trigger
-                  class={cn(
-                    buttonVariants({
-                      variant: 'outline',
-                      class: 'w-full justify-start text-left font-normal'
-                    }),
-                    !endDate && 'text-muted-foreground'
-                  )}
-                >
-                  <CalendarIcon class="mr-2 h-4 w-4" />
-                  {endDate
-                    ? df.format(endDate.toDate(getLocalTimeZone()))
-                    : m.admin_contests_form_pick_date()}
-                </Popover.Trigger>
-                <Popover.Content class="w-auto p-0">
-                  <Calendar type="single" bind:value={endDate} />
-                </Popover.Content>
-              </Popover.Root>
-            </div>
-
-            <div class="space-y-2">
-              <Label for="endTime" class="text-sm text-muted-foreground">
-                {m.admin_contests_form_end_time()}
-              </Label>
-              <Input
-                type="time"
-                id="endTime"
-                name="endTime"
-                autocomplete="off"
-                bind:value={endTime}
-                required
-                class="scheme-light transition-all duration-200 focus:ring-2 focus:ring-primary dark:scheme-dark"
-              />
-            </div>
-          {/if}
-        </div>
-      </div>
-
-      <Dialog.Footer>
-        <Button
-          type="button"
-          variant="outline"
-          onclick={() => {
-            dialogOpen = false;
-            selectedTaskId = null;
-          }}
-        >
-          {m.admin_contests_form_cancel()}
-        </Button>
-        <Button
-          type="submit"
-          disabled={submitting}
-          class="transition-all duration-300 hover:-translate-y-0.5 hover:shadow-lg"
-        >
-          {m.admin_contest_tasks_add_button()}
-        </Button>
-      </Dialog.Footer>
-    </form>
-  </Dialog.Content>
-</Dialog.Root>
diff --git a/src/routes/dashboard/teacher/contests/[contestId]/tasks/+page.svelte b/src/routes/dashboard/teacher/contests/[contestId]/tasks/+page.svelte
index 8261cd0..d020596 100644
--- a/src/routes/dashboard/teacher/contests/[contestId]/tasks/+page.svelte
+++ b/src/routes/dashboard/teacher/contests/[contestId]/tasks/+page.svelte
@@ -1,33 +1,230 @@
 <script lang="ts">
-  import { LoadingSpinner, ErrorCard, EmptyState } from '$lib/components/common';
-  import { createParameterizedQuery } from '$lib/utils/query.svelte';
-  import { getContestsManagementInstance } from '$lib/services';
-  import { RemoveTaskFromContestButton } from '$lib/components/dashboard/admin/contests';
+  import { LoadingSpinner, ErrorCard } from '$lib/components/common';
   import { Button } from '$lib/components/ui/button';
-  import * as m from '$lib/paraglide/messages';
-  import ClipboardList from '@lucide/svelte/icons/clipboard-list';
-  import User from '@lucide/svelte/icons/user';
-  import Calendar from '@lucide/svelte/icons/calendar';
-  import Clock from '@lucide/svelte/icons/clock';
-  import CheckCircle from '@lucide/svelte/icons/check-circle';
-  import XCircle from '@lucide/svelte/icons/x-circle';
+  import { Input } from '$lib/components/ui/input';
+  import { Label } from '$lib/components/ui/label';
+  import { Calendar } from '$lib/components/ui/calendar';
+  import { Checkbox } from '$lib/components/ui/checkbox';
+  import * as Dialog from '$lib/components/ui/dialog';
+  import * as Popover from '$lib/components/ui/popover';
+  import { buttonVariants } from '$lib/components/ui/button';
+  import {
+    AddedContestTasksList,
+    AssignableContestTasksList
+  } from '$lib/components/dashboard/admin/contests';
+  import { SortDirection, ContestTaskSortKey, AssignableTaskSortKey } from '$lib/dto/pagination';
+  import type { ContestTask } from '$lib/dto/task';
+  import CalendarIcon from '@lucide/svelte/icons/calendar';
   import ChartBar from '@lucide/svelte/icons/chart-bar';
-  import { formatDate } from '$lib/utils';
+  import { toast } from 'svelte-sonner';
+  import * as m from '$lib/paraglide/messages';
+  import {
+    DateFormatter,
+    type DateValue,
+    CalendarDate,
+    getLocalTimeZone,
+    today
+  } from '@internationalized/date';
+  import { cn, toLocalRFC3339 } from '$lib/utils';
+  import { SvelteDate } from 'svelte/reactivity';
+  import { createParameterizedQuery } from '$lib/utils/query.svelte';
+  import { getContestsManagementInstance } from '$lib/services';
 
   interface Props {
-    data: { contestId: number };
+    data: {
+      contestId: number;
+    };
   }
   let { data }: Props = $props();
   const contestId = $derived(data.contestId);
   const contestsService = getContestsManagementInstance();
 
-  const tasksQuery = createParameterizedQuery(
-    () => contestId,
-    async (id) => {
-      if (!contestsService) throw new Error('Service unavailable');
-      return await contestsService.getContestTasks(id);
+  // Added tasks query (server-side pagination + sorting + search)
+  let addedLimit = $state(5);
+  let addedOffset = $state(0);
+  let addedSortKey = $state<ContestTaskSortKey>(ContestTaskSortKey.StartAt);
+  let addedSortDir = $state<SortDirection>(SortDirection.Asc);
+  let addedSearch = $state('');
+  let addedSearchApplied = $state('');
+
+  let addedSearchTimer: ReturnType<typeof setTimeout> | undefined;
+  $effect(() => {
+    const value = addedSearch;
+    clearTimeout(addedSearchTimer);
+    addedSearchTimer = setTimeout(() => {
+      addedSearchApplied = value;
+      addedOffset = 0;
+    }, 300);
+  });
+
+  const getAddedParams = () => ({
+    limit: addedLimit,
+    offset: addedOffset,
+    sort: `${addedSortKey}:${addedSortDir}`,
+    search: addedSearchApplied
+  });
+
+  const addedTasksQuery = createParameterizedQuery(getAddedParams, async (params) => {
+    if (!contestsService) throw new Error('Service unavailable');
+    return await contestsService.getContestTasks(contestId, params);
+  });
+
+  // Assignable tasks query (server-side pagination + sorting + search)
+  let assignableLimit = $state(5);
+  let assignableOffset = $state(0);
+  let assignableSortKey = $state<AssignableTaskSortKey>(AssignableTaskSortKey.Title);
+  let assignableSortDir = $state<SortDirection>(SortDirection.Asc);
+  let assignableSearch = $state('');
+  let assignableSearchApplied = $state('');
+
+  let assignableSearchTimer: ReturnType<typeof setTimeout> | undefined;
+  $effect(() => {
+    const value = assignableSearch;
+    clearTimeout(assignableSearchTimer);
+    assignableSearchTimer = setTimeout(() => {
+      assignableSearchApplied = value;
+      assignableOffset = 0;
+    }, 300);
+  });
+
+  const getAssignableParams = () => ({
+    limit: assignableLimit,
+    offset: assignableOffset,
+    sort: `${assignableSortKey}:${assignableSortDir}`,
+    search: assignableSearchApplied
+  });
+
+  const assignableTasksQuery = createParameterizedQuery(getAssignableParams, async (params) => {
+    if (!contestsService) throw new Error('Service unavailable');
+    return await contestsService.getAssignableTasks(contestId, params);
+  });
+
+  // Add/Edit task schedule dialog
+  let dialogOpen = $state(false);
+  let dialogMode = $state<'add' | 'edit'>('add');
+  let selectedTaskId = $state<number | null>(null);
+  let submitting = $state(false);
+
+  const df = new DateFormatter('en-US', {
+    dateStyle: 'long'
+  });
+
+  function pad(value: number): string {
+    return String(value).padStart(2, '0');
+  }
+
+  function parseDateTime(iso: string | null): { date: DateValue; time: string } {
+    const d = iso ? new Date(iso) : new Date();
+    const date = new CalendarDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
+    return { date, time: `${pad(d.getHours())}:${pad(d.getMinutes())}` };
+  }
+
+  function getDefaultStartDateTime() {
+    const now = new Date();
+    const date = today(getLocalTimeZone());
+    const time = `${pad(now.getHours())}:${pad(now.getMinutes())}`;
+    return { date, time };
+  }
+
+  function getDefaultEndDateTime() {
+    const tomorrow = new SvelteDate();
+    tomorrow.setDate(tomorrow.getDate() + 1);
+    const date = today(getLocalTimeZone()).add({ days: 1 });
+    const time = `${pad(tomorrow.getHours())}:${pad(tomorrow.getMinutes())}`;
+    return { date, time };
+  }
+
+  let startDate = $state<DateValue | undefined>(getDefaultStartDateTime().date);
+  let startTime = $state<string>(getDefaultStartDateTime().time);
+  let endDate = $state<DateValue | undefined>(getDefaultEndDateTime().date);
+  let endTime = $state<string | null>(getDefaultEndDateTime().time);
+  let hasEndTime = $state(false);
+
+  function buildDateTime(date: DateValue | undefined, time: string | null): string {
+    if (!date || !time) return '';
+    const [hours, minutes] = time.split(':').map(Number);
+    const dateObj = date.toDate(getLocalTimeZone());
+    dateObj.setHours(hours, minutes, 0, 0);
+    return toLocalRFC3339(dateObj);
+  }
+
+  let startAtValue = $derived(buildDateTime(startDate, startTime));
+  let endAtValue = $derived(hasEndTime ? buildDateTime(endDate, endTime) : '');
+
+  function openAddDialog(taskId: number) {
+    dialogMode = 'add';
+    selectedTaskId = taskId;
+    const defaultStart = getDefaultStartDateTime();
+    const defaultEnd = getDefaultEndDateTime();
+    startDate = defaultStart.date;
+    startTime = defaultStart.time;
+    endDate = defaultEnd.date;
+    endTime = defaultEnd.time;
+    hasEndTime = false;
+    dialogOpen = true;
+  }
+
+  function openEditDialog(contestTask: ContestTask) {
+    dialogMode = 'edit';
+    selectedTaskId = contestTask.task.id;
+    const start = parseDateTime(contestTask.startAt);
+    startDate = start.date;
+    startTime = start.time;
+    if (contestTask.endAt) {
+      const end = parseDateTime(contestTask.endAt);
+      endDate = end.date;
+      endTime = end.time;
+      hasEndTime = true;
+    } else {
+      const defaultEnd = getDefaultEndDateTime();
+      endDate = defaultEnd.date;
+      endTime = defaultEnd.time;
+      hasEndTime = false;
     }
-  );
+    dialogOpen = true;
+  }
+
+  async function handleSubmit(event: Event) {
+    event.preventDefault();
+
+    if (!contestsService || !selectedTaskId || !startAtValue) {
+      toast.error(m.admin_contest_tasks_add_error());
+      return;
+    }
+
+    submitting = true;
+    try {
+      const schedule = {
+        startAt: startAtValue,
+        endAt: hasEndTime ? endAtValue : null
+      };
+      if (dialogMode === 'edit') {
+        await contestsService.updateTaskInContest(contestId, selectedTaskId, schedule);
+        toast.success(m.admin_contest_tasks_update_success());
+      } else {
+        await contestsService.addTaskToContest(contestId, { taskId: selectedTaskId, ...schedule });
+        toast.success(m.admin_contest_tasks_add_success());
+      }
+      dialogOpen = false;
+      selectedTaskId = null;
+      await addedTasksQuery.refresh();
+      await assignableTasksQuery.refresh();
+    } catch (error) {
+      console.error('Save task schedule error:', error);
+      toast.error(
+        dialogMode === 'edit'
+          ? m.admin_contest_tasks_update_error()
+          : m.admin_contest_tasks_add_error()
+      );
+    } finally {
+      submitting = false;
+    }
+  }
+
+  async function handleTasksChanged() {
+    await addedTasksQuery.refresh();
+    await assignableTasksQuery.refresh();
+  }
 </script>
 
 <div class="space-y-6">
@@ -45,155 +242,202 @@
     </Button>
   </div>
 
-  <!-- Contest Tasks Section -->
-  <div class="space-y-4">
-    {#if tasksQuery.error}
-      <ErrorCard
-        title={m.user_contest_tasks_load_error()}
-        error={tasksQuery.error}
-        onRetry={() => tasksQuery.refresh()}
-      />
-    {:else if tasksQuery.loading}
-      <LoadingSpinner />
-    {:else if tasksQuery.current && tasksQuery.current.length === 0}
-      <EmptyState
-        title={m.admin_contest_tasks_no_tasks_title()}
-        description={m.admin_contest_tasks_no_tasks_description()}
-        icon={ClipboardList}
-      />
-    {:else if tasksQuery.current}
-      <div class="space-y-3">
-        {#each tasksQuery.current as contestTask (contestTask.task.id)}
-          <div
-            class="rounded-2xl border bg-card p-6 text-card-foreground shadow-md transition-all hover:shadow-lg"
-          >
-            <div class="space-y-4">
-              <!-- Task Header -->
-              <div class="flex items-start justify-between">
-                <div>
-                  <div class="text-xl font-bold text-foreground">{contestTask.task.title}</div>
-                  <div class="mt-1 text-sm text-muted-foreground">
-                    {m.admin_contest_tasks_task_id()}: {contestTask.task.id}
-                  </div>
-                </div>
-                <div class="flex items-center gap-2">
-                  {#if contestTask.isSubmissionOpen}
-                    <span
-                      class="inline-flex items-center gap-1.5 rounded-full bg-primary/10 px-3 py-1 text-xs font-medium text-primary"
-                    >
-                      <CheckCircle class="h-3.5 w-3.5" />
-                      {m.admin_contest_tasks_submission_open_yes()}
-                    </span>
-                  {:else}
-                    <span
-                      class="inline-flex items-center gap-1.5 rounded-full bg-muted px-3 py-1 text-xs font-medium text-muted-foreground"
-                    >
-                      <XCircle class="h-3.5 w-3.5" />
-                      {m.admin_contest_tasks_submission_open_no()}
-                    </span>
-                  {/if}
-                  <Button
-                    href={`/dashboard/teacher/contests/${data.contestId}/tasks/${contestTask.task.id}/user-stats`}
-                    variant="outline"
-                    size="sm"
-                    class="gap-2"
-                  >
-                    <ChartBar class="h-4 w-4" />
-                    {m.admin_contest_tasks_view_user_stats()}
-                  </Button>
-                  <RemoveTaskFromContestButton
-                    {contestId}
-                    taskId={contestTask.task.id}
-                    taskTitle={contestTask.task.title}
-                    onSuccess={() => tasksQuery.refresh()}
-                  />
-                </div>
-              </div>
-
-              <!-- Task Details Grid -->
-              <div class="grid grid-cols-1 gap-4 pt-2 md:grid-cols-2 lg:grid-cols-3">
-                <div class="flex items-start gap-3">
-                  <User class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_creator_name()}
-                    </div>
-                    <div class="text-sm font-semibold text-foreground">
-                      {contestTask.creatorName}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="flex items-start gap-3">
-                  <Clock class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_created_at()}
-                    </div>
-                    <div class="text-sm text-foreground">
-                      {formatDate(contestTask.task.createdAt)}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="flex items-start gap-3">
-                  <Clock class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_updated_at()}
-                    </div>
-                    <div class="text-sm text-foreground">
-                      {formatDate(contestTask.task.updatedAt)}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="flex items-start gap-3">
-                  <Calendar class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_start_at()}
-                    </div>
-                    <div class="text-sm font-semibold text-foreground">
-                      {formatDate(contestTask.startAt)}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="flex items-start gap-3">
-                  <Calendar class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_end_at()}
-                    </div>
-                    <div class="text-sm font-semibold text-foreground">
-                      {#if contestTask.endAt}
-                        {formatDate(contestTask.endAt)}
-                      {:else}
-                        <span class="text-muted-foreground"
-                          >{m.admin_contest_tasks_no_end_date()}</span
-                        >
-                      {/if}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="flex items-start gap-3">
-                  <User class="mt-0.5 h-4 w-4 text-muted-foreground" />
-                  <div>
-                    <div class="text-sm font-medium text-muted-foreground">
-                      {m.admin_contest_tasks_created_by_id()}
-                    </div>
-                    <div class="text-sm text-foreground">
-                      {contestTask.task.createdBy}
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        {/each}
-      </div>
-    {/if}
+  <div class="space-y-8">
+    <!-- Added Tasks -->
+    <section class="space-y-4">
+      <h2 class="text-2xl font-bold text-foreground">{m.admin_contest_tasks_added()}</h2>
+
+      {#if addedTasksQuery.error}
+        <ErrorCard
+          title={m.user_contest_tasks_load_error()}
+          error={addedTasksQuery.error}
+          onRetry={() => addedTasksQuery.refresh()}
+        />
+      {:else if !addedTasksQuery.current && addedTasksQuery.loading}
+        <LoadingSpinner />
+      {:else if addedTasksQuery.current}
+        <AddedContestTasksList
+          {contestId}
+          contestTasks={addedTasksQuery.current.items}
+          total={addedTasksQuery.current.pagination.totalItems}
+          bind:limit={addedLimit}
+          bind:offset={addedOffset}
+          bind:sortKey={addedSortKey}
+          bind:sortDir={addedSortDir}
+          bind:search={addedSearch}
+          onEdit={openEditDialog}
+          onSuccess={handleTasksChanged}
+        />
+      {/if}
+    </section>
+
+    <!-- Assignable Tasks -->
+    <section class="space-y-4">
+      <h2 class="text-2xl font-bold text-foreground">{m.admin_contest_tasks_available()}</h2>
+
+      {#if assignableTasksQuery.error}
+        <ErrorCard
+          title={m.admin_tasks_load_error_title()}
+          error={assignableTasksQuery.error}
+          onRetry={() => assignableTasksQuery.refresh()}
+        />
+      {:else if !assignableTasksQuery.current && assignableTasksQuery.loading}
+        <LoadingSpinner />
+      {:else if assignableTasksQuery.current}
+        <AssignableContestTasksList
+          tasks={assignableTasksQuery.current.items}
+          total={assignableTasksQuery.current.pagination.totalItems}
+          bind:limit={assignableLimit}
+          bind:offset={assignableOffset}
+          bind:sortKey={assignableSortKey}
+          bind:sortDir={assignableSortDir}
+          bind:search={assignableSearch}
+          onAdd={openAddDialog}
+        />
+      {/if}
+    </section>
   </div>
 </div>
+
+<!-- Add/Edit Task Schedule Dialog -->
+<Dialog.Root bind:open={dialogOpen}>
+  <Dialog.Content class="max-w-2xl">
+    <Dialog.Header>
+      <Dialog.Title>
+        {dialogMode === 'edit'
+          ? m.admin_contest_tasks_edit_dialog_title()
+          : m.admin_contest_tasks_dialog_title()}
+      </Dialog.Title>
+      <Dialog.Description>
+        {dialogMode === 'edit'
+          ? m.admin_contest_tasks_edit_dialog_description()
+          : m.admin_contest_tasks_dialog_description()}
+      </Dialog.Description>
+    </Dialog.Header>
+
+    <form class="space-y-6" onsubmit={handleSubmit}>
+      <div class="grid gap-4 sm:grid-cols-2">
+        <!-- Start Date & Time -->
+        <div class="space-y-3">
+          <Label class="h-8">{m.admin_contests_form_start_label()}</Label>
+
+          <div class="space-y-2">
+            <span class="block text-sm text-muted-foreground">
+              {m.admin_contests_form_start_date()}
+            </span>
+            <Popover.Root>
+              <Popover.Trigger
+                class={cn(
+                  buttonVariants({
+                    variant: 'outline',
+                    class: 'w-full justify-start text-left font-normal'
+                  }),
+                  !startDate && 'text-muted-foreground'
+                )}
+              >
+                <CalendarIcon class="mr-2 h-4 w-4" />
+                {startDate
+                  ? df.format(startDate.toDate(getLocalTimeZone()))
+                  : m.admin_contests_form_pick_date()}
+              </Popover.Trigger>
+              <Popover.Content class="w-auto p-0">
+                <Calendar type="single" bind:value={startDate} />
+              </Popover.Content>
+            </Popover.Root>
+          </div>
+
+          <div class="space-y-2">
+            <Label for="startTime" class="text-sm text-muted-foreground">
+              {m.admin_contests_form_start_time()}
+            </Label>
+            <Input
+              type="time"
+              id="startTime"
+              name="startTime"
+              autocomplete="off"
+              bind:value={startTime}
+              required
+              class="scheme-light transition-all duration-200 focus:ring-2 focus:ring-primary dark:scheme-dark"
+            />
+          </div>
+        </div>
+
+        <!-- End Date & Time -->
+        <div class="space-y-3">
+          <div class="flex h-8 items-center gap-2">
+            <Checkbox id="hasEndTime" bind:checked={hasEndTime} />
+            <Label for="hasEndTime" class="cursor-pointer">
+              {m.admin_contests_form_end_label()}
+            </Label>
+          </div>
+
+          {#if hasEndTime}
+            <div class="space-y-2">
+              <span class="block text-sm text-muted-foreground">
+                {m.admin_contests_form_end_date()}
+              </span>
+              <Popover.Root>
+                <Popover.Trigger
+                  class={cn(
+                    buttonVariants({
+                      variant: 'outline',
+                      class: 'w-full justify-start text-left font-normal'
+                    }),
+                    !endDate && 'text-muted-foreground'
+                  )}
+                >
+                  <CalendarIcon class="mr-2 h-4 w-4" />
+                  {endDate
+                    ? df.format(endDate.toDate(getLocalTimeZone()))
+                    : m.admin_contests_form_pick_date()}
+                </Popover.Trigger>
+                <Popover.Content class="w-auto p-0">
+                  <Calendar type="single" bind:value={endDate} />
+                </Popover.Content>
+              </Popover.Root>
+            </div>
+
+            <div class="space-y-2">
+              <Label for="endTime" class="text-sm text-muted-foreground">
+                {m.admin_contests_form_end_time()}
+              </Label>
+              <Input
+                type="time"
+                id="endTime"
+                name="endTime"
+                autocomplete="off"
+                bind:value={endTime}
+                required
+                class="scheme-light transition-all duration-200 focus:ring-2 focus:ring-primary dark:scheme-dark"
+              />
+            </div>
+          {/if}
+        </div>
+      </div>
+
+      <Dialog.Footer>
+        <Button
+          type="button"
+          variant="outline"
+          onclick={() => {
+            dialogOpen = false;
+            selectedTaskId = null;
+          }}
+        >
+          {m.admin_contests_form_cancel()}
+        </Button>
+        <Button
+          type="submit"
+          disabled={submitting}
+          class="transition-all duration-300 hover:-translate-y-0.5 hover:shadow-lg"
+        >
+          {submitting
+            ? 'Saving...'
+            : dialogMode === 'edit'
+              ? m.admin_contest_tasks_update_button()
+              : m.admin_contest_tasks_add_button()}
+        </Button>
+      </Dialog.Footer>
+    </form>
+  </Dialog.Content>
+</Dialog.Root>