diff --git a/cms/server/admin/handlers/__init__.py b/cms/server/admin/handlers/__init__.py
index 1e589f78e4..f1fd8cb1db 100644
--- a/cms/server/admin/handlers/__init__.py
+++ b/cms/server/admin/handlers/__init__.py
@@ -197,10 +197,12 @@
 from .student import \
     TrainingProgramStudentsHandler, \
     AddTrainingProgramStudentHandler, \
+    BulkAddTrainingProgramStudentsHandler, \
     RemoveTrainingProgramStudentHandler, \
     StudentHandler, \
     StudentTagsHandler, \
     StudentTasksHandler, \
+    StudentTaskSubmissionsHandler, \
     AddStudentTaskHandler, \
     RemoveStudentTaskHandler, \
     BulkAssignTaskHandler
@@ -373,12 +375,14 @@
     # Training Program tabs
     (r"/training_program/([0-9]+)/students", TrainingProgramStudentsHandler),
     (r"/training_program/([0-9]+)/students/add", AddTrainingProgramStudentHandler),
+    (r"/training_program/([0-9]+)/students/bulk_add", BulkAddTrainingProgramStudentsHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/remove", RemoveTrainingProgramStudentHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/edit", StudentHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/tags", StudentTagsHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/tasks", StudentTasksHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/tasks/add", AddStudentTaskHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/task/([0-9]+)/remove", RemoveStudentTaskHandler),
+    (r"/training_program/([0-9]+)/student/([0-9]+)/task/([0-9]+)/submissions", StudentTaskSubmissionsHandler),
     (r"/training_program/([0-9]+)/bulk_assign_task", BulkAssignTaskHandler),
     (r"/training_program/([0-9]+)/tasks", TrainingProgramTasksHandler),
     (r"/training_program/([0-9]+)/tasks/add", AddTrainingProgramTaskHandler),
diff --git a/cms/server/admin/handlers/contestranking.py b/cms/server/admin/handlers/contestranking.py
index cba6e01036..94c97c1370 100644
--- a/cms/server/admin/handlers/contestranking.py
+++ b/cms/server/admin/handlers/contestranking.py
@@ -51,19 +51,28 @@
 )
 
 
-class RankingHandler(BaseHandler):
-    """Shows the ranking for a contest.
+class RankingCommonMixin:
+    """Mixin for handlers that need ranking logic (calculation and export)."""
 
-    """
-    @require_permission(BaseHandler.AUTHENTICATED)
-    def get(self, contest_id, format="online"):
+    def _load_contest_data(self, contest_id: str) -> Contest:
+        """Load a contest with all necessary data for ranking.
+
+        This method loads the contest with tasks, participations, and related
+        entities needed for ranking calculation and display.
+
+        Args:
+            contest_id: The ID of the contest to load.
+
+        Returns:
+            The fully loaded Contest object.
+        """
         # This validates the contest id.
         self.safe_get_item(Contest, contest_id)
 
         # Load contest with tasks, participations, and statement views.
         # We use the score cache to get score and has_submissions.
         # partial is computed at render time via SQL aggregation for correctness.
-        self.contest: Contest = (
+        contest: Contest = (
             self.sql_session.query(Contest)
             .filter(Contest.id == contest_id)
             .options(joinedload("tasks"))
@@ -74,7 +83,23 @@ def get(self, contest_id, format="online"):
             .options(joinedload("participations.statement_views"))
             .first()
         )
+        return contest
+
+    def _calculate_scores(self, contest, can_access_by_pt):
+        """Calculate scores for all participations in the contest.
+
+        This method uses the efficient approach from RankingHandler:
+        1. SQL aggregation for partial flags.
+        2. Score cache for scores and submission existence.
+        3. Two-phase commit to handle cache rebuilds safely.
 
+        contest: The contest object (with participations and tasks loaded).
+        can_access_by_pt: A dict (participation_id, task_id) -> bool indicating
+                          if a participant can access a task.
+
+        Returns:
+            show_teams (bool): Whether any participation has a team.
+        """
         # SQL aggregation to compute t_partial for all participation/task pairs.
         # t_partial is True when there's an official submission that is not yet scored.
         # has_submissions is retrieved from the cache instead.
@@ -94,9 +119,9 @@ def get(self, contest_id, format="online"):
                             SubmissionResult.public_score.is_(None),
                             SubmissionResult.public_score_details.is_(None),
                             SubmissionResult.ranking_score_details.is_(None),
-                        )
+                        ),
                     )
-                ).label('t_partial')
+                ).label("t_partial"),
             )
             .join(Participation, Submission.participation_id == Participation.id)
             .join(Task, Submission.task_id == Task.id)
@@ -104,10 +129,10 @@ def get(self, contest_id, format="online"):
                 SubmissionResult,
                 and_(
                     SubmissionResult.submission_id == Submission.id,
-                    SubmissionResult.dataset_id == Task.active_dataset_id
-                )
+                    SubmissionResult.dataset_id == Task.active_dataset_id,
+                ),
             )
-            .filter(Participation.contest_id == contest_id)
+            .filter(Participation.contest_id == contest.id)
             .filter(Submission.official.is_(True))
             .group_by(Submission.participation_id, Submission.task_id)
         )
@@ -115,24 +140,13 @@ def get(self, contest_id, format="online"):
         # Build lookup dict: (participation_id, task_id) -> t_partial
         partial_by_pt = {}
         for row in partial_flags_query.all():
-            partial_by_pt[(row.participation_id, row.task_id)] = (
-                row.t_partial or False
-            )
+            partial_by_pt[(row.participation_id, row.task_id)] = row.t_partial or False
 
         statement_views_set = set()
-        for p in self.contest.participations:
+        for p in contest.participations:
             for sv in p.statement_views:
                 statement_views_set.add((sv.participation_id, sv.task_id))
 
-        # Build lookup for task accessibility based on visibility tags.
-        training_day = self.contest.training_day
-        can_access_by_pt = {}  # (participation_id, task_id) -> bool
-        for p in self.contest.participations:
-            for task in self.contest.get_tasks():
-                can_access_by_pt[(p.id, task.id)] = can_access_task(
-                    self.sql_session, task, p, training_day
-                )
-
         # Preprocess participations: get data about teams, scores
         # Use the score cache to get score and has_submissions.
         # partial is computed via SQL aggregation above for correctness.
@@ -144,13 +158,13 @@ def get(self, contest_id, format="online"):
         # which would clear any dynamically added attributes like task_statuses.
         show_teams = False
         participation_data = {}  # p.id -> (task_statuses, total_score)
-        for p in self.contest.participations:
+        for p in contest.participations:
             show_teams = show_teams or p.team_id
 
             task_statuses = []
             total_score = 0.0
             partial = False
-            for task in self.contest.get_tasks():
+            for task in contest.get_tasks():
                 # Get the cache entry with score and has_submissions
                 cache_entry = get_cached_score_entry(self.sql_session, p, task)
                 t_score = round(cache_entry.score, task.score_precision)
@@ -171,7 +185,7 @@ def get(self, contest_id, format="online"):
                 )
                 total_score += t_score
                 partial = partial or t_partial
-            total_score = round(total_score, self.contest.score_precision)
+            total_score = round(total_score, contest.score_precision)
             participation_data[p.id] = (task_statuses, (total_score, partial))
 
         # Commit to persist any cache rebuilds and release advisory locks.
@@ -180,11 +194,128 @@ def get(self, contest_id, format="online"):
 
         # Now attach transient attributes after commit (so they aren't cleared
         # by SQLAlchemy's expire-on-commit behavior).
-        for p in self.contest.participations:
+        for p in contest.participations:
             p.task_statuses, p.total_score = participation_data[p.id]
 
+        return show_teams
+
+    @staticmethod
+    def _status_indicator(status: TaskStatus) -> str:
+        star = "*" if status.partial else ""
+        if not status.can_access:
+            return "N/A"
+        if not status.has_submissions:
+            return "X" if not status.has_opened else "-"
+        if not status.has_opened:
+            return "!" + star
+        return star
+
+    def _write_csv(
+        self,
+        contest,
+        participations,
+        tasks,
+        student_tags_by_participation,
+        show_teams,
+        include_partial=True,
+        task_archive_progress_by_participation=None,
+    ):
+        output = io.StringIO()
+        writer = csv.writer(output)
+
+        # Build header row
+        row = ["Username", "User"]
+        if student_tags_by_participation:
+            row.append("Tags")
+        if task_archive_progress_by_participation:
+            row.append("Task Archive Progress")
+        if show_teams:
+            row.append("Team")
+        for task in tasks:
+            row.append(task.name)
+            if include_partial:
+                row.append("P")
+
+        row.append("Global")
+        if include_partial:
+            row.append("P")
+
+        writer.writerow(row)
+
+        # Build task index lookup for task_statuses.
+        # We assume p.task_statuses follows the order of contest.get_tasks().
+        all_tasks = list(contest.get_tasks())
+        task_index = {task.id: i for i, task in enumerate(all_tasks)}
+
+        for p in participations:
+            row = [p.user.username, "%s %s" % (p.user.first_name, p.user.last_name)]
+            if student_tags_by_participation:
+                tags = student_tags_by_participation.get(p.id, [])
+                row.append(", ".join(tags))
+            if task_archive_progress_by_participation:
+                progress = task_archive_progress_by_participation.get(p.id, {})
+                row.append(
+                    "%.1f%% (%.1f/%.1f)"
+                    % (
+                        progress.get("percentage", 0),
+                        progress.get("total_score", 0),
+                        progress.get("max_score", 0),
+                    )
+                )
+            if show_teams:
+                row.append(p.team.name if p.team else "")
+
+            # Calculate total score for exported tasks only
+            total_score = 0.0
+            partial = False
+            for task in tasks:
+                idx = task_index.get(task.id)
+                if idx is not None and idx < len(p.task_statuses):
+                    status = p.task_statuses[idx]
+                    row.append(status.score)
+                    if include_partial:
+                        row.append(self._status_indicator(status))
+                    total_score += status.score
+                    partial = partial or status.partial
+                else:
+                    # Should not happen if data is consistent
+                    row.append(0)
+                    if include_partial:
+                        row.append("")
+
+            total_score = round(total_score, contest.score_precision)
+            row.append(total_score)
+            if include_partial:
+                row.append("*" if partial else "")
+
+            writer.writerow(row)
+
+        return output.getvalue()
+
+
+class RankingHandler(RankingCommonMixin, BaseHandler):
+    """Shows the ranking for a contest."""
+
+    @require_permission(BaseHandler.AUTHENTICATED)
+    def get(self, contest_id, format="online"):
+        self.contest = self._load_contest_data(contest_id)
+
+        # Build lookup for task accessibility based on visibility tags.
+        training_day = self.contest.training_day
+        can_access_by_pt = {}  # (participation_id, task_id) -> bool
+        for p in self.contest.participations:
+            for task in self.contest.get_tasks():
+                can_access_by_pt[(p.id, task.id)] = can_access_task(
+                    self.sql_session, task, p, training_day
+                )
+
+        show_teams = self._calculate_scores(self.contest, can_access_by_pt)
+
         self.r_params = self.render_params()
         self.r_params["show_teams"] = show_teams
+        self.r_params["task_archive_progress_by_participation"] = (
+            None  # Only for training programs
+        )
 
         # Check if this is a training day with main groups
         training_day = self.contest.training_day
@@ -252,22 +383,19 @@ def get(self, contest_id, format="online"):
                 # Sort participations by group-specific total score (sum of accessible tasks only)
                 # Capture accessible_tasks in closure to avoid late binding issues
                 def get_group_score(p, tasks=accessible_tasks):
-                    return sum(
-                        p.task_statuses[task_index[t.id]].score
-                        for t in tasks
-                    )
+                    return sum(p.task_statuses[task_index[t.id]].score for t in tasks)
 
                 sorted_participations = sorted(
-                    group_participations,
-                    key=get_group_score,
-                    reverse=True
+                    group_participations, key=get_group_score, reverse=True
                 )
 
-                main_groups_data.append({
-                    "name": mg,
-                    "participations": sorted_participations,
-                    "tasks": accessible_tasks,
-                })
+                main_groups_data.append(
+                    {
+                        "name": mg,
+                        "participations": sorted_participations,
+                        "tasks": accessible_tasks,
+                    }
+                )
 
             # Get all student tags for display
             self.r_params["all_student_tags"] = get_all_student_tags(training_program)
@@ -297,8 +425,7 @@ def get_group_score(p, tasks=accessible_tasks):
             else:
                 filename = f"{date_str}_{contest_name}_ranking.txt"
             self.set_header("Content-Type", "text/plain")
-            self.set_header("Content-Disposition",
-                            f"attachment; filename=\"{filename}\"")
+            self.set_header("Content-Disposition", f'attachment; filename="{filename}"')
             self.render("ranking.txt", **self.r_params)
         elif format == "csv":
             if export_group_data:
@@ -307,13 +434,7 @@ def get_group_score(p, tasks=accessible_tasks):
             else:
                 filename = f"{date_str}_{contest_name}_ranking.csv"
             self.set_header("Content-Type", "text/csv")
-            self.set_header("Content-Disposition",
-                            f"attachment; filename=\"{filename}\"")
-
-            output = io.StringIO()
-            writer = csv.writer(output)
-
-            include_partial = True
+            self.set_header("Content-Disposition", f'attachment; filename="{filename}"')
 
             contest: Contest = self.r_params["contest"]
 
@@ -325,74 +446,25 @@ def get_group_score(p, tasks=accessible_tasks):
                 export_participations = sorted(
                     [p for p in contest.participations if not p.hidden],
                     key=lambda p: p.total_score,
-                    reverse=True
+                    reverse=True,
                 )
                 export_tasks = list(contest.get_tasks())
 
-            # Build header row
-            row = ["Username", "User"]
-            if student_tags_by_participation:
-                row.append("Tags")
-            if show_teams:
-                row.append("Team")
-            for task in export_tasks:
-                row.append(task.name)
-                if include_partial:
-                    row.append("P")
-
-            row.append("Global")
-            if include_partial:
-                row.append("P")
-
-            writer.writerow(row)
-
-            # Build task index lookup for task_statuses
-            all_tasks = list(contest.get_tasks())
-            task_index = {task.id: i for i, task in enumerate(all_tasks)}
-
-            for p in export_participations:
-                row = [p.user.username,
-                       "%s %s" % (p.user.first_name, p.user.last_name)]
-                if student_tags_by_participation:
-                    tags = student_tags_by_participation.get(p.id, [])
-                    row.append(", ".join(tags))
-                if show_teams:
-                    row.append(p.team.name if p.team else "")
-
-                # Calculate total score for exported tasks only
-                total_score = 0.0
-                partial = False
-                for task in export_tasks:
-                    idx = task_index[task.id]
-                    status = p.task_statuses[idx]
-                    row.append(status.score)
-                    if include_partial:
-                        row.append(self._status_indicator(status))
-                    total_score += status.score
-                    partial = partial or status.partial
-
-                total_score = round(total_score, contest.score_precision)
-                row.append(total_score)
-                if include_partial:
-                    row.append("*" if partial else "")
-
-                writer.writerow(row)
-
-            self.finish(output.getvalue())
+            csv_content = self._write_csv(
+                contest,
+                export_participations,
+                export_tasks,
+                student_tags_by_participation,
+                show_teams,
+                include_partial=True,
+                task_archive_progress_by_participation=self.r_params.get(
+                    "task_archive_progress_by_participation"
+                ),
+            )
+            self.finish(csv_content)
         else:
             self.render("ranking.html", **self.r_params)
 
-    @staticmethod
-    def _status_indicator(status: TaskStatus) -> str:
-        star = "*" if status.partial else ""
-        if not status.can_access:
-            return "N/A"
-        if not status.has_submissions:
-            return "X" if not status.has_opened else "-"
-        if not status.has_opened:
-            return "!" + star
-        return star
-
 
 class ScoreHistoryHandler(BaseHandler):
     """Returns the score history for a contest as JSON.
diff --git a/cms/server/admin/handlers/contestuser.py b/cms/server/admin/handlers/contestuser.py
index 96373075d8..cfec1ec7fd 100644
--- a/cms/server/admin/handlers/contestuser.py
+++ b/cms/server/admin/handlers/contestuser.py
@@ -44,6 +44,7 @@
 
 from cms.db import Contest, Message, Participation, Submission, User, Team, TrainingDay
 from cms.db.training_day import get_managing_participation
+from cms.server.util import parse_usernames_from_file
 from cmscommon.crypto import validate_password_strength
 from cmscommon.datetime import make_datetime
 from .base import BaseHandler, require_permission
@@ -193,7 +194,7 @@ def post(self, contest_id):
             file_data = self.request.files["users_file"][0]
             file_content = file_data["body"].decode("utf-8")
 
-            usernames = file_content.split()
+            usernames = parse_usernames_from_file(file_content)
 
             if not usernames:
                 raise ValueError("File is empty or contains no usernames")
@@ -202,10 +203,6 @@ def post(self, contest_id):
             users_added = 0
 
             for username in usernames:
-                username = username.strip()
-                if not username:
-                    continue
-
                 user = self.sql_session.query(User).filter(
                     User.username == username).first()
 
diff --git a/cms/server/admin/handlers/student.py b/cms/server/admin/handlers/student.py
index 24a331d1a2..b930486b23 100644
--- a/cms/server/admin/handlers/student.py
+++ b/cms/server/admin/handlers/student.py
@@ -23,6 +23,8 @@
 
 import tornado.web
 
+from sqlalchemy import func
+
 from cms.db import (
     TrainingProgram,
     Participation,
@@ -38,7 +40,9 @@
 from cms.server.util import (
     get_all_student_tags,
     calculate_task_archive_progress,
+    get_student_archive_scores,
     parse_tags,
+    parse_usernames_from_file,
 )
 from cmscommon.datetime import make_datetime
 
@@ -71,10 +75,17 @@ def get(self, training_program_id: str):
         student_progress = {}
         for student in training_program.students:
             student_progress[student.id] = calculate_task_archive_progress(
-                student, student.participation, managing_contest
+                student, student.participation, managing_contest, self.sql_session
             )
+        # Commit to release any advisory locks taken by get_cached_score_entry
+        self.sql_session.commit()
 
         self.r_params["student_progress"] = student_progress
+        self.r_params["bulk_add_results"] = None
+
+        # For bulk assign task modal
+        self.r_params["all_tasks"] = managing_contest.get_tasks()
+        self.r_params["all_student_tags"] = get_all_student_tags(training_program)
 
         self.render("training_program_students.html", **self.r_params)
 
@@ -85,24 +96,25 @@ def post(self, training_program_id: str):
         self.safe_get_item(TrainingProgram, training_program_id)
 
         try:
-            user_id = self.get_argument("user_id")
             operation = self.get_argument("operation")
-            assert operation in (
-                self.REMOVE_FROM_PROGRAM,
-            ), "Please select a valid operation"
+            # Support both old format (radio button + "Remove from training program")
+            # and new format (button with value "remove_<user_id>")
+            if operation == self.REMOVE_FROM_PROGRAM:
+                user_id = self.get_argument("user_id")
+            elif operation.startswith("remove_"):
+                user_id = operation.replace("remove_", "")
+            else:
+                raise ValueError("Please select a valid operation")
         except Exception as error:
             self.service.add_notification(
                 make_datetime(), "Invalid field(s)", repr(error))
             self.redirect(fallback_page)
             return
 
-        if operation == self.REMOVE_FROM_PROGRAM:
-            asking_page = \
-                self.url("training_program", training_program_id, "student", user_id, "remove")
-            self.redirect(asking_page)
-            return
-
-        self.redirect(fallback_page)
+        # Redirect to confirmation page
+        asking_page = \
+            self.url("training_program", training_program_id, "student", user_id, "remove")
+        self.redirect(asking_page)
 
 
 class AddTrainingProgramStudentHandler(BaseHandler):
@@ -160,6 +172,129 @@ def post(self, training_program_id: str):
         self.redirect(fallback_page)
 
 
+class BulkAddTrainingProgramStudentsHandler(BaseHandler):
+    """Bulk add students to a training program from a file."""
+
+    @require_permission(BaseHandler.PERMISSION_ALL)
+    def post(self, training_program_id: str):
+        training_program = self.safe_get_item(TrainingProgram, training_program_id)
+        managing_contest = training_program.managing_contest
+
+        try:
+            if "students_file" not in self.request.files:
+                raise ValueError("No file uploaded")
+
+            file_data = self.request.files["students_file"][0]
+            file_content = file_data["body"].decode("utf-8")
+
+            usernames = parse_usernames_from_file(file_content)
+
+            if not usernames:
+                raise ValueError("File is empty or contains no usernames")
+
+            results = []
+            students_added = 0
+
+            for username in usernames:
+                user = self.sql_session.query(User).filter(
+                    User.username == username).first()
+
+                if user is None:
+                    results.append({
+                        "username": username,
+                        "status": "not_found",
+                        "message": "Username does not exist in the system"
+                    })
+                else:
+                    existing_participation = (
+                        self.sql_session.query(Participation)
+                        .filter(Participation.contest == managing_contest)
+                        .filter(Participation.user == user)
+                        .first()
+                    )
+
+                    if existing_participation is not None:
+                        results.append({
+                            "username": username,
+                            "status": "already_exists",
+                            "message": "User is already a student in this program"
+                        })
+                    else:
+                        participation = Participation(
+                            contest=managing_contest,
+                            user=user,
+                            starting_time=make_datetime()
+                        )
+                        self.sql_session.add(participation)
+                        self.sql_session.flush()
+
+                        student = Student(
+                            training_program=training_program,
+                            participation=participation,
+                            student_tags=[]
+                        )
+                        self.sql_session.add(student)
+
+                        for training_day in training_program.training_days:
+                            if training_day.contest is None:
+                                continue
+                            td_participation = Participation(
+                                contest=training_day.contest,
+                                user=user
+                            )
+                            self.sql_session.add(td_participation)
+
+                        results.append({
+                            "username": username,
+                            "status": "success",
+                            "message": "Successfully added to training program"
+                        })
+                        students_added += 1
+
+            if self.try_commit():
+                if students_added > 0:
+                    self.service.proxy_service.reinitialize()
+            else:
+                # Commit failed - redirect to avoid showing misleading results
+                self.redirect(
+                    self.url("training_program", training_program_id, "students")
+                )
+                return
+
+            self.render_params_for_training_program(training_program)
+
+            assigned_user_ids_q = self.sql_session.query(Participation.user_id).filter(
+                Participation.contest == managing_contest
+            )
+
+            self.r_params["unassigned_users"] = (
+                self.sql_session.query(User)
+                .filter(~User.id.in_(assigned_user_ids_q))
+                .filter(~User.username.like(r"\_\_%", escape="\\"))
+                .all()
+            )
+
+            student_progress = {}
+            for student in training_program.students:
+                student_progress[student.id] = calculate_task_archive_progress(
+                    student, student.participation, managing_contest, self.sql_session
+                )
+            # Commit to release any advisory locks taken by get_cached_score_entry
+            self.sql_session.commit()
+
+            self.r_params["student_progress"] = student_progress
+            self.r_params["bulk_add_results"] = results
+            self.r_params["students_added"] = students_added
+            self.r_params["all_tasks"] = managing_contest.get_tasks()
+            self.r_params["all_student_tags"] = get_all_student_tags(training_program)
+            self.render("training_program_students.html", **self.r_params)
+
+        except Exception as error:
+            self.service.add_notification(
+                make_datetime(), "Error processing file", repr(error))
+            self.redirect(self.url("training_program", training_program_id, "students"))
+
+
 class RemoveTrainingProgramStudentHandler(BaseHandler):
     """Confirm and remove a student from a training program."""
 
@@ -179,15 +314,17 @@ def get(self, training_program_id: str, user_id: str):
         if participation is None:
             raise tornado.web.HTTPError(404)
 
-        submission_query = self.sql_session.query(Submission)\
-            .filter(Submission.participation == participation)
-        self.render_params_for_remove_confirmation(submission_query)
-
-        # Use the helper to set up training program params
+        # Use the helper to set up training program params first
+        # (this initializes r_params, so it must come before render_params_for_remove_confirmation)
         self.render_params_for_training_program(training_program)
         self.r_params["unanswered"] = 0  # Override for deletion confirmation page
         self.r_params["user"] = user
 
+        # Now add submission count (this adds to existing r_params)
+        submission_query = self.sql_session.query(Submission)\
+            .filter(Submission.participation == participation)
+        self.render_params_for_remove_confirmation(submission_query)
+
         # Count submissions and participations from training days
         training_day_contest_ids = [td.contest_id for td in training_program.training_days]
         training_day_contest_ids = [
@@ -299,10 +436,12 @@ def get(self, training_program_id: str, user_id: str):
             Submission.participation == participation
         )
         page = int(self.get_query_argument("page", "0"))
-        self.render_params_for_submissions(submission_query, page)
 
         # render_params_for_training_program sets training_program, contest, unanswered
         self.render_params_for_training_program(training_program)
+
+        self.render_params_for_submissions(submission_query, page)
+
         self.r_params["participation"] = participation
         self.r_params["student"] = student
         self.r_params["selected_user"] = participation.user
@@ -489,10 +628,13 @@ def get(self, training_program_id: str, user_id: str):
         assigned_task_ids = {st.task_id for st in student.student_tasks}
         available_tasks = [t for t in all_tasks if t.id not in assigned_task_ids]
 
-        # Build home scores from participation task_scores cache
-        home_scores = {}
-        for pts in participation.task_scores:
-            home_scores[pts.task_id] = pts.score
+        # Build home scores using get_student_archive_scores for fresh cache values
+        # This avoids stale entries in participation.task_scores
+        home_scores = get_student_archive_scores(
+            self.sql_session, student, participation, managing_contest
+        )
+        # Commit to release advisory locks from cache rebuilds
+        self.sql_session.commit()
 
         # Build training scores from archived student rankings (batch query)
         training_scores = {}
@@ -522,6 +664,21 @@ def get(self, training_program_id: str, user_id: str):
                 if task_id_str in archived_ranking.task_scores:
                     training_scores[st.task_id] = archived_ranking.task_scores[task_id_str]
 
+        # Get submission counts for each task (batch query for efficiency)
+        submission_counts = {}
+        if assigned_task_ids:
+            counts = (
+                self.sql_session.query(
+                    Submission.task_id,
+                    func.count(Submission.id)
+                )
+                .filter(Submission.participation_id == participation.id)
+                .filter(Submission.task_id.in_(assigned_task_ids))
+                .group_by(Submission.task_id)
+                .all()
+            )
+            submission_counts = {task_id: count for task_id, count in counts}
+
         self.render_params_for_training_program(training_program)
         self.r_params["participation"] = participation
         self.r_params["student"] = student
@@ -532,9 +689,73 @@ def get(self, training_program_id: str, user_id: str):
         self.r_params["available_tasks"] = available_tasks
         self.r_params["home_scores"] = home_scores
         self.r_params["training_scores"] = training_scores
+        self.r_params["submission_counts"] = submission_counts
         self.render("student_tasks.html", **self.r_params)
 
 
+class StudentTaskSubmissionsHandler(BaseHandler):
+    """View submissions for a specific task in a student's archive."""
+
+    @require_permission(BaseHandler.AUTHENTICATED)
+    def get(self, training_program_id: str, user_id: str, task_id: str):
+        training_program = self.safe_get_item(TrainingProgram, training_program_id)
+        managing_contest = training_program.managing_contest
+        task = self.safe_get_item(Task, task_id)
+
+        # Validate task belongs to the training program
+        if task.contest_id != managing_contest.id:
+            raise tornado.web.HTTPError(404)
+
+        participation: Participation | None = (
+            self.sql_session.query(Participation)
+            .filter(Participation.contest_id == managing_contest.id)
+            .filter(Participation.user_id == user_id)
+            .first()
+        )
+
+        if participation is None:
+            raise tornado.web.HTTPError(404)
+
+        student: Student | None = (
+            self.sql_session.query(Student)
+            .filter(Student.participation == participation)
+            .filter(Student.training_program == training_program)
+            .first()
+        )
+
+        if student is None:
+            raise tornado.web.HTTPError(404)
+
+        # Verify student is assigned this specific task
+        student_task = (
+            self.sql_session.query(StudentTask)
+            .filter(StudentTask.student == student)
+            .filter(StudentTask.task == task)
+            .first()
+        )
+
+        if student_task is None:
+            raise tornado.web.HTTPError(404)
+
+        # Filter submissions by task
+        self.contest = managing_contest
+        submission_query = (
+            self.sql_session.query(Submission)
+            .filter(Submission.participation == participation)
+            .filter(Submission.task_id == task.id)
+        )
+        page = int(self.get_query_argument("page", "0"))
+
+        self.render_params_for_training_program(training_program)
+        self.render_params_for_submissions(submission_query, page)
+
+        self.r_params["participation"] = participation
+        self.r_params["student"] = student
+        self.r_params["selected_user"] = participation.user
+        self.r_params["task"] = task
+        self.render("student_task_submissions.html", **self.r_params)
+
+
 class AddStudentTaskHandler(BaseHandler):
     """Add a task to a student's task archive."""
 
@@ -670,28 +891,17 @@ def post(self, training_program_id: str, user_id: str, task_id: str):
 
 
 class BulkAssignTaskHandler(BaseHandler):
-    """Bulk assign a task to all students with a given tag."""
+    """Bulk assign a task to all students with a given tag.
 
-    @require_permission(BaseHandler.PERMISSION_ALL)
-    def get(self, training_program_id: str):
-        training_program = self.safe_get_item(TrainingProgram, training_program_id)
-        managing_contest = training_program.managing_contest
-
-        # Get all tasks in the training program
-        all_tasks = managing_contest.get_tasks()
-
-        # Get all unique student tags
-        all_student_tags = get_all_student_tags(training_program)
-
-        self.render_params_for_training_program(training_program)
-        self.r_params["all_tasks"] = all_tasks
-        self.r_params["all_student_tags"] = all_student_tags
-        self.render("bulk_assign_task.html", **self.r_params)
+    Note: The GET method was removed as the bulk assign task functionality
+    is now handled via a modal dialog on the students page.
+    """
 
     @require_permission(BaseHandler.PERMISSION_ALL)
     def post(self, training_program_id: str):
+        # Redirect to students page (modal is now on that page)
         fallback_page = self.url(
-            "training_program", training_program_id, "bulk_assign_task"
+            "training_program", training_program_id, "students"
         )
 
         training_program = self.safe_get_item(TrainingProgram, training_program_id)
diff --git a/cms/server/admin/handlers/trainingprogram.py b/cms/server/admin/handlers/trainingprogram.py
index 10291a8faa..37e2a34e55 100644
--- a/cms/server/admin/handlers/trainingprogram.py
+++ b/cms/server/admin/handlers/trainingprogram.py
@@ -35,23 +35,26 @@
 
 from cms.db import (
     Contest,
-    DelayRequest,
     TrainingProgram,
     Participation,
     Submission,
-    User,
     Task,
     Question,
     Announcement,
     Student,
+    StudentTask,
 )
 from cms.server.util import (
     get_all_student_tags,
     parse_tags,
+    calculate_task_archive_progress,
 )
 from cmscommon.datetime import make_datetime
 
 from .base import BaseHandler, SimpleHandler, require_permission
+from .contestranking import RankingCommonMixin
+
+
 class TrainingProgramListHandler(SimpleHandler("training_programs.html")):
     """List all training programs.
 
@@ -615,64 +618,43 @@ def delete(self, training_program_id: str, task_id: str):
         self.write("../../tasks")
 
 
-class TrainingProgramRankingHandler(BaseHandler):
+class TrainingProgramRankingHandler(RankingCommonMixin, BaseHandler):
     """Show ranking for a training program."""
 
     @require_permission(BaseHandler.AUTHENTICATED)
     def get(self, training_program_id: str, format: str = "online"):
-        import csv
-        import io
-        from sqlalchemy.orm import joinedload
-        from cms.grading.scoring import task_score
-        from .contestranking import TaskStatus
-
         training_program = self.safe_get_item(TrainingProgram, training_program_id)
         managing_contest = training_program.managing_contest
 
-        self.contest = (
-            self.sql_session.query(Contest)
-            .filter(Contest.id == managing_contest.id)
-            .options(joinedload("participations"))
-            .options(joinedload("participations.submissions"))
-            .options(joinedload("participations.submissions.token"))
-            .options(joinedload("participations.submissions.results"))
-            .options(joinedload("participations.statement_views"))
-            .first()
-        )
+        self.contest = self._load_contest_data(managing_contest.id)
 
-        statement_views_set = set()
+        # Build a dict of (participation_id, task_id) -> bool for tasks that students can access
+        # A student can access a task if they have a StudentTask record for it
+        # Default is False since we're whitelisting access via StudentTask
+        can_access_by_pt = {}
         for p in self.contest.participations:
-            for sv in p.statement_views:
-                statement_views_set.add((sv.participation_id, sv.task_id))
+            for task in self.contest.get_tasks():
+                can_access_by_pt[(p.id, task.id)] = False
 
-        show_teams = False
-        for p in self.contest.participations:
-            show_teams = show_teams or p.team_id
+        participation_ids = [p.id for p in self.contest.participations]
+        if participation_ids:
+            rows = (
+                self.sql_session.query(Student.participation_id, StudentTask.task_id)
+                .join(StudentTask, Student.id == StudentTask.student_id)
+                .filter(Student.training_program_id == training_program.id)
+                .filter(Student.participation_id.in_(participation_ids))
+                .all()
+            )
+            for participation_id, task_id in rows:
+                can_access_by_pt[(participation_id, task_id)] = True
 
-            p.task_statuses = []
-            total_score = 0.0
-            partial = False
-            for task in self.contest.get_tasks():
-                t_score, t_partial = task_score(p, task, rounded=True)
-                has_submissions = any(s.task_id == task.id and s.official
-                                     for s in p.submissions)
-                has_opened = (p.id, task.id) in statement_views_set
-                p.task_statuses.append(
-                    TaskStatus(
-                        score=t_score,
-                        partial=t_partial,
-                        has_submissions=has_submissions,
-                        has_opened=has_opened,
-                        can_access=True,
-                    )
-                )
-                total_score += t_score
-                partial = partial or t_partial
+        show_teams = self._calculate_scores(self.contest, can_access_by_pt)
 
-            # Ensure task_statuses align with template header order
-            assert len(self.contest.get_tasks()) == len(p.task_statuses)
-            total_score = round(total_score, self.contest.score_precision)
-            p.total_score = (total_score, partial)
+        # Store participation data before commit (SQLAlchemy expires attributes on commit)
+        participation_data = {}
+        for p in self.contest.participations:
+            if hasattr(p, "task_statuses"):
+                participation_data[p.id] = (p.task_statuses, p.total_score)
 
         # Build student tags lookup for each participation (batch query)
         student_tags_by_participation = {p.id: [] for p in self.contest.participations}
@@ -690,90 +672,73 @@ def get(self, training_program_id: str, format: str = "online"):
             for participation_id, tags in rows:
                 student_tags_by_participation[participation_id] = tags or []
 
+        # Calculate task archive progress for this training program
+        task_archive_progress_by_participation = {}
+        students_query = (
+            self.sql_session.query(Student)
+            .filter(Student.training_program_id == training_program.id)
+            .all()
+        )
+        student_by_participation_id = {s.participation_id: s for s in students_query}
+
+        for p in self.contest.participations:
+            student = student_by_participation_id.get(p.id)
+            if student:
+                progress = calculate_task_archive_progress(
+                    student, p, self.contest, self.sql_session
+                )
+                task_archive_progress_by_participation[p.id] = progress
+
+        # Commit to release any advisory locks taken during score calculation
+        self.sql_session.commit()
+
+        # Re-assign task_statuses after commit (SQLAlchemy expired them)
+        if "participation_data" in locals():
+            for p in self.contest.participations:
+                if p.id in participation_data:
+                    p.task_statuses, p.total_score = participation_data[p.id]
+
         self.render_params_for_training_program(training_program)
         self.r_params["show_teams"] = show_teams
         self.r_params["student_tags_by_participation"] = student_tags_by_participation
         self.r_params["main_groups_data"] = None  # Not used for training program ranking
+        self.r_params["task_archive_progress_by_participation"] = (
+            task_archive_progress_by_participation
+        )
 
         if format == "txt":
             self.set_header("Content-Type", "text/plain")
-            self.set_header("Content-Disposition",
-                            "attachment; filename=\"ranking.txt\"")
+            filename = f"{training_program.name}_home_ranking.txt".replace(
+                " ", "_"
+            ).replace("/", "_")
+            self.set_header("Content-Disposition", f'attachment; filename="{filename}"')
             self.render("ranking.txt", **self.r_params)
         elif format == "csv":
             self.set_header("Content-Type", "text/csv")
-            self.set_header("Content-Disposition",
-                            "attachment; filename=\"ranking.csv\"")
-
-            output = io.StringIO()
-            writer = csv.writer(output)
-
-            include_partial = True
-
-            row = ["Username", "User"]
-            if student_tags_by_participation:
-                row.append("Tags")
-            if show_teams:
-                row.append("Team")
-            for task in self.contest.tasks:
-                row.append(task.name)
-                if include_partial:
-                    row.append("P")
-
-            row.append("Global")
-            if include_partial:
-                row.append("P")
-
-            writer.writerow(row)
-
-            for p in sorted(self.contest.participations,
-                            key=lambda p: p.total_score, reverse=True):
-                if p.hidden:
-                    continue
-
-                row = [p.user.username,
-                       "%s %s" % (p.user.first_name, p.user.last_name)]
-                if student_tags_by_participation:
-                    tags = student_tags_by_participation.get(p.id, [])
-                    row.append(", ".join(tags))
-                if show_teams:
-                    row.append(p.team.name if p.team else "")
-                assert len(self.contest.tasks) == len(p.task_statuses)
-                for status in p.task_statuses:
-                    row.append(status.score)
-                    if include_partial:
-                        row.append(self._status_indicator(status))
-
-                total_score, partial = p.total_score
-                row.append(total_score)
-                if include_partial:
-                    row.append("*" if partial else "")
-
-                writer.writerow(row)
-
-            self.finish(output.getvalue())
+            filename = f"{training_program.name}_home_ranking.csv".replace(
+                " ", "_"
+            ).replace("/", "_")
+            self.set_header("Content-Disposition", f'attachment; filename="{filename}"')
+
+            export_participations = sorted(
+                [p for p in self.contest.participations if not p.hidden],
+                key=lambda p: p.total_score,
+                reverse=True,
+            )
+
+            csv_content = self._write_csv(
+                self.contest,
+                export_participations,
+                list(self.contest.get_tasks()),
+                student_tags_by_participation,
+                show_teams,
+                include_partial=True,
+                task_archive_progress_by_participation=task_archive_progress_by_participation,
+            )
+            self.finish(csv_content)
         else:
             self.render("ranking.html", **self.r_params)
 
-    @staticmethod
-    def _status_indicator(status) -> str:
-        """Return a status indicator string for CSV export.
-
-        status: a TaskStatus namedtuple with score, partial, has_submissions,
-            has_opened, can_access fields.
-
-        return: a string indicator for the status.
-
-        """
-        star = "*" if status.partial else ""
-        if not status.can_access:
-            return "N/A"
-        if not status.has_submissions:
-            return "X" if not status.has_opened else "-"
-        if not status.has_opened:
-            return "!" + star
-        return star
-
 
 class TrainingProgramSubmissionsHandler(BaseHandler):
     """Show submissions for a training program."""
diff --git a/cms/server/admin/static/aws_style.css b/cms/server/admin/static/aws_style.css
index 5591e06eb8..de179249a6 100644
--- a/cms/server/admin/static/aws_style.css
+++ b/cms/server/admin/static/aws_style.css
@@ -77,10 +77,6 @@ em {
     color: #F31313;
 }
 
-#global {
-    margin: 0;
-}
-
 a, a:visited {
     color: #426DC9;
 }
@@ -99,10 +95,6 @@ hr {
     clear: both;
 }
 
-.displayed {
-    display: block;
-}
-
 input, textarea {
     border: 1px solid #53637D;
     border-radius: 4px;
@@ -117,12 +109,6 @@ input:focus, textarea:focus {
     border: 1px solid #FFD69C;
 }
 
-ul.normal_list {
-    list-style: disc;
-    list-style-position: inside;
-    padding-left: 0.5em;
-}
-
 .inline {
     display: inline;
 }
@@ -1390,545 +1376,12 @@ table.diff-open th.diff-only, table.diff-open td.diff-only {
     word-wrap: break-word;
 }
 
-/* Student tags display styling */
-/* Note: Tagify replaces the input with its own .tagify wrapper,
-   so we target .tagify for the actual styling */
-.student-tags-display {
-    border: none;
-    background: transparent;
-    width: 100%;
-}
-
-.student-tags-display + .tagify,
-.tagify.student-tags-display {
-    border: none;
-    background: transparent;
-    width: 100%;
-}
-
-.no-tags-indicator {
-    color: #64748B;  /* Improved contrast for WCAG AA compliance */
-    font-style: italic;
-}
-
-/* --- Training Program Views (Attendance & Ranking) --- */
-
-/* Layout & Container */
-.tp-page-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-    flex-wrap: wrap;
-    gap: 15px;
-}
-
 .core_title h1 {
     margin: 0;
     font-size: 1.75rem;
     color: #111827;
 }
 
-/* Filter Bar */
-.tp-filter-card {
-    background-color: #f9fafb;
-    border: 1px solid #e5e7eb;
-    border-radius: 8px;
-    padding: 12px 16px;
-    margin-bottom: 24px;
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    flex-wrap: wrap;
-}
-
-.tp-filter-group {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.tp-filter-label {
-    font-weight: 600;
-    font-size: 0.85rem;
-    color: #4b5563;
-}
-
-.tp-filter-input {
-    padding: 6px 10px;
-    border: 1px solid #cbd5e1;
-    border-radius: 4px;
-    font-size: 0.9rem;
-    color: #334155;
-    transition: border-color 0.2s, box-shadow 0.2s;
-}
-
-.tp-filter-input:focus {
-    border-color: #0F766E;
-    box-shadow: 0 0 0 3px rgba(15, 118, 110, 0.1);
-    outline: none;
-}
-
-
-.tp-btn-primary {
-    background-color: #0F766E;
-    color: white;
-    border: none;
-    padding: 6px 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    font-weight: 500;
-    font-size: 0.9rem;
-    font-family: inherit;
-    transition: all 0.2s;
-    text-decoration: none;
-    display: inline-block;
-    line-height: 1.5;
-    box-sizing: border-box;
-    vertical-align: middle;
-}
-
-.tp-btn-primary:hover {
-    background-color: #0d655e;
-    color: white;
-}
-
-.tp-btn-text {
-    color: #6b7280;
-    text-decoration: underline;
-    font-size: 0.85rem;
-    margin-left: auto;
-}
-
-.tp-btn-secondary {
-    background-color: white;
-    color: #0F766E;
-    border: 1px solid #cbd5e1;
-    padding: 6px 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    font-weight: 500;
-    font-size: 0.9rem;
-    font-family: inherit;
-    transition: all 0.2s;
-    text-decoration: none;
-    display: inline-block;
-    line-height: 1.5;
-    box-sizing: border-box;
-    vertical-align: middle;
-}
-
-/* Data Table Wrapper */
-.tp-table-container {
-    overflow-x: auto;
-    max-height: 75vh;
-    border: 1px solid #e2e8f0;
-    border-radius: 8px;
-    background: white;
-    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
-    position: relative;
-    /* Ensure the container width is handled correctly */
-    width: 100%;
-}
-
-/* Common Table Styles */
-.attendance-table,
-.ranking-table {
-    width: auto;
-    border-collapse: separate; /* Required for sticky headers */
-    border-spacing: 0;
-    font-size: 0.9rem;
-    white-space: nowrap;
-}
-
-/* Force border-box for consistency */
-.ranking-table *, .attendance-table * {
-    box-sizing: border-box;
-}
-
-.attendance-table th,
-.attendance-table td,
-.ranking-table th,
-.ranking-table td {
-    padding: 0; /* Reset padding, inner divs handle it */
-    border-bottom: 1px solid #e2e8f0;
-    border-right: 1px solid #e2e8f0;
-    background-clip: padding-box;
-    vertical-align: middle;
-    height: 1px;
-}
-
-/* --- Sticky Headers & Columns --- */
-
-/* 1. Header Rows */
-.attendance-table thead th,
-.ranking-table thead th {
-    position: sticky;
-    top: 0;
-    background-color: #f8fafc;
-    z-index: 10;
-    color: #475569;
-    font-weight: 600;
-    text-align: left;
-    box-shadow: 0 1px 0 #cbd5e1; /* Visual bottom border */
-    padding: 10px 12px; /* Headers get direct padding */
-}
-
-.ranking-table thead th {
-    text-align: center;
-}
-
-.ranking-table thead th.student-header {
-    text-align: left;
-    vertical-align: middle;
-}
-
-/* 2. First Column (Students) */
-.attendance-table tbody th,
-.ranking-table tbody th {
-    position: sticky;
-    left: 0;
-    background-color: white;
-    z-index: 8;
-    text-align: left;
-    min-width: 250px;
-    max-width: 300px;
-    box-shadow: 4px 0 8px -2px rgba(0, 0, 0, 0.1);
-    clip-path: inset(0px -10px 0px 0px);
-    border-right: 1px solid #e2e8f0;
-    border-bottom: 1px solid #f1f5f9;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    color: #1e293b;
-    padding: 0;
-}
-
-/* 3. Top-Left Corner */
-.attendance-table thead tr:first-child th:first-child,
-.ranking-table thead tr:first-child th:first-child {
-    left: 0;
-    z-index: 20;
-    background-color: #f8fafc;
-    box-shadow: 1px 1px 0 #cbd5e1;
-}
-
-/* --- Attendance Table Specifics --- */
-.date-header-main { font-size: 0.95rem; color: #111827; }
-.date-header-sub { font-size: 0.75rem; color: #6b7280; font-weight: normal; margin-top: 2px; }
-
-/* Wrapper for cell content */
-.cell-wrapper {
-    display: flex;
-    flex-direction: column;
-    gap: 6px;
-    min-width: 140px;
-    padding: 10px 12px;
-}
-
-/* Modern Badges */
-.status-badge {
-    display: inline-flex;
-    align-items: center;
-    padding: 2px 8px;
-    border-radius: 9999px;
-    font-size: 0.75rem;
-    font-weight: 600;
-    width: fit-content;
-}
-
-.status-on-time { background-color: #d1fae5; color: #065f46; }
-.status-delayed { background-color: #fef3c7; color: #92400e; }
-.status-missed  { background-color: #fee2e2; color: #991b1b; }
-.status-unknown { background-color: #f3f4f6; color: #4b5563; }
-
-.location-row {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-size: 0.75rem;
-    color: #4b5563;
-}
-
-.location-icon { font-size: 0.85rem; }
-
-.reason-text {
-    font-size: 0.75rem;
-    color: #6b7280;
-    background: #f9fafb;
-    border-left: 2px solid #d1d5db;
-    padding: 2px 6px;
-    margin-top: 2px;
-    white-space: normal;
-    max-width: 200px;
-}
-
-.attendance-table .empty-cell { color: #d1d5db; font-size: 1.5rem; line-height: 0.5; padding: 10px; text-align: center;}
-
-
-/* --- Combined Ranking Specifics --- */
-.training-day-header {
-    background-color: #f1f5f9 !important;
-    text-align: center;
-    border-bottom: 1px solid #cbd5e1 !important;
-    pointer-events: none;
-}
-
-.global-total-header {
-    background-color: #f1f5f9 !important;
-    color: #0f172a;
-    font-weight: 800;
-    border-left: none !important;
-    border-right: 1px solid #e2e8f0 !important;
-}
-
-.ranking-table td.global-cell {
-    background-color: #f3f4f6 !important;
-    font-weight: 700;
-    border-left: none !important;
-    border-right: 1px solid #e2e8f0 !important;
-}
-
-.global-total-header::after,
-.ranking-table td.global-cell::after {
-    content: none !important;
-    display: none !important;
-}
-
-.training-day-header-main {
-    font-size: 0.95rem;
-    color: #334155;
-    font-weight: 700;
-}
-
-.training-day-header-sub {
-    font-size: 0.75rem;
-    color: #64748b;
-    font-weight: normal;
-    margin-top: 2px;
-}
-
-.task-header {
-    background-color: #ffffff !important;
-    font-size: 0.8rem;
-    color: #475569;
-    vertical-align: bottom;
-    border-left: 1px solid #e2e8f0 !important;
-    border-top: 3px solid #e2e8f0;
-}
-
-/* Total Column specific styling */
-.total-col {
-    border-left: 2px solid #e2e8f0 !important;
-    background-color: #f1f5f9;
-}
-
-.ranking-table thead th.total-col {
-    background-color: #f1f5f9 !important;
-    color: #0f172a;
-    font-weight: 800;
-}
-
-.ranking-table tbody td.total-col {
-    background-color: #f1f5f9 !important;
-    font-weight: 700;
-    color: #0f172a;
-}
-
-.ranking-table th.training-day-header,
-.ranking-table th.total-col,
-.ranking-table td.total-col {
-    border-right: none !important;
-}
-
-.ranking-table th.training-day-header,
-.ranking-table th.total-col {
-    position: sticky;
-    z-index: 11;
-}
-
-.ranking-table td.total-col {
-    position: relative;
-    z-index: 5;
-}
-
-.ranking-table th.training-day-header::after,
-.ranking-table th.total-col::after,
-.ranking-table td.total-col::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    width: 4px;
-    background-color: #cbd5e1;
-    z-index: 10;
-}
-
-/* Content wrapper for Ranking cells */
-.cell-content {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 12px 8px;
-    font-size: 1.25rem; /* Much smaller than 1.5em */
-    font-weight: 600;
-    border-radius: 6px; /* Soften the blockiness */
-    margin: 4px; /* Give the cell breathing room inside the grid */
-    height: calc(100% - 8px);
-    width: calc(100% - 8px);
-    color: #1e293b; /* Dark Slate, not black */
-    background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0.3));
-}
-
-/* Student name wrapper */
-.student-name-wrapper {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding: 10px 16px;
-    width: 100%;
-    height: 100%;
-}
-
-.student-name-link {
-    color: #0f172a;
-    text-decoration: none;
-    font-weight: 600;
-}
-.student-name-link:hover {
-    color: #0F766E;
-    text-decoration: underline;
-}
-.student-username {
-    display: block;
-    font-size: 0.75rem;
-    color: #64748b;
-    font-weight: normal;
-}
-
-.ranking-table .empty-cell-content {
-    color: #cbd5e1;
-    text-align: center;
-    font-weight: normal;
-}
-
-.inaccessible-cell {
-    background-color: #f3f4f6;
-    background-image: radial-gradient(#e5e7eb 1px, transparent 1px);
-    background-size: 10px 10px;
-    color: #9ca3af;
-}
-
-/* Attendance badges for combined ranking */
-.attendance-badge {
-    margin-left: 4px;
-    font-size: 0.75em;
-    vertical-align: middle;
-}
-
-.home-badge {
-    opacity: 0.7;
-}
-
-.missed-badge {
-    opacity: 0.8;
-}
-
-.history-link {
-    font-size: 0.75rem;
-    color: #6b7280;
-    text-decoration: none;
-    margin-left: 4px;
-}
-
-.history-link:hover {
-    color: #374151;
-    text-decoration: underline;
-}
-
-/* Hover effects */
-.ranking-table tbody tr:hover td {
-    background-color: #e2e8f0;
-}
-.ranking-table tbody tr:hover th {
-    background-color: #e2e8f0;
-}
-
-.ranking-table tbody tr:nth-child(even) {
-    background-color: #f8fafc; /* Very light gray */
-}
-
-
-.badge {
-    display: inline-flex;
-    align-items: center;
-    padding: 3px 10px;
-    font-size: 0.75em;
-    font-weight: 600;
-    line-height: 1.2;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    border-radius: 9999px;
-    margin-right: 4px;
-    margin-bottom: 2px;
-    border: 1px solid transparent;
-}
-
-.badge-pill {
-    border-radius: 9999px;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-.badge-teal {
-    background-color: #f0fdfa;
-    color: #0f766e;
-    border-color: #ccfbf1;
-}
-.badge-slate {
-    background-color: #f8fafc;
-    color: #475569;
-    border-color: #e2e8f0;
-}
-
-.ranking-table thead th {
-    position: sticky;
-}
-
-.ranking-table thead tr:first-child th {
-    height: auto;
-    padding: 12px 8px;
-    background-color: #fff;
-    border-bottom: 2px solid #e2e8f0;
-}
-
-.ranking-table thead tr:nth-child(2) th {
-    top: var(--ranking-header-top);
-    z-index: 15;
-    box-shadow: 0 2px 4px -2px rgba(0,0,0,0.1);
-    background-color: #fff;
-}
-
-.ranking-table thead tr:first-child th[rowspan="2"] {
-    top: 0;
-    height: auto;
-    z-index: 30;
-    background-color: #f8fafc;
-    vertical-align: middle;
-}
-
-.ranking-table thead tr:first-child th.student-header {
-    left: 0;
-    z-index: 40;
-    border-right: 2px solid #e2e8f0;
-    width: 250px;
-}
-
-.ranking-table thead th.global-total-header {
-    z-index: 25;
-}
-
 .sidebar-badge {
     display: inline-flex;
     align-items: center;
diff --git a/cms/server/admin/static/aws_tp_styles.css b/cms/server/admin/static/aws_tp_styles.css
new file mode 100644
index 0000000000..2e4f5276e7
--- /dev/null
+++ b/cms/server/admin/static/aws_tp_styles.css
@@ -0,0 +1,1451 @@
+/**
+ * Training Program Styles (aws_tp_styles.css)
+ *
+ * This file contains styles specific to training program pages in the admin interface.
+ * It uses CSS custom properties (variables) for colors to enable easy theming.
+ */
+
+/* ==========================================================================
+   Color Variables for Theming
+   ========================================================================== */
+
+:root {
+    /* Primary colors (teal theme) */
+    --tp-primary: #0F766E;
+    --tp-primary-hover: #0d655e;
+    --tp-primary-light: #14b8a6;
+    --tp-primary-gradient: linear-gradient(135deg, #0F766E 0%, #14b8a6 100%);
+
+    /* Status colors */
+    --tp-success: #059669;
+    --tp-success-light: #d1fae5;
+    --tp-success-dark: #065f46;
+
+    --tp-warning: #d97706;
+    --tp-warning-light: #fef3c7;
+    --tp-warning-dark: #92400e;
+
+    --tp-danger: #dc2626;
+    --tp-danger-light: #fef2f2;
+    --tp-danger-dark: #991b1b;
+    --tp-danger-border: #fecaca;
+
+    /* Info colors (blue) */
+    --tp-info: #3b82f6;
+    --tp-info-hover: #2563eb;
+    --tp-info-light: #f0f9ff;
+    --tp-info-border: #bae6fd;
+    --tp-info-dark: #0369a1;
+
+    /* Neutral colors */
+    --tp-text-primary: #1e293b;
+    --tp-text-secondary: #374151;
+    --tp-text-muted: #64748b;
+    --tp-text-light: #9ca3af;
+    --tp-text-lighter: #6b7280;
+
+    /* Background colors */
+    --tp-bg-white: #ffffff;
+    --tp-bg-light: #f8fafc;
+    --tp-bg-gray: #f3f4f6;
+    --tp-bg-hover: #f9fafb;
+
+    /* Border colors */
+    --tp-border: #e5e7eb;
+    --tp-border-light: #e2e8f0;
+    --tp-border-dark: #cbd5e1;
+
+    /* Shadow */
+    --tp-shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
+    --tp-shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+    --tp-shadow-lg: 0 10px 25px rgba(0, 0, 0, 0.1);
+    --tp-shadow-xl: 0 20px 60px rgba(0, 0, 0, 0.3);
+}
+
+/* ==========================================================================
+   Page Layout
+   ========================================================================== */
+
+.page-title {
+    margin-bottom: 24px;
+}
+
+.page-title h1 {
+    margin: 0;
+    font-size: 1.75rem;
+    color: var(--tp-text-primary);
+}
+
+.page-subtitle {
+    margin-top: 4px;
+    font-size: 0.9rem;
+    color: var(--tp-text-muted);
+}
+
+.page-subtitle a {
+    color: #475569;
+    font-weight: 600;
+    text-decoration: none;
+}
+
+.page-subtitle a:hover {
+    color: var(--tp-primary);
+}
+
+/* ==========================================================================
+   Action Buttons Row
+   ========================================================================== */
+
+.action-buttons-row {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 12px;
+    padding: 24px 0;
+    margin-bottom: 16px;
+}
+
+/* Outline button style */
+.btn-outline {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    padding: 10px 20px;
+    background: var(--tp-bg-white);
+    color: var(--tp-text-secondary);
+    border: 1px solid var(--tp-border);
+    border-radius: 8px;
+    font-size: 0.95rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s;
+    text-decoration: none;
+    font-family: inherit;
+}
+
+.btn-outline:hover {
+    background: var(--tp-bg-hover);
+    border-color: var(--tp-text-light);
+    color: var(--tp-text-primary);
+}
+
+.btn-outline svg,
+.btn-outline .btn-icon {
+    width: 18px;
+    height: 18px;
+}
+
+/* ==========================================================================
+   Sortable Table Headers
+   ========================================================================== */
+
+.sortable-header {
+    cursor: pointer;
+    user-select: none;
+    transition: color 0.2s;
+    white-space: nowrap;
+}
+
+.sortable-header:hover {
+    color: var(--tp-text-primary);
+    background: var(--tp-bg-light);
+}
+
+.sortable-header::after {
+    content: '\2195';
+    font-size: 1.1em;
+    margin-left: 5px;
+    opacity: 0.3;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.sortable-header.sort-asc::after {
+    content: '\2191';
+    opacity: 1;
+    color: var(--tp-primary);
+}
+
+.sortable-header.sort-desc::after {
+    content: '\2193';
+    opacity: 1;
+    color: var(--tp-primary);
+}
+
+/* ==========================================================================
+   Hidden File Input (for file upload buttons)
+   ========================================================================== */
+
+.file-input-hidden {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip-path: inset(50%);
+    border: 0;
+}
+
+/* ==========================================================================
+   Add Student Dropdown/Modal
+   ========================================================================== */
+
+.add-student-dropdown {
+    position: relative;
+    display: inline-block;
+}
+
+.add-student-form {
+    display: none;
+    position: absolute;
+    top: 100%;
+    right: 0;
+    margin-top: 8px;
+    background: var(--tp-bg-white);
+    border: 1px solid var(--tp-border);
+    border-radius: 8px;
+    padding: 16px;
+    box-shadow: var(--tp-shadow-lg);
+    z-index: 100;
+    min-width: 300px;
+}
+
+.add-student-form.show {
+    display: block;
+}
+
+.add-student-form label {
+    display: block;
+    font-size: 0.85rem;
+    font-weight: 600;
+    color: var(--tp-text-secondary);
+    margin-bottom: 6px;
+}
+
+.add-student-form .searchable-select {
+    width: 100%;
+    margin-bottom: 12px;
+}
+
+/* ==========================================================================
+   Student Table Styles
+   ========================================================================== */
+
+/* Page-specific table overrides */
+#students-table thead th {
+    position: static !important;
+    top: auto !important;
+    left: auto !important;
+    z-index: auto !important;
+    box-shadow: none !important;
+    font-size: 0.85rem;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
+    color: var(--tp-text-muted);
+    background: var(--tp-bg-light);
+    padding: 14px 16px !important;
+}
+
+#students-table td {
+    padding: 0;
+}
+
+.student-name-wrapper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 10px;
+    padding: 8px 10px;
+}
+
+.student-avatar {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    object-fit: cover;
+    flex-shrink: 0;
+    background: var(--tp-border);
+}
+
+.student-avatar-placeholder {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    background: var(--tp-primary-gradient);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: white;
+    font-weight: 600;
+    font-size: 0.85rem;
+    flex-shrink: 0;
+}
+
+.student-info {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
+    max-width: 100%;
+}
+
+.student-name-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: var(--tp-text-primary);
+    font-weight: 600;
+    text-decoration: none;
+    max-width: 150px;
+    display: block;
+}
+
+.student-name-link:hover {
+    color: var(--tp-primary);
+}
+
+.student-username {
+    font-size: 0.8em;
+    color: var(--tp-text-muted);
+    white-space: nowrap;
+}
+
+.student-tag-inline {
+    font-weight: normal;
+    font-size: 0.7em;
+}
+
+/* ==========================================================================
+   Progress Bar (inline style)
+   ========================================================================== */
+
+.progress-bar-inline {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.progress-bar-inline .percentage {
+    font-size: 0.9rem;
+    font-weight: 600;
+    color: #374151;
+    min-width: 40px;
+    text-align: right;
+}
+
+.progress-bar-inline .bar-container {
+    flex: 1;
+    height: 6px;
+    background: var(--tp-border);
+    border-radius: 3px;
+    overflow: hidden;
+    width: 120px;
+}
+
+.progress-bar-inline .bar-fill {
+    height: 100%;
+    border-radius: 3px;
+    transition: width 0.3s ease;
+}
+
+.progress-bar-inline .bar-fill.color-green {
+    background: var(--tp-success);
+}
+
+.progress-bar-inline .bar-fill.color-orange {
+    background: var(--tp-warning);
+}
+
+.progress-bar-inline .bar-fill.color-red {
+    background: var(--tp-danger);
+}
+
+/* ==========================================================================
+   Icon-only Button (for actions like delete)
+   ========================================================================== */
+
+.btn-icon-only {
+    background: none;
+    border: none;
+    padding: 6px;
+    cursor: pointer;
+    color: var(--tp-text-light);
+    border-radius: 4px;
+    transition: all 0.2s;
+}
+
+.btn-icon-only:hover {
+    color: var(--tp-danger);
+    background: var(--tp-danger-light);
+}
+
+.btn-icon-only:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+/* ==========================================================================
+   List Cell Wrapper (for table cells)
+   ========================================================================== */
+
+.list-cell-wrapper {
+    padding: 12px 16px;
+    display: flex;
+    align-items: center;
+}
+
+.list-cell-wrapper.center-content {
+    justify-content: center;
+}
+
+/* ==========================================================================
+   Form Groups (for modals and forms)
+   ========================================================================== */
+
+.tp-form-group {
+    margin-bottom: 16px;
+}
+
+.tp-form-group label {
+    display: block;
+    font-size: 0.85rem;
+    font-weight: 600;
+    color: var(--tp-text-secondary);
+    margin-bottom: 6px;
+}
+
+.tp-form-group input[type="text"],
+.tp-form-group select {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.tp-form-actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    margin-top: 20px;
+    padding-top: 16px;
+    border-top: 1px solid var(--tp-border);
+}
+
+/* ==========================================================================
+   Bulk Assign Task Modal (specific styles)
+   ========================================================================== */
+
+.bulk-assign-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 10000;
+}
+
+/* Ensure Tagify dropdown appears above the modal */
+.tagify__dropdown {
+    z-index: 10001 !important;
+}
+
+.bulk-assign-modal-content {
+    background: var(--tp-bg-white);
+    border-radius: 12px;
+    padding: 24px;
+    max-width: 480px;
+    width: 90%;
+    box-shadow: var(--tp-shadow-xl);
+}
+
+.bulk-assign-modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid var(--tp-border);
+}
+
+.bulk-assign-modal-header h2 {
+    margin: 0;
+    font-size: 1.25rem;
+    color: var(--tp-text-primary);
+}
+
+.bulk-assign-close-btn {
+    background: none;
+    border: none;
+    font-size: 28px;
+    cursor: pointer;
+    color: var(--tp-text-lighter);
+    line-height: 1;
+    padding: 0;
+}
+
+.bulk-assign-close-btn:hover {
+    color: var(--tp-text-primary);
+}
+
+.bulk-assign-description {
+    color: var(--tp-text-lighter);
+    font-size: 0.9rem;
+    margin: 0 0 20px 0;
+    padding: 0;
+}
+
+.bulk-assign-form-group {
+    margin-bottom: 16px;
+}
+
+.bulk-assign-form-group label {
+    display: block;
+    font-size: 0.85rem;
+    font-weight: 600;
+    color: var(--tp-text-secondary);
+    margin-bottom: 6px;
+}
+
+.bulk-assign-form-group input[type="text"] {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.bulk-assign-form-actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    margin-top: 20px;
+    padding-top: 16px;
+    border-top: 1px solid var(--tp-border);
+}
+
+/* ==========================================================================
+   Text Utilities
+   ========================================================================== */
+
+.text-center {
+    text-align: center;
+}
+
+.text-left {
+    text-align: left;
+}
+
+.text-right {
+    text-align: right;
+}
+
+.text-muted {
+    color: var(--tp-text-muted);
+}
+
+.text-success {
+    color: var(--tp-success);
+}
+
+.text-warning {
+    color: var(--tp-warning);
+}
+
+.text-danger {
+    color: var(--tp-danger);
+}
+
+/* ==========================================================================
+   Table Styles
+   ========================================================================== */
+
+/* Common Table Styles */
+.attendance-table,
+.ranking-table {
+    width: auto;
+    border-collapse: separate; /* Required for sticky headers */
+    border-spacing: 0;
+    font-size: 0.9rem;
+    white-space: nowrap;
+}
+
+/* Force border-box for consistency */
+.ranking-table *, .attendance-table * {
+    box-sizing: border-box;
+}
+
+.attendance-table th,
+.attendance-table td,
+.ranking-table th,
+.ranking-table td {
+    padding: 0; /* Reset padding, inner divs handle it */
+    border-bottom: 1px solid var(--tp-border);
+    border-right: 1px solid var(--tp-border);
+    background-clip: padding-box;
+    vertical-align: middle;
+    height: 1px;
+}
+
+.attendance-table th,
+.attendance-table td {
+    vertical-align: top;
+}
+
+/* --- Sticky Headers & Columns --- */
+
+/* 1. Header Rows */
+.attendance-table thead th,
+.ranking-table thead th {
+    position: sticky;
+    top: 0;
+    background-color: var(--tp-bg-light);
+    z-index: 10;
+    color: var(--tp-text-secondary);
+    font-weight: 600;
+    text-align: center;
+    box-shadow: 0 1px 0 var(--tp-border); /* Visual bottom border */
+    padding: 10px 12px; /* Headers get direct padding */
+}
+
+.ranking-table thead th.student-header {
+    text-align: left;
+    vertical-align: middle;
+}
+
+/* 2. First Column (Students) */
+.attendance-table tbody th,
+.ranking-table tbody th {
+    position: sticky;
+    left: 0;
+    background-color: var(--tp-bg-white);
+    z-index: 8;
+    text-align: left;
+    min-width: 250px;
+    max-width: 300px;
+    box-shadow: 4px 0 8px -2px rgba(0, 0, 0, 0.1);
+    clip-path: inset(0px -10px 0px 0px);
+    border-right: 1px solid var(--tp-border);
+    border-bottom: 1px solid var(--tp-bg-gray);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: var(--tp-text-primary);
+    padding: 0;
+}
+
+/* 3. Top-Left Corner */
+.attendance-table thead tr:first-child th:first-child,
+.ranking-table thead tr:first-child th:first-child {
+    left: 0;
+    z-index: 20;
+    background-color: var(--tp-bg-light);
+    box-shadow: 1px 1px 0 var(--tp-border);
+}
+
+/* --- Attendance Table Specifics --- */
+.date-header-main {
+    font-size: 0.95rem;
+    color: var(--tp-text-primary);
+}
+
+.date-header-sub {
+    font-size: 0.75rem;
+    color: var(--tp-text-muted);
+    font-weight: normal;
+    margin-top: 2px;
+}
+
+/* Wrapper for cell content */
+.cell-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    min-width: 140px;
+    padding: 10px 12px;
+}
+
+/* Modern Badges */
+.status-badge {
+    display: inline-flex;
+    align-items: center;
+    padding: 2px 8px;
+    border-radius: 9999px;
+    font-size: 0.75rem;
+    font-weight: 600;
+    width: fit-content;
+}
+
+.status-on-time {
+    background-color: var(--tp-success-light);
+    color: var(--tp-success-dark);
+}
+
+.status-delayed {
+    background-color: var(--tp-warning-light);
+    color: var(--tp-warning-dark);
+}
+
+.status-missed  {
+    background-color: var(--tp-danger-light);
+    color: var(--tp-danger-dark);
+}
+
+.status-unknown {
+    background-color: var(--tp-bg-gray);
+    color: var(--tp-text-light);
+}
+
+.location-row {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 0.75rem;
+    color: var(--tp-text-light);
+}
+
+.location-icon {
+    font-size: 0.85rem;
+}
+
+.reason-text {
+    font-size: 0.75rem;
+    color: var(--tp-text-muted);
+    background: var(--tp-bg-hover);
+    border-left: 2px solid var(--tp-border);
+    padding: 2px 6px;
+    margin-top: 2px;
+    white-space: normal;
+    max-width: 200px;
+}
+
+.attendance-table .empty-cell {
+    color: var(--tp-border);
+    font-size: 1.5rem;
+    line-height: 0.5;
+    padding: 10px;
+    text-align: center;
+}
+
+/* Content wrapper for Ranking cells */
+.cell-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 12px 8px;
+    font-size: 1.25rem; /* Much smaller than 1.5em */
+    font-weight: 600;
+    border-radius: 6px; /* Soften the blockiness */
+    margin: 4px; /* Give the cell breathing room inside the grid */
+    height: calc(100% - 8px);
+    width: calc(100% - 8px);
+    color: var(--tp-text-primary); /* Dark Slate, not black */
+    background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0.3));
+}
+
+/* Hover effects */
+.ranking-table tbody tr:hover td {
+    background-color: var(--tp-bg-hover);
+}
+
+.ranking-table tbody tr:hover th {
+    background-color: var(--tp-bg-hover);
+}
+
+.ranking-table tbody tr:nth-child(even) {
+    background-color: var(--tp-bg-light); /* Very light gray */
+}
+
+/* Badge Styles */
+.badge {
+    display: inline-flex;
+    align-items: center;
+    padding: 3px 10px;
+    font-size: 0.75em;
+    font-weight: 600;
+    line-height: 1.2;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    border-radius: 9999px;
+    margin-right: 4px;
+    margin-bottom: 2px;
+    border: 1px solid transparent;
+}
+
+.badge-pill {
+    border-radius: 9999px;
+    padding-left: 8px;
+    padding-right: 8px;
+}
+
+.badge-teal {
+    background-color: var(--tp-success-light);
+    color: var(--tp-success-dark);
+    border-color: #ccfbf1;
+}
+
+.badge-slate {
+    background-color: var(--tp-bg-light);
+    color: var(--tp-text-secondary);
+    border-color: var(--tp-border);
+}
+
+.ranking-table thead th {
+    position: sticky;
+}
+
+.ranking-table thead tr:first-child th {
+    height: auto;
+    padding: 12px 8px;
+    background-color: var(--tp-bg-white);
+    border-bottom: 2px solid var(--tp-border);
+}
+
+.ranking-table thead tr:nth-child(2) th {
+    top: var(--ranking-header-top);
+    z-index: 15;
+    box-shadow: 0 2px 4px -2px rgba(0,0,0,0.1);
+    background-color: var(--tp-bg-white);
+}
+
+.ranking-table thead tr:first-child th[rowspan="2"] {
+    top: 0;
+    height: auto;
+    z-index: 30;
+    background-color: var(--tp-bg-light);
+    vertical-align: middle;
+}
+
+.ranking-table thead tr:first-child th.student-header {
+    left: 0;
+    z-index: 40;
+    border-right: 2px solid var(--tp-border);
+    width: 250px;
+}
+
+.ranking-table thead th.global-total-header {
+    z-index: 25;
+}
+
+/* ==========================================================================
+   Training Program Layout & Components
+   ========================================================================== */
+
+/* Page Constraint */
+.content-constraint {
+    max-width: 1200px;
+    margin: 0 0 0 20px;
+    padding-bottom: 40px;
+}
+
+/* Page Header */
+.tp-page-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+    flex-wrap: wrap;
+    gap: 15px;
+}
+
+/* Filter Bar */
+.tp-filter-card {
+    background-color: var(--tp-bg-light);
+    border: 1px solid var(--tp-border);
+    border-radius: 8px;
+    padding: 12px 16px;
+    margin-bottom: 24px;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex-wrap: wrap;
+}
+
+.tp-filter-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.tp-filter-label {
+    font-weight: 600;
+    font-size: 0.85rem;
+    color: var(--tp-text-secondary);
+}
+
+.tp-filter-input {
+    padding: 6px 10px;
+    border: 1px solid var(--tp-border-dark);
+    border-radius: 4px;
+    font-size: 0.9rem;
+    color: var(--tp-text-primary);
+    transition: border-color 0.2s, box-shadow 0.2s;
+}
+
+.tp-filter-input:focus {
+    border-color: var(--tp-primary);
+    box-shadow: 0 0 0 3px rgba(15, 118, 110, 0.1);
+    outline: none;
+}
+
+/* Buttons */
+.tp-btn-primary {
+    background-color: var(--tp-primary);
+    color: white;
+    border: none;
+    padding: 6px 16px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-weight: 500;
+    font-size: 0.9rem;
+    font-family: inherit;
+    transition: all 0.2s;
+    text-decoration: none;
+    display: inline-block;
+    line-height: 1.5;
+    box-sizing: border-box;
+    vertical-align: middle;
+}
+
+.tp-btn-primary:hover {
+    background-color: var(--tp-primary-hover);
+    color: white;
+}
+
+.tp-btn-text {
+    color: var(--tp-text-lighter);
+    text-decoration: underline;
+    font-size: 0.85rem;
+    margin-left: auto;
+}
+
+.tp-btn-secondary {
+    background-color: white;
+    color: var(--tp-primary);
+    border: 1px solid var(--tp-border-dark);
+    padding: 6px 16px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-weight: 500;
+    font-size: 0.9rem;
+    font-family: inherit;
+    transition: all 0.2s;
+}
+
+.btn-filled-primary {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    padding: 10px 20px;
+    background: var(--tp-primary);
+    color: white;
+    border: none;
+    border-radius: 8px;
+    font-size: 0.95rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s;
+    text-decoration: none;
+    font-family: inherit;
+}
+
+.btn-filled-primary:hover {
+    background: var(--tp-primary-hover);
+    color: white;
+}
+
+/* Data Table Wrapper */
+.tp-table-container {
+    overflow-x: auto;
+    max-height: 75vh;
+    border: 1px solid var(--tp-border-light);
+    border-radius: 8px;
+}
+
+/* ==========================================================================
+   Training Day & Ranking Table Styles
+   ========================================================================== */
+
+/* Training Day Headers */
+.training-day-header {
+    background-color: var(--tp-bg-light) !important;
+    text-align: center;
+    border-bottom: 1px solid var(--tp-border-dark) !important;
+    pointer-events: none;
+}
+
+.global-total-header {
+    background-color: var(--tp-bg-light) !important;
+    color: var(--tp-text-primary);
+    font-weight: 800;
+    border-left: none !important;
+    border-right: 1px solid var(--tp-border-light) !important;
+}
+
+.ranking-table td.global-cell {
+    background-color: var(--tp-bg-gray) !important;
+    font-weight: 700;
+    border-left: none !important;
+    border-right: 1px solid var(--tp-border-light) !important;
+}
+
+.global-total-header::after,
+.ranking-table td.global-cell::after {
+    content: none !important;
+    display: none !important;
+}
+
+.training-day-header-main {
+    font-size: 0.95rem;
+    color: var(--tp-text-primary);
+    font-weight: 700;
+}
+
+.training-day-header-sub {
+    font-size: 0.75rem;
+    color: var(--tp-text-muted);
+    font-weight: normal;
+    margin-top: 2px;
+}
+
+.task-header {
+    background-color: var(--tp-bg-white) !important;
+    font-size: 0.8rem;
+    color: var(--tp-text-secondary);
+    vertical-align: bottom;
+    border-left: 1px solid var(--tp-border-light) !important;
+    border-top: 3px solid var(--tp-border-light);
+}
+
+/* Total Column specific styling */
+.total-col {
+    border-left: 2px solid var(--tp-border-light) !important;
+    background-color: var(--tp-bg-light);
+}
+
+.ranking-table thead th.total-col {
+    background-color: var(--tp-bg-light) !important;
+    color: var(--tp-text-primary);
+    font-weight: 800;
+}
+
+.ranking-table tbody td.total-col {
+    background-color: var(--tp-bg-light) !important;
+    font-weight: 700;
+    color: var(--tp-text-primary);
+}
+
+.ranking-table th.training-day-header,
+.ranking-table th.total-col,
+.ranking-table td.total-col {
+    border-right: none !important;
+}
+
+.ranking-table th.training-day-header,
+.ranking-table th.total-col {
+    position: sticky;
+    z-index: 11;
+}
+
+.ranking-table td.total-col {
+    position: relative;
+    z-index: 5;
+}
+
+.ranking-table th.training-day-header::after,
+.ranking-table th.total-col::after,
+.ranking-table td.total-col::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    width: 4px;
+    background-color: var(--tp-border-dark);
+    z-index: 10;
+}
+
+.ranking-table .empty-cell-content {
+    color: var(--tp-border-dark);
+    text-align: center;
+    font-weight: normal;
+}
+
+.inaccessible-cell {
+    background-color: var(--tp-bg-gray);
+    background-image: radial-gradient(var(--tp-border) 1px, transparent 1px);
+    background-size: 10px 10px;
+    color: var(--tp-text-light);
+}
+
+/* Attendance badges for combined ranking */
+.attendance-badge {
+    margin-left: 4px;
+    font-size: 0.75em;
+    vertical-align: middle;
+}
+
+.home-badge {
+    opacity: 0.7;
+}
+
+/* ==========================================================================
+   Navigation & Header Components
+   ========================================================================== */
+
+/* Breadcrumb Navigation */
+.nav-breadcrumb {
+    margin-bottom: 12px;
+}
+
+.nav-back-link {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    color: var(--tp-text-muted);
+    text-decoration: none;
+    font-size: 0.9rem;
+    font-weight: 500;
+    transition: color 0.2s;
+}
+
+.nav-back-link:hover {
+    color: var(--tp-primary);
+}
+
+/* ==========================================================================
+   Progress Card Styles
+   ========================================================================== */
+
+.progress-card {
+    background: var(--tp-bg-white);
+    border: 1px solid var(--tp-border);
+    border-radius: 12px;
+    padding: 24px;
+    margin-bottom: 24px;
+    box-shadow: var(--tp-shadow-sm);
+}
+
+.progress-card-header {
+    font-size: 0.85rem;
+    font-weight: 600;
+    color: var(--tp-text-lighter);
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    margin-bottom: 16px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid var(--tp-bg-gray);
+}
+
+.progress-item {
+    padding: 16px 0;
+    border-bottom: 1px solid var(--tp-bg-gray);
+}
+
+.progress-item:last-child {
+    border-bottom: none;
+}
+
+/* ==========================================================================
+   Source Badges
+   ========================================================================== */
+
+.source-badge {
+    display: inline-block;
+    padding: 4px 10px;
+    border-radius: 4px;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1;
+    white-space: nowrap;
+    width: fit-content;
+}
+
+.badge-training {
+    background: var(--tp-success-light);
+    color: var(--tp-success-dark);
+    border: 1px solid #bbf7d0;
+}
+
+.badge-training:hover {
+    background: #dcfce7;
+    text-decoration: none;
+}
+
+.badge-archived {
+    background: var(--tp-warning-light);
+    color: var(--tp-warning-dark);
+    border: 1px solid #fde68a;
+}
+
+.badge-manual {
+    background: var(--tp-bg-light);
+    color: var(--tp-text-muted);
+    border: 1px solid var(--tp-border);
+}
+
+/* ==========================================================================
+   Histogram Modal Styles
+   ========================================================================== */
+
+.histogram-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 10000;
+}
+
+.histogram-modal-content {
+    background: var(--tp-bg-white);
+    border-radius: 12px;
+    padding: 24px;
+    max-width: 800px;
+    width: 90%;
+    max-height: 90vh;
+    overflow-y: auto;
+    box-shadow: var(--tp-shadow-xl);
+}
+
+.histogram-modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid var(--tp-border);
+}
+
+.histogram-modal-header h2 {
+    margin: 0;
+    font-size: 1.25rem;
+    color: var(--tp-text-primary);
+}
+
+.histogram-close-btn {
+    background: none;
+    border: none;
+    font-size: 28px;
+    cursor: pointer;
+    color: var(--tp-text-lighter);
+    line-height: 1;
+    padding: 0;
+}
+
+.histogram-close-btn:hover {
+    color: var(--tp-text-primary);
+}
+
+.histogram-filter-row {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 20px;
+}
+
+.histogram-filter-row label {
+    font-weight: 500;
+    color: var(--tp-text-secondary);
+    white-space: nowrap;
+}
+
+.histogram-chart-container {
+    background: var(--tp-bg-light);
+    border-radius: 8px;
+    padding: 20px;
+    margin-bottom: 16px;
+}
+
+.histogram-bars {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    height: 200px;
+    gap: 4px;
+}
+
+.histogram-bar-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 100%;
+}
+
+.histogram-bar-wrapper {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    width: 100%;
+}
+
+.histogram-bar {
+    width: 100%;
+    min-height: 2px;
+    border-radius: 4px 4px 0 0;
+    transition: height 0.3s ease;
+}
+
+.histogram-label {
+    font-size: 10px;
+    color: var(--tp-text-lighter);
+    margin-top: 4px;
+    text-align: center;
+}
+
+.histogram-count {
+    font-size: 11px;
+    font-weight: 600;
+    color: var(--tp-text-secondary);
+    margin-top: 2px;
+}
+
+.histogram-stats {
+    background: var(--tp-info-light);
+    border: 1px solid var(--tp-info-border);
+    border-radius: 6px;
+    padding: 12px 16px;
+    margin-bottom: 16px;
+    font-size: 0.9rem;
+    color: var(--tp-info-dark);
+}
+
+.histogram-text-section {
+    border: 1px solid var(--tp-border);
+    border-radius: 8px;
+    overflow: hidden;
+}
+
+.histogram-text-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 14px;
+    background: var(--tp-bg-light);
+    border-bottom: 1px solid var(--tp-border);
+}
+
+.histogram-text-header span {
+    font-weight: 500;
+    color: var(--tp-text-secondary);
+}
+
+.copy-btn {
+    background: var(--tp-info);
+    color: white;
+    border: none;
+    padding: 6px 12px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 0.85rem;
+}
+
+.copy-btn:hover {
+    background: var(--tp-info-hover);
+}
+
+#histogramTextData {
+    width: 100%;
+    border: none;
+    padding: 12px 14px;
+    font-family: monospace;
+    font-size: 12px;
+    resize: vertical;
+    background: var(--tp-bg-white);
+}
+
+.histogram-icon {
+    cursor: pointer;
+    font-size: 12px;
+    margin-left: 4px;
+    opacity: 0.6;
+    transition: opacity 0.2s;
+    vertical-align: middle;
+}
+
+.histogram-icon:hover {
+    opacity: 1;
+}
+
+.task-header .header-text,
+.total-col-header .header-text {
+    vertical-align: middle;
+}
+
+/* ==========================================================================
+   Combined Ranking Page Specific Styles
+   ========================================================================== */
+
+.combined-ranking-student-wrapper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 8px;
+    padding: 6px 10px;
+}
+
+.combined-ranking-student-info {
+    flex: 1;
+    min-width: 0;
+}
+
+.combined-ranking-name-row {
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+    max-width: 100%;
+}
+
+.combined-ranking-name-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+    max-width: 100%;
+}
+
+.combined-ranking-tags {
+    margin-top: 3px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 2px;
+}
+
+.combined-ranking-tag {
+    font-weight: normal;
+    font-size: 0.7em;
+}
+
+.history-link {
+    margin-left: auto;
+    text-decoration: none;
+}
+
+.inaccessible-cell span {
+    opacity: 0.5;
+}
+
+.empty-state-box {
+    text-align: center;
+    padding: 40px;
+    background: var(--tp-bg-light);
+    border-radius: 8px;
+    border: 1px dashed var(--tp-border-dark);
+    margin-top: 20px;
+}
+
+.empty-state-box h3 {
+    color: var(--tp-text-secondary);
+    margin-bottom: 8px;
+    font-weight: 600;
+}
+
+.empty-state-box p {
+    color: var(--tp-text-lighter);
+}
diff --git a/cms/server/admin/templates/base.html b/cms/server/admin/templates/base.html
index 4eb9ffce5f..465b7d3920 100644
--- a/cms/server/admin/templates/base.html
+++ b/cms/server/admin/templates/base.html
@@ -52,6 +52,7 @@
     <link rel="shortcut icon" href="{{ url("static", "favicon.ico") }}" />
     <link rel="stylesheet" type="text/css" href="{{ url("static", "reset.css") }}">
     <link rel="stylesheet" type="text/css" href="{{ url("static", "aws_style.css") }}">
+    <link rel="stylesheet" type="text/css" href="{{ url("static", "aws_tp_styles.css") }}">
     <script src="{{ url("static", "web_rpc.js") }}"></script>
     <script src="{{ url("static", "aws_utils.js") }}"></script>
     <script src="{{ url("static", "jq", "jquery-3.6.0.min.js") }}"></script>
@@ -487,7 +488,7 @@ <h2 class="sidebar-section-title">
         {% elif training_program is defined %}
           <ul class="menu">
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id) }}">General</a></li>
-            <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "ranking") }}">Ranking</a></li>
+            <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "ranking") }}">Home Task Scores</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "submissions") }}">Submissions</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "students") }}">Students</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "tasks") }}">Tasks</a></li>
diff --git a/cms/server/admin/templates/bulk_assign_task.html b/cms/server/admin/templates/bulk_assign_task.html
deleted file mode 100644
index 4624a3ffce..0000000000
--- a/cms/server/admin/templates/bulk_assign_task.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{% extends "base.html" %}
-
-{% block core %}
-<h1>
-  Assign Task to a Group in <a href="{{ url("training_program", training_program.id) }}">{{ training_program.name }}</a>
-</h1>
-
-<p>
-  <a href="{{ url("training_program", training_program.id, "students") }}">Back to students list</a>
-</p>
-
-<style>
-.tagify-tag-select { width: 200px; }
-</style>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    var tagInput = document.querySelector('input[name="tag"]');
-    if (tagInput && typeof Tagify !== 'undefined') {
-        var whitelist = {{ all_student_tags | tojson }};
-        var tagify = new Tagify(tagInput, {
-            mode: 'select',
-            whitelist: whitelist,
-            enforceWhitelist: true,
-            editTags: false,
-            dropdown: {
-                maxItems: 20,
-                enabled: 0,
-                closeOnSelect: true
-            },
-            originalInputValueFormat: function(valuesArr) {
-                return valuesArr.length ? valuesArr[0].value : '';
-            }
-        });
-        tagify.DOM.scope.classList.add('tagify-tag-select');
-    }
-});
-</script>
-
-<h2 id="title_assign_task_to_group" class="toggling_on">Assign Task to a Group</h2>
-<div id="assign_task_to_group">
-  <p>
-    This will assign the selected task to all students who have the specified tag.
-    Students who already have the task assigned will be skipped.
-  </p>
-  <form enctype="multipart/form-data" action="{{ url("training_program", training_program.id, "bulk_assign_task") }}" method="POST">
-    {{ xsrf_form_html|safe }}
-    <table class="bordered">
-      <tr>
-        <td>
-          <span class="info" title="Select a task to assign to students."></span>
-          Task
-        </td>
-        <td>
-          <select name="task_id" class="searchable-select">
-            <option value="" selected disabled hidden>Select a task...</option>
-            {% for task in all_tasks %}
-            <option value="{{ task.id }}">{{ task.name }} - {{ task.title }}</option>
-            {% endfor %}
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span class="info" title="Select a tag. All students with this tag will have the task assigned to them."></span>
-          Student Tag
-        </td>
-        <td>
-          <input type="text" name="tag" placeholder="Select a student tag" style="width: 200px;" />
-        </td>
-      </tr>
-    </table>
-    <input type="submit" value="Assign Task to Group" {% if not admin.permission_all %}disabled{% endif %} />
-  </form>
-  <div class="hr"></div>
-</div>
-
-<h2 id="title_available_tags" class="toggling_on">Available Tags</h2>
-<div id="available_tags">
-  {% if all_student_tags %}
-  <p>The following tags are currently in use:</p>
-  <ul>
-    {% for tag in all_student_tags %}
-    <li>{{ tag }}</li>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <p>No student tags have been defined yet.</p>
-  {% endif %}
-  <div class="hr"></div>
-</div>
-
-{% endblock core %}
diff --git a/cms/server/admin/templates/fragments/user_detail_layout.html b/cms/server/admin/templates/fragments/user_detail_layout.html
new file mode 100644
index 0000000000..805db3e26c
--- /dev/null
+++ b/cms/server/admin/templates/fragments/user_detail_layout.html
@@ -0,0 +1,66 @@
+{# Common layout for user detail pages (participation_detail and combined_ranking_detail) #}
+{# Parameters:
+   - first_name: User's first name
+   - last_name: User's last name
+   - username: User's username
+   - picture_url: URL to user's profile picture (optional)
+   - team_name: Team name (optional)
+#}
+
+<div id="UserDetail_bg">
+  <div id="UserDetail">
+    <button id="UserDetail_close"
+            type="button"
+            aria-label="Close"
+            style="cursor: pointer; position: absolute; top: 8px; right: 8px; background: none; border: 0; padding: 0;">
+      <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true" focusable="false">
+        <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8 2.146 2.854Z"/>
+      </svg>
+    </button>
+    <div id="UserDetail_header">
+      <div id="UserDetail_summary">
+        <div>
+          <span id="UserDetail_f_name">{{ first_name }}</span>
+          <span id="UserDetail_l_name">{{ last_name }}</span>
+        </div>
+        <div style="font-size: 0.6em; color: #666;">
+          {{ username }}
+        </div>
+        {% if picture_url %}<img id="UserDetail_face" src="{{ picture_url }}" alt="Profile picture of {{ first_name }} {{ last_name }}"/>{% endif %}
+        <div id="UserDetail_spacer"></div>
+        <div id="UserDetail_team">{{ team_name or '' }}</div>
+        <img id="UserDetail_flag" src="data:," alt="Flag" style="display: none;"/>
+      </div>
+      <div id="UserDetail_navigator">
+        <table>
+          <col class="name"/>
+          <col class="score"/>
+          <col class="rank"/>
+          <col class="show"/>
+          <thead>
+            <tr>
+              <th></th>
+              <th style="text-align: right;">Score</th>
+              <th style="text-align: right;">Rank</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody id="UserDetail_scores">
+          </tbody>
+        </table>
+      </div>
+    </div>
+
+    <div id="UserDetail_title"></div>
+
+    <div id="UserDetail_charts">
+      <div style="margin-bottom: 10px;"><strong>Score</strong></div>
+      <canvas id="UserDetail_score_chart" width="920" height="200"></canvas>
+      <div style="margin-top: 20px; margin-bottom: 10px;"><strong>Rank</strong></div>
+      <canvas id="UserDetail_rank_chart" width="920" height="200"></canvas>
+    </div>
+
+    <div id="UserDetail_submissions">
+    </div>
+  </div>
+</div>
diff --git a/cms/server/admin/templates/fragments/user_detail_scripts.html b/cms/server/admin/templates/fragments/user_detail_scripts.html
new file mode 100644
index 0000000000..aa6bedadf4
--- /dev/null
+++ b/cms/server/admin/templates/fragments/user_detail_scripts.html
@@ -0,0 +1,138 @@
+{# Common JavaScript utilities for user detail pages #}
+<script>
+function format_time(time, full) {
+  var h = Math.floor(time / 3600);
+  var m = Math.floor((time % 3600) / 60);
+  var s = Math.floor(time % 60);
+  h = full && h < 10 ? "0" + h : "" + h;
+  m = m < 10 ? "0" + m : "" + m;
+  s = s < 10 ? "0" + s : "" + s;
+  return (h + ":" + m + ":" + s);
+}
+
+function round_to_str(value, ndigits) {
+  if (ndigits > 0) {
+    return value.toFixed(ndigits).replace(/\.?0+$/, "");
+  } else {
+    return value.toFixed(0);
+  }
+}
+</script>
+
+<script src="{{ url("static", "js", "Chart.js") }}"></script>
+<script src="{{ url("static", "js", "HistoryStore.js") }}"></script>
+<script src="{{ url("static", "js", "UserDetail.js") }}"></script>
+
+<script>
+{# Common UserDetail initialization that can be customized per page #}
+function initUserDetail(options) {
+  var userId = options.userId;
+  var showContestRows = options.showContestRows || false;
+  var fetchSubmissionsViaAjax = options.fetchSubmissionsViaAjax || false;
+  var submissionsData = options.submissionsData || [];
+
+  HistoryStore.init();
+
+  UserDetail.init = function() {
+    UserDetail.f_name_label = $('#UserDetail_f_name');
+    UserDetail.l_name_label = $('#UserDetail_l_name');
+    UserDetail.team_label = $('#UserDetail_team');
+    UserDetail.flag_image = $('#UserDetail_flag');
+    UserDetail.face_image = $('#UserDetail_face');
+    UserDetail.title_label = $('#UserDetail_title');
+    UserDetail.navigator = $('#UserDetail_navigator table tbody');
+    UserDetail.submission_table = $('#UserDetail_submissions');
+    UserDetail.score_chart = $('#UserDetail_score_chart')[0];
+    UserDetail.rank_chart = $('#UserDetail_rank_chart')[0];
+
+    UserDetail.navigator.on("click", "td.btn", function() {
+      if (UserDetail.active !== null) {
+        UserDetail.active.removeClass("active");
+      }
+      UserDetail.active = $(this).parent();
+      UserDetail.active.addClass("active");
+
+      if (UserDetail.active.hasClass('global')) {
+        UserDetail.show_global();
+      } else if (UserDetail.active.hasClass('contest')) {
+        UserDetail.show_contest(UserDetail.active.attr('data-contest'));
+      } else if (UserDetail.active.hasClass('task')) {
+        UserDetail.show_task(UserDetail.active.attr('data-task'));
+      }
+    });
+  };
+
+  UserDetail.show = function(user_id) {
+    UserDetail.user_id = user_id;
+    UserDetail.user = DataStore.users[user_id];
+    UserDetail.data_fetched = 0;
+
+    HistoryStore.request_update(UserDetail.history_callback);
+
+    if (fetchSubmissionsViaAjax) {
+      $.ajax({
+        url: Config.get_submissions_url(UserDetail.user_id),
+        dataType: "json",
+        success: UserDetail.submissions_callback,
+        error: function() {
+          console.error("Error while getting the submissions for " + UserDetail.user_id);
+          UserDetail.submission_table.html('<p style="color: red; text-align: center;">Failed to load submissions. Please refresh the page.</p>');
+        }
+      });
+    } else {
+      UserDetail.submissions = submissionsData;
+      UserDetail.data_fetched += 1;
+      UserDetail.do_show();
+    }
+  };
+
+  UserDetail.do_show = function() {
+    if (UserDetail.data_fetched == 2) {
+      var s = "<tr class=\"global\"> \
+                  <td class=\"name\">Global</td> \
+                  <td class=\"score\">" + (UserDetail.global_s.length > 0 ? round_to_str(UserDetail.global_s[UserDetail.global_s.length-1][1], DataStore.global_score_precision) : 0) + "</td> \
+                  <td class=\"rank\">" + (UserDetail.global_r.length > 0 ? UserDetail.global_r[UserDetail.global_r.length-1][1] : 1) + "</td> \
+                  <td class=\"btn\"><a>Show</a></td> \
+              </tr>";
+
+      var contests = DataStore.contest_list;
+      for (var i in contests) {
+        var contest = contests[i];
+        var c_id = contest["key"];
+
+        if (showContestRows) {
+          s += "<tr class=\"contest\" data-contest=\"" + c_id +"\"> \
+                   <td class=\"name\">" + contest['name'] + "</td> \
+                   <td class=\"score\">" + (UserDetail.contest_s[c_id] && UserDetail.contest_s[c_id].length > 0 ? round_to_str(UserDetail.contest_s[c_id][UserDetail.contest_s[c_id].length-1][1], contest["score_precision"]) : 0) + "</td> \
+                   <td class=\"rank\">" + (UserDetail.contest_r[c_id] && UserDetail.contest_r[c_id].length > 0 ? UserDetail.contest_r[c_id][UserDetail.contest_r[c_id].length-1][1] : 1) + "</td> \
+                   <td class=\"btn\"><a>Show</a></td> \
+                </tr>";
+        }
+
+        var tasks = contest["tasks"];
+        for (var j in tasks) {
+          var task = tasks[j];
+          var t_id = task["key"];
+
+          s += "<tr class=\"task\" data-task=\"" + t_id +"\"> \
+                   <td class=\"name\">" + task['name'] + "</td> \
+                   <td class=\"score\">" + (UserDetail.task_s[t_id] && UserDetail.task_s[t_id].length > 0 ? round_to_str(UserDetail.task_s[t_id][UserDetail.task_s[t_id].length-1][1], task["score_precision"]) : 0) + "</td> \
+                   <td class=\"rank\">" + (UserDetail.task_r[t_id] && UserDetail.task_r[t_id].length > 0 ? UserDetail.task_r[t_id][UserDetail.task_r[t_id].length-1][1] : 1) + "</td> \
+                   <td class=\"btn\"><a>Show</a></td> \
+                </tr>";
+        }
+      }
+
+      UserDetail.navigator.html(s);
+      UserDetail.active = null;
+
+      $('tr.global td.btn', UserDetail.navigator).click();
+    }
+  };
+
+  UserDetail.hide = function() {};
+
+  UserDetail.init();
+  UserDetail.show(userId);
+}
+</script>
diff --git a/cms/server/admin/templates/fragments/user_detail_styles.html b/cms/server/admin/templates/fragments/user_detail_styles.html
new file mode 100644
index 0000000000..986ae55595
--- /dev/null
+++ b/cms/server/admin/templates/fragments/user_detail_styles.html
@@ -0,0 +1,202 @@
+<style>
+#UserDetail_bg {
+  display: block;
+}
+
+#UserDetail {
+  max-width: 960px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+#UserDetail_close {
+  display: none;
+}
+
+#UserDetail_header {
+  display: flex;
+  min-height: 120px;
+  margin-bottom: 20px;
+}
+
+#UserDetail_summary {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  font-size: 1.5em;
+  line-height: 1.5em;
+}
+
+#UserDetail_face {
+  display: block;
+  max-width: 160px;
+  max-height: 240px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  margin: 10px 0;
+}
+
+#UserDetail_flag {
+  display: none;
+}
+
+#UserDetail_navigator {
+  flex: 1;
+  max-width: 450px;
+}
+
+#UserDetail_navigator table {
+  width: 100%;
+  table-layout: fixed;
+  border-spacing: 2px;
+  border-collapse: separate;
+}
+
+#UserDetail_navigator tr {
+  height: 28px;
+}
+
+#UserDetail_navigator col.name {
+  width: 55%;
+}
+
+#UserDetail_navigator col.score,
+#UserDetail_navigator col.rank {
+  width: 15%;
+}
+
+#UserDetail_navigator col.show {
+  width: 15%;
+}
+
+#UserDetail_navigator tr td.score,
+#UserDetail_navigator tr td.rank {
+  padding-left: 4px;
+  text-align: right;
+}
+
+#UserDetail_navigator tbody tr td.btn {
+  text-align: center;
+  border: 1px solid #999999;
+  box-shadow: 0 0 2px gray;
+  background-color: #EEEEEE;
+  border-radius: 3px;
+  cursor: pointer;
+  user-select: none;
+}
+
+#UserDetail_navigator tbody tr td.btn:hover {
+  background-color: #DDDDDD;
+}
+
+#UserDetail_navigator tbody tr td.btn:active {
+  background-color: #CCCCCC;
+}
+
+#UserDetail_navigator tbody tr.active td.btn {
+  background-color: #EEEEEE;
+  opacity: 0.4;
+  cursor: default;
+}
+
+#UserDetail_navigator tr.global,
+#UserDetail_navigator tr.contest {
+  background-color: #DDDDDD;
+}
+
+#UserDetail_navigator tr.task {
+  background-color: #FFFFFF;
+}
+
+#UserDetail_navigator tr.global td.name,
+#UserDetail_navigator tr.contest td.name {
+  padding-left: 5px;
+  font-weight: bold;
+}
+
+#UserDetail_navigator tr.task td.name {
+  padding-left: 25px;
+}
+
+#UserDetail_title {
+  margin-top: 24px;
+  font-size: 1.5em;
+  line-height: 1.5em;
+  text-align: center;
+}
+
+#UserDetail_charts {
+  margin-top: 24px;
+  width: 100%;
+  text-align: center;
+}
+
+#UserDetail_charts canvas {
+  display: block;
+  margin: 10px auto;
+}
+
+#UserDetail_submissions {
+  margin-top: 24px;
+  width: 100%;
+}
+
+#UserDetail_submissions:empty {
+  margin-top: 0;
+}
+
+#UserDetail_submissions table {
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+#UserDetail_submissions td,
+#UserDetail_submissions th {
+  height: 28px;
+  padding: 4px 8px;
+  text-align: left;
+}
+
+#UserDetail_submissions thead {
+  background-color: #DDDDDD;
+}
+
+#UserDetail_submissions tbody tr:nth-child(even) {
+  background-color: #EEEEEE;
+}
+
+#UserDetail_submissions tbody tr:nth-child(odd) {
+  background-color: #F8F8F8;
+}
+
+#UserDetail_submissions tbody td[colspan] {
+  text-align: center;
+  font-style: italic;
+}
+
+.user-detail-back-link {
+  margin-bottom: 20px;
+}
+
+.user-detail-back-link a {
+  color: #0F766E;
+  text-decoration: none;
+  font-weight: 500;
+}
+
+.user-detail-back-link a:hover {
+  text-decoration: underline;
+  color: #0d655e;
+}
+
+.user-detail-filter-info {
+  background-color: #F0FDFA;
+  border: 1px solid #0F766E;
+  border-radius: 4px;
+  padding: 8px 12px;
+  margin-bottom: 16px;
+  font-size: 0.9rem;
+  color: #0F766E;
+}
+</style>
diff --git a/cms/server/admin/templates/participation_detail.html b/cms/server/admin/templates/participation_detail.html
index 206bf9fd40..c86cf11ca0 100644
--- a/cms/server/admin/templates/participation_detail.html
+++ b/cms/server/admin/templates/participation_detail.html
@@ -1,276 +1,29 @@
 {% extends "base.html" %}
 
 {% block core %}
-<style>
-#UserDetail_bg {
-  display: block;
-}
+{% include "fragments/user_detail_styles.html" %}
 
-#UserDetail {
-  max-width: 960px;
-  margin: 0 auto;
-  padding: 20px;
-}
-
-#UserDetail_close {
-  display: none;
-}
-
-#UserDetail_header {
-  display: flex;
-  min-height: 120px;
-  margin-bottom: 20px;
-}
-
-#UserDetail_summary {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  font-size: 1.5em;
-  line-height: 1.5em;
-}
-
-#UserDetail_face {
-  display: block;
-  max-width: 160px;
-  max-height: 240px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  margin: 10px 0;
-}
-
-#UserDetail_flag {
-  display: none;
-}
-
-#UserDetail_navigator {
-  flex: 1;
-  max-width: 450px;
-}
-
-#UserDetail_navigator table {
-  width: 100%;
-  table-layout: fixed;
-  border-spacing: 2px;
-  border-collapse: separate;
-}
-
-#UserDetail_navigator tr {
-  height: 28px;
-}
-
-#UserDetail_navigator col.name {
-  width: 55%;
-}
-
-#UserDetail_navigator col.score,
-#UserDetail_navigator col.rank {
-  width: 15%;
-}
-
-#UserDetail_navigator col.show {
-  width: 15%;
-}
-
-#UserDetail_navigator tr td.score,
-#UserDetail_navigator tr td.rank {
-  padding-left: 4px;
-  text-align: right;
-}
-
-#UserDetail_navigator tbody tr td.btn {
-  text-align: center;
-  border: 1px solid #999999;
-  box-shadow: 0 0 2px gray;
-  background-color: #EEEEEE;
-  border-radius: 3px;
-  cursor: pointer;
-  user-select: none;
-}
-
-#UserDetail_navigator tbody tr td.btn:hover {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_navigator tbody tr td.btn:active {
-  background-color: #CCCCCC;
-}
-
-#UserDetail_navigator tbody tr.active td.btn {
-  background-color: #EEEEEE;
-  opacity: 0.4;
-  cursor: default;
-}
-
-#UserDetail_navigator tr.global,
-#UserDetail_navigator tr.contest {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_navigator tr.task {
-  background-color: #FFFFFF;
-}
-
-#UserDetail_navigator tr.global td.name,
-#UserDetail_navigator tr.contest td.name {
-  padding-left: 5px;
-  font-weight: bold;
-}
-
-#UserDetail_navigator tr.task td.name {
-  padding-left: 25px;
-}
-
-#UserDetail_title {
-  margin-top: 24px;
-  font-size: 1.5em;
-  line-height: 1.5em;
-  text-align: center;
-}
-
-#UserDetail_charts {
-  margin-top: 24px;
-  width: 100%;
-  text-align: center;
-}
-
-#UserDetail_charts canvas {
-  display: block;
-  margin: 10px auto;
-}
-
-#UserDetail_submissions {
-  margin-top: 24px;
-  width: 100%;
-}
-
-#UserDetail_submissions:empty {
-  margin-top: 0;
-}
-
-#UserDetail_submissions table {
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: collapse;
-}
-
-#UserDetail_submissions td,
-#UserDetail_submissions th {
-  height: 28px;
-  padding: 4px 8px;
-  text-align: left;
-}
-
-#UserDetail_submissions thead {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_submissions tbody tr:nth-child(even) {
-  background-color: #EEEEEE;
-}
-
-#UserDetail_submissions tbody tr:nth-child(odd) {
-  background-color: #F8F8F8;
-}
-
-#UserDetail_submissions tbody td[colspan] {
-  text-align: center;
-  font-style: italic;
-}
-
-.back-link {
-  margin-bottom: 20px;
-}
-</style>
-
-<div class="back-link">
+<div class="user-detail-back-link">
   <a href="{{ url("contest", contest.id, "ranking") }}">&larr; Back to Ranking</a>
   |
   <a href="{{ url("contest", contest.id, "user", participation.user.id, "edit") }}">Edit Participation</a>
 </div>
 
-<div id="UserDetail_bg">
-  <div id="UserDetail">
-    <img id="UserDetail_close" src="" alt="Close"/>
-    <div id="UserDetail_header">
-      <div id="UserDetail_summary">
-        <div>
-          <span id="UserDetail_f_name">{{ participation.user.first_name }}</span>
-          <span id="UserDetail_l_name">{{ participation.user.last_name }}</span>
-        </div>
-        <div style="font-size: 0.6em; color: #666;">
-          {{ participation.user.username }}
-        </div>
-        {% if participation.user.picture %}<img id="UserDetail_face" src="{{ url("file", participation.user.picture, "picture") }}" alt="Profile picture of {{ participation.user.first_name }} {{ participation.user.last_name }}"/>{% endif %}
-        <div id="UserDetail_spacer"></div>
-        <div id="UserDetail_team">{% if participation.team %}{{ participation.team.name }}{% endif %}</div>
-        <img id="UserDetail_flag" src="" alt="Flag"/>
-      </div>
-      <div id="UserDetail_navigator">
-        <table>
-          <col class="name"/>
-          <col class="score"/>
-          <col class="rank"/>
-          <col class="show"/>
-          <thead>
-            <tr>
-              <td></td>
-              <td style="text-align: right;">Score</td>
-              <td style="text-align: right;">Rank</td>
-              <td></td>
-            </tr>
-          </thead>
-          <tbody id="UserDetail_scores">
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    <div id="UserDetail_title"></div>
-
-    <div id="UserDetail_charts">
-      <div style="margin-bottom: 10px;"><strong>Score</strong></div>
-      <canvas id="UserDetail_score_chart" width="920" height="200"></canvas>
-      <div style="margin-top: 20px; margin-bottom: 10px;"><strong>Rank</strong></div>
-      <canvas id="UserDetail_rank_chart" width="920" height="200"></canvas>
-    </div>
-
-    <div id="UserDetail_submissions">
-    </div>
-  </div>
-</div>
+{% with first_name=participation.user.first_name,
+        last_name=participation.user.last_name,
+        username=participation.user.username,
+        picture_url=url("file", participation.user.picture, "picture") if participation.user.picture else none,
+        team_name=participation.team.name if participation.team else none %}
+{% include "fragments/user_detail_layout.html" %}
+{% endwith %}
 
 <script>
-// Shims for RWS JS files - these must be defined before loading the RWS scripts
-
-// format_time from TimeView.js
-function format_time(time, full) {
-  var h = Math.floor(time / 3600);
-  var m = Math.floor((time % 3600) / 60);
-  var s = Math.floor(time % 60);
-  h = full && h < 10 ? "0" + h : "" + h;
-  m = m < 10 ? "0" + m : "" + m;
-  s = s < 10 ? "0" + s : "" + s;
-  return (h + ":" + m + ":" + s);
-}
-
-// round_to_str from DataStore.js
-function round_to_str(value, ndigits) {
-  if (ndigits > 0) {
-    return value.toFixed(ndigits).replace(/\.?0+$/, "");
-  } else {
-    return value.toFixed(0);
-  }
-}
-
-// Config shim - provides URL functions that HistoryStore and UserDetail need
 var Config = new function() {
   var self = this;
   self.get_history_url = function() {
     return {{ history_url | tojson | safe }};
   };
   self.get_submissions_url = function(user_id) {
-     // user_id ignored - URL is pre-configured for the current participation
     return {{ submissions_url | tojson | safe }};
   };
   self.get_face_url = function(user_id) {
@@ -281,7 +34,6 @@
   };
 };
 
-// DataStore shim - provides the data structure that HistoryStore and UserDetail need
 var DataStore = new function() {
   var self = this;
 
@@ -289,7 +41,6 @@
   var tasksData = {{ tasks_data | tojson | safe }};
   var contestData = {{ contest_data | tojson | safe }};
 
-  // Set up contest reference for tasks and build tasks array for contest
   var tasksList = [];
   for (var t_id in tasksData) {
     tasksData[t_id].contest = contestData.key;
@@ -311,114 +62,15 @@
 };
 </script>
 
-<script src="{{ url("static", "js", "Chart.js") }}"></script>
-<script src="{{ url("static", "js", "HistoryStore.js") }}"></script>
-<script src="{{ url("static", "js", "UserDetail.js") }}"></script>
+{% include "fragments/user_detail_scripts.html" %}
 
 <script>
 (function() {
-  var userId = {{ user_id | tojson | safe }};
-
-  // Initialize HistoryStore
-  HistoryStore.init();
-
-  // Override UserDetail behaviors for embedded page (not modal)
-  var originalInit = UserDetail.init;
-  UserDetail.init = function() {
-    // Set up DOM references like the original init
-    UserDetail.f_name_label = $('#UserDetail_f_name');
-    UserDetail.l_name_label = $('#UserDetail_l_name');
-    UserDetail.team_label = $('#UserDetail_team');
-    UserDetail.flag_image = $('#UserDetail_flag');
-    UserDetail.face_image = $('#UserDetail_face');
-    UserDetail.title_label = $('#UserDetail_title');
-    UserDetail.navigator = $('#UserDetail_navigator table tbody');
-    UserDetail.submission_table = $('#UserDetail_submissions');
-    UserDetail.score_chart = $('#UserDetail_score_chart')[0];
-    UserDetail.rank_chart = $('#UserDetail_rank_chart')[0];
-
-    // Set up click handler for navigator
-    UserDetail.navigator.on("click", "td.btn", function() {
-      if (UserDetail.active !== null) {
-        UserDetail.active.removeClass("active");
-      }
-      UserDetail.active = $(this).parent();
-      UserDetail.active.addClass("active");
-
-      if (UserDetail.active.hasClass('global')) {
-        UserDetail.show_global();
-      } else if (UserDetail.active.hasClass('contest')) {
-        UserDetail.show_contest(UserDetail.active.attr('data-contest'));
-      } else if (UserDetail.active.hasClass('task')) {
-        UserDetail.show_task(UserDetail.active.attr('data-task'));
-      }
-    });
-  };
-
-  // Override show to skip modal/hash behavior
-  UserDetail.show = function(user_id) {
-    UserDetail.user_id = user_id;
-    UserDetail.user = DataStore.users[user_id];
-    UserDetail.data_fetched = 0;
-
-    HistoryStore.request_update(UserDetail.history_callback);
-
-    $.ajax({
-      url: Config.get_submissions_url(UserDetail.user_id),
-      dataType: "json",
-      success: UserDetail.submissions_callback,
-      error: function() {
-        console.error("Error while getting the submissions for " + UserDetail.user_id);
-        UserDetail.submission_table.html('<p style="color: red; text-align: center;">Failed to load submissions. Please refresh the page.</p>');
-      }
-    });
-  };
-
-  // Override do_show to skip modal open and name/face updates (already in HTML)
-  var originalDoShow = UserDetail.do_show;
-  UserDetail.do_show = function() {
-    if (UserDetail.data_fetched == 2) {
-      // Build navigator HTML (reuse original logic)
-      var s = "<tr class=\"global\"> \
-                  <td class=\"name\">Global</td> \
-                  <td class=\"score\">" + (UserDetail.global_s.length > 0 ? round_to_str(UserDetail.global_s[UserDetail.global_s.length-1][1], DataStore.global_score_precision) : 0) + "</td> \
-                  <td class=\"rank\">" + (UserDetail.global_r.length > 0 ? UserDetail.global_r[UserDetail.global_r.length-1][1] : 1) + "</td> \
-                  <td class=\"btn\"><a>Show</a></td> \
-              </tr>";
-
-      var contests = DataStore.contest_list;
-      for (var i in contests) {
-        var contest = contests[i];
-        var c_id = contest["key"];
-
-        var tasks = contest["tasks"];
-        for (var j in tasks) {
-          var task = tasks[j];
-          var t_id = task["key"];
-
-          s += "<tr class=\"task\" data-task=\"" + t_id +"\"> \
-                   <td class=\"name\">" + task['name'] + "</td> \
-                   <td class=\"score\">" + (UserDetail.task_s[t_id].length > 0 ? round_to_str(UserDetail.task_s[t_id][UserDetail.task_s[t_id].length-1][1], task["score_precision"]) : 0) + "</td> \
-                   <td class=\"rank\">" + (UserDetail.task_r[t_id].length > 0 ? UserDetail.task_r[t_id][UserDetail.task_r[t_id].length-1][1] : 1) + "</td> \
-                   <td class=\"btn\"><a>Show</a></td> \
-                </tr>"
-        }
-      }
-
-      UserDetail.navigator.html(s);
-      UserDetail.active = null;
-
-      // Click the first button to show global view
-      $('tr.global td.btn', UserDetail.navigator).click();
-    }
-  };
-
-  // Override hide to do nothing (we're not a modal)
-  UserDetail.hide = function() {};
-
-  // Initialize and show
-  UserDetail.init();
-  UserDetail.show(userId);
+  initUserDetail({
+    userId: {{ user_id | tojson | safe }},
+    showContestRows: false,
+    fetchSubmissionsViaAjax: true
+  });
 })();
 </script>
 
diff --git a/cms/server/admin/templates/ranking.html b/cms/server/admin/templates/ranking.html
index 73a2e8bb7c..b814f56493 100644
--- a/cms/server/admin/templates/ranking.html
+++ b/cms/server/admin/templates/ranking.html
@@ -90,13 +90,18 @@ <h2>{{ group_name }}</h2>
         <th>Username</th>
         <th>User</th>
         <th>Tags</th>
+        {% if task_archive_progress_by_participation %}
+        <th data-sort-settings="numeric reversed">Task Archive Progress</th>
+        {% endif %}
         {% if show_teams %}
         <th>Team</th>
         {% endif %}
         {% for task in group_tasks %}
         <th data-sort-settings="numeric reversed"><a href="{{ url("task", task.id) }}">{{ task.name }}</a></th>
         {% endfor %}
+        {% if not task_archive_progress_by_participation %}
         <th data-sort-settings="numeric reversed">Global</th>
+        {% endif %}
       </tr>
     </thead>
     <tbody>
@@ -109,6 +114,10 @@ <h2>{{ group_name }}</h2>
             <span class="badge">{{ tag }}</span>
           {% endfor %}
         </td>
+        {% if task_archive_progress_by_participation %}
+        {% set progress = task_archive_progress_by_participation.get(p.id, {}) %}
+        <td data-value="{{ progress.get('percentage', 0) }}">{{ "%.1f"|format(progress.get('percentage', 0)) }}% ({{ "%.1f"|format(progress.get('total_score', 0)) }}/{{ "%.1f"|format(progress.get('max_score', 0)) }})</td>
+        {% endif %}
         {% if show_teams %}
           {% if p.team %}
           <td><a href="{{ url("team", p.team_id) }}">{{ p.team.name }}</a></td>
@@ -125,7 +134,9 @@ <h2>{{ group_name }}</h2>
           {% set total_score.value = total_score.value + status.score %}
           {% if status.partial %}{% set partial.value = true %}{% endif %}
         {% endfor %}
+        {% if not task_archive_progress_by_participation %}
         <td {%- if partial.value %} class="partial" {%- endif -%}>{{ ("%%.%df"|format(contest.score_precision))|format(total_score.value) }}</td>
+        {% endif %}
       </tr>
       {% else %}
       <tr>
@@ -165,13 +176,18 @@ <h2>{{ group_name }}</h2>
       {% if student_tags_by_participation %}
       <th>Tags</th>
       {% endif %}
+      {% if task_archive_progress_by_participation %}
+      <th data-sort-settings="numeric reversed">Task Archive Progress</th>
+      {% endif %}
       {% if show_teams %}
       <th>Team</th>
       {% endif %}
       {% for task in contest.get_tasks() %}
       <th data-sort-settings="numeric reversed"><a href="{{ url("task", task.id) }}">{{ task.name }}</a></th>
       {% endfor %}
+      {% if not task_archive_progress_by_participation %}
       <th data-sort-settings="numeric reversed">Global</th>
+      {% endif %}
     </tr>
   </thead>
   <tbody>
@@ -190,6 +206,17 @@ <h2>{{ group_name }}</h2>
         {% endfor %}
       </td>
       {% endif %}
+      {% if task_archive_progress_by_participation %}
+      {% set progress = task_archive_progress_by_participation.get(p.id, {}) %}
+      {% set details_url = url("training_program", training_program.id, "student", p.user.id, "tasks") %}
+      <td data-value="{{ progress.get('percentage', 0) }}">
+        {% if progress.get('task_count', 0) > 0 %}
+        {{ "%.1f"|format(progress.get('percentage', 0)) }}% ({{ "%.1f"|format(progress.get('total_score', 0)) }}/{{ "%.1f"|format(progress.get('max_score', 0)) }}) [<a href="{{ details_url }}">details</a>]
+        {% else %}
+        No tasks [<a href="{{ details_url }}">details</a>]
+        {% endif %}
+      </td>
+      {% endif %}
       {% if show_teams %}
         {% if p.team %}
         <td><a href="{{ url("team", p.team_id) }}">{{ p.team.name }}</a></td>
@@ -200,8 +227,10 @@ <h2>{{ group_name }}</h2>
       {% for status in p.task_statuses %}
       <td data-value="{{ status.score }}">{{ task_html(status) }}</td>
       {% endfor %}
+      {% if not task_archive_progress_by_participation %}
       {% set total_score, partial = p.total_score %}
       <td {%- if partial %} class="partial" {%- endif -%}>{{ total_score }}</td>
+      {% endif %}
     </tr>
       {% endif %}
     {% endfor %}
diff --git a/cms/server/admin/templates/student_task_submissions.html b/cms/server/admin/templates/student_task_submissions.html
new file mode 100644
index 0000000000..fa593ba454
--- /dev/null
+++ b/cms/server/admin/templates/student_task_submissions.html
@@ -0,0 +1,36 @@
+{% import "macro/reevaluation_buttons.html" as macro_reevaluation_buttons %}
+
+{% extends "base.html" %}
+{% import 'macro/submission.html' as macro_submission %}
+
+{% block core %}
+<h1>
+  Submissions for task <a href="{{ url("task", task.id) }}">{{ task.name }}</a>
+  by <a href="{{ url("user", selected_user.id) }}">{{ selected_user.username }}</a>
+  in <a href="{{ url("training_program", training_program.id) }}">{{ training_program.name }}</a>
+</h1>
+
+<p>
+  <a href="{{ url("training_program", training_program.id, "student", selected_user.id, "tasks") }}">&larr; Back to Task Archive</a>
+</p>
+
+<div id="submissions">
+  <p>
+    Reevaluate all {{ submission_count }} submissions for this task (for all datasets)
+    {{ macro_reevaluation_buttons.reevaluation_buttons(
+           admin.permission_all,
+           url("training_program", training_program.id, "student", selected_user.id, "task", task.id, "submissions"),
+           participation_id=participation.id) }}
+  </p>
+
+  {{ macro_submission.rows(
+         admin,
+         url,
+         url["training_program"][training_program.id]["student"][selected_user.id]["task"][task.id]["submissions"],
+         submissions,
+         submission_page,
+         submission_pages,
+         show_training_day=true) }}
+</div>
+
+{% endblock core %}
diff --git a/cms/server/admin/templates/student_tasks.html b/cms/server/admin/templates/student_tasks.html
index a1454487e6..1d012716eb 100644
--- a/cms/server/admin/templates/student_tasks.html
+++ b/cms/server/admin/templates/student_tasks.html
@@ -1,99 +1,265 @@
 {% extends "base.html" %}
 
 {% block core %}
-<h1>
-  Task Archive for <a href="{{ url("user", selected_user.id) }}">{{ selected_user.username }}</a> in <a href="{{ url("training_program", training_program.id) }}">{{ training_program.name }}</a>
-</h1>
-
-<p>
-  <a href="{{ url("training_program", training_program.id, "student", selected_user.id, "edit") }}">Back to student details</a>
-</p>
-
-<h2 id="title_add_task" class="toggling_on">Add Task</h2>
-<div id="add_task">
-  <form enctype="multipart/form-data" action="{{ url("training_program", training_program.id, "student", selected_user.id, "tasks", "add") }}" method="POST">
-    {{ xsrf_form_html|safe }}
-    <table class="bordered">
-      <tr>
-        <td>
-          <span class="info" title="Select a task to add to this student's task archive. This will be marked as a manual assignment."></span>
-          Task
-        </td>
-        <td>
-          <select name="task_id" class="searchable-select">
-            <option value="" selected disabled hidden>Select a task...</option>
-            {% for task in available_tasks %}
-            <option value="{{ task.id }}">{{ task.name }} - {{ task.title }}</option>
-            {% endfor %}
-          </select>
-        </td>
-      </tr>
-    </table>
-    <input type="submit" value="Add Task" {% if not admin.permission_all %}disabled{% endif %} />
-  </form>
-  <div class="hr"></div>
-</div>
+<style>
+    /* Table visual fixes - page-specific overrides */
+    .ranking-table th {
+        font-size: 0.85rem;
+        text-transform: uppercase;
+        letter-spacing: 0.03em;
+        color: #64748b;
+        background: #f8fafc;
+        padding: 14px 16px !important;
+    }
+
+    /* Disable sticky positioning for student tasks table */
+    #student-tasks-table thead th {
+        position: static !important;
+        top: auto !important;
+        left: auto !important;
+        z-index: auto !important;
+        box-shadow: none !important;
+    }
+
+    .ranking-table td {
+        padding: 0;
+    }
+</style>
+
+<div class="content-constraint">
 
-<h2 id="title_assigned_tasks" class="toggling_on">Assigned Tasks ({{ student_tasks|length }})</h2>
-<div id="assigned_tasks">
-  {% if student_tasks %}
-  <table class="bordered">
-    <thead>
-      <tr>
-        <th>Task</th>
-        <th>Source</th>
-        <th>Assigned At</th>
-        <th>Training Score</th>
-        <th>Home Score</th>
-        <th>Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for st in student_tasks %}
-      <tr>
-        <td>
-          <a href="{{ url("task", st.task.id) }}">{{ st.task.name }}</a> - {{ st.task.title }}
-        </td>
-        <td>
-          {% if st.source_training_day %}
-            {% if st.source_training_day.contest %}
-              <a href="{{ url("contest", st.source_training_day.contest.id) }}">{{ st.source_training_day.contest.description }}</a>
-            {% else %}
-              {{ st.source_training_day.description or st.source_training_day.name or "Archived Training Day" }}
-            {% endif %}
-          {% else %}
-            <em>Manual assignment</em>
-          {% endif %}
-        </td>
-        <td>{{ st.assigned_at }}</td>
-        <td>
-          {% if st.task.id in training_scores %}
-            {{ "%.2f"|format(training_scores[st.task.id]) }}
-          {% else %}
-            -
-          {% endif %}
-        </td>
-        <td>
-          {% if st.task.id in home_scores %}
-            {{ "%.2f"|format(home_scores[st.task.id]) }}
-          {% else %}
-            -
-          {% endif %}
-        </td>
-        <td>
-          <form action="{{ url("training_program", training_program.id, "student", selected_user.id, "task", st.task.id, "remove") }}" method="POST" style="display: inline;">
+    <!-- Navigation -->
+    <div class="nav-breadcrumb">
+        <a href="{{ url("training_program", training_program.id, "student", selected_user.id, "edit") }}" class="nav-back-link">
+            <span>&larr;</span> Back to Student
+        </a>
+    </div>
+
+    <!-- Header -->
+    <div class="page-title" style="margin-bottom: 24px;">
+        <h1>Task Archive: <a href="{{ url("user", selected_user.id) }}" style="color: #0F766E; text-decoration: none;">{{ selected_user.username }}</a></h1>
+        <div class="page-subtitle">
+            Program: <a href="{{ url("training_program", training_program.id) }}" style="color: #475569; font-weight: 600; text-decoration: none;">{{ training_program.name }}</a>
+        </div>
+    </div>
+
+    <!-- Add Task Card -->
+    <div class="tp-filter-card">
+        <label class="tp-filter-label" for="start_date">Manual Task Assignment:</label>
+        <form enctype="multipart/form-data" action="{{ url("training_program", training_program.id, "student", selected_user.id, "tasks", "add") }}" method="POST" style="display: flex; gap: 12px;">
             {{ xsrf_form_html|safe }}
-            <input type="submit" value="Remove" {% if not admin.permission_all %}disabled{% endif %} onclick="return confirm('Are you sure you want to remove this task from the student\\'s archive?');" />
-          </form>
-        </td>
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-  {% else %}
-  <p>No tasks assigned to this student yet.</p>
-  {% endif %}
-  <div class="hr"></div>
+
+            <div style="flex-grow: 1;">
+                <select name="task_id" id="task_selector" class="searchable-select" placeholder="Search for a task..." style="width: 100%;">
+                    <option value="" selected disabled hidden>Select a task...</option>
+                    {% for task in available_tasks %}
+                    <option value="{{ task.id }}">{{ task.name }} - {{ task.title }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+
+            <button type="submit" class="tp-btn-primary" {% if not admin.permission_all %}disabled{% endif %} style="white-space: nowrap;">
+                Add Task
+            </button>
+        </form>
+    </div>
+
+    <!-- List Header -->
+    <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; padding: 0 4px;">
+        <h2 style="font-size: 1.25rem; color: #1e293b; font-weight: 700; margin: 0;">Assigned Tasks ({{ student_tasks|length }})</h2>
+    </div>
+
+    <!-- Table -->
+    <div class="tp-table-container">
+        {% if student_tasks %}
+        <table class="ranking-table" id="student-tasks-table" style="width: 100%;">
+            <thead>
+                <tr>
+                    <th class="sortable-header" data-sort="string" style="width: 30%;">Task</th>
+                    <th class="sortable-header" data-sort="string" style="width: 15%;">Source</th>
+                    <th class="sortable-header" data-sort="date" style="width: 15%;">Assigned At</th>
+                    <th class="sortable-header text-center" data-sort="number" style="width: 10%;">Training</th>
+                    <th class="sortable-header text-center" data-sort="number" style="width: 10%;">Home</th>
+                    <th class="sortable-header text-center" data-sort="number" style="width: 10%;">Submissions</th>
+                    <th class="text-center" style="width: 10%;">Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for st in student_tasks %}
+                <tr data-task="{{ st.task.name }}"
+                    data-assigned="{{ st.assigned_at.timestamp() if st.assigned_at else 0 }}"
+                    data-training-score="{{ training_scores.get(st.task.id, -1) }}"
+                    data-home-score="{{ home_scores.get(st.task.id, -1) }}"
+                    data-submissions="{{ submission_counts.get(st.task.id, 0) }}">
+
+                    <!-- Task -->
+                    <td>
+                        <div class="list-cell-wrapper" style="flex-direction: column; align-items: flex-start;">
+                            <div style="font-weight: 600; font-size: 0.95rem;">
+                                <a href="{{ url("task", st.task.id) }}" class="student-name-link">{{ st.task.name }}</a>
+                            </div>
+                            <div style="font-size: 0.85em; color: #64748b; margin-top: 2px;">{{ st.task.title }}</div>
+                        </div>
+                    </td>
+
+                    <!-- Source -->
+                    <td>
+                        <div class="list-cell-wrapper">
+                            {% if st.source_training_day %}
+                                {% if st.source_training_day.contest %}
+                                    <a href="{{ url("contest", st.source_training_day.contest.id) }}" class="source-badge badge-training">
+                                        {{ st.source_training_day.contest.description }}
+                                    </a>
+                                {% else %}
+                                    <span class="source-badge badge-archived">
+                                        {{ st.source_training_day.description or st.source_training_day.name or "Archived Training" }}
+                                    </span>
+                                {% endif %}
+                            {% else %}
+                                <span class="source-badge badge-manual">Manual Assignment</span>
+                            {% endif %}
+                        </div>
+                    </td>
+
+                    <!-- Date -->
+                    <td>
+                        <div class="list-cell-wrapper" style="color: #475569; font-family: monospace; font-size: 0.85rem; flex-direction: column; align-items: flex-start; justify-content: center;">
+                            <div>{{ st.assigned_at.strftime('%Y-%m-%d') if st.assigned_at else '-' }}</div>
+                            <div style="color: #94a3b8; font-size: 0.9em;">{{ st.assigned_at.strftime('%H:%M') if st.assigned_at else '' }}</div>
+                        </div>
+                    </td>
+
+                    <!-- Training Score -->
+                    <td class="text-center">
+                        <div class="list-cell-wrapper center-content">
+                            {% if st.task.id in training_scores %}
+                                {% set score = training_scores[st.task.id] %}
+                                <span style="font-weight: 700; font-family: monospace; font-size: 1rem; color: {{ '#059669' if score >= 100 else '#d97706' if score > 0 else '#cbd5e1' }};">
+                                    {{ "%.0f"|format(score) }}
+                                </span>
+                            {% else %}
+                                <span style="color: #e2e8f0; font-size: 1.2rem;">&middot;</span>
+                            {% endif %}
+                        </div>
+                    </td>
+
+                    <!-- Home Score -->
+                    <td class="text-center">
+                        <div class="list-cell-wrapper center-content">
+                            {% if st.task.id in home_scores %}
+                                {% set score = home_scores[st.task.id] %}
+                                <span style="font-weight: 700; font-family: monospace; font-size: 1rem; color: {{ '#059669' if score >= 100 else '#d97706' if score > 0 else '#cbd5e1' }};">
+                                    {{ "%.0f"|format(score) }}
+                                </span>
+                            {% else %}
+                                <span style="color: #e2e8f0; font-size: 1.2rem;">&middot;</span>
+                            {% endif %}
+                        </div>
+                    </td>
+
+                    <!-- Submissions -->
+                    <td class="text-center">
+                        <div class="list-cell-wrapper center-content">
+                            {% set sub_count = submission_counts.get(st.task.id, 0) %}
+                            {% if sub_count > 0 %}
+                                <a href="{{ url("training_program", training_program.id, "student", selected_user.id, "task", st.task.id, "submissions") }}" style="text-decoration: none; color: #0F766E; font-weight: 700; font-size: 1rem; display: flex; align-items: center; gap: 2px;">
+                                    {{ sub_count }}<span style="font-size: 1em; opacity: 0.6;">↗</span>
+                                </a>
+                            {% else %}
+                                <span style="color: #cbd5e1; font-weight: 500;">0</span>
+                            {% endif %}
+                        </div>
+                    </td>
+
+                    <!-- Actions -->
+                    <td class="text-center">
+                        <div class="list-cell-wrapper center-content">
+                            <form action="{{ url("training_program", training_program.id, "student", selected_user.id, "task", st.task.id, "remove") }}" method="POST" style="margin: 0;">
+                                {{ xsrf_form_html|safe }}
+                                <button type="submit" class="btn-icon-only" {% if not admin.permission_all %}disabled{% endif %} onclick="return confirm('Are you sure you want to remove this task from the student\'s archive?');" title="Remove task">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                                        <polyline points="3 6 5 6 21 6"></polyline>
+                                        <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
+                                        <line x1="10" y1="11" x2="10" y2="17"></line>
+                                        <line x1="14" y1="11" x2="14" y2="17"></line>
+                                    </svg>
+                                </button>
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {% else %}
+        <div style="text-align: center; padding: 80px 20px; color: #64748b;">
+            <div style="font-size: 3em; margin-bottom: 10px; opacity: 0.15; filter: grayscale(1);">📂</div>
+            <p style="margin: 0; font-size: 1.1em; font-weight: 500;">No tasks assigned yet</p>
+            <p style="margin: 5px 0 0 0; font-size: 0.9em; opacity: 0.7;">Use the manual assignment box above to add one.</p>
+        </div>
+        {% endif %}
+    </div>
 </div>
 
+<script>
+(function() {
+    var table = document.getElementById('student-tasks-table');
+    if (!table) return;
+
+    var headers = table.querySelectorAll('th.sortable-header');
+    var sortState = {};
+
+    headers.forEach(function(header, index) {
+        header.addEventListener('click', function() {
+            var columnIndex = header.cellIndex;
+            var ascending = !sortState[index];
+            sortState[index] = ascending;
+
+            // Update UI
+            headers.forEach(function(h) { h.classList.remove('sort-asc', 'sort-desc'); });
+            header.classList.add(ascending ? 'sort-asc' : 'sort-desc');
+
+            var tbody = table.querySelector('tbody');
+            var rows = Array.from(tbody.querySelectorAll('tr'));
+
+            rows.sort(function(a, b) {
+                var aVal, bVal;
+
+                // Extract data based on column index
+                if (columnIndex === 0) { // Task Name
+                    aVal = a.getAttribute('data-task').toLowerCase();
+                    bVal = b.getAttribute('data-task').toLowerCase();
+                } else if (columnIndex === 1) { // Source
+                    aVal = a.cells[columnIndex].textContent.trim().toLowerCase();
+                    bVal = b.cells[columnIndex].textContent.trim().toLowerCase();
+                } else if (columnIndex === 2) { // Assigned At
+                    aVal = parseFloat(a.getAttribute('data-assigned')) || 0;
+                    bVal = parseFloat(b.getAttribute('data-assigned')) || 0;
+                } else if (columnIndex === 3) { // Training Score
+                    aVal = parseFloat(a.getAttribute('data-training-score'));
+                    bVal = parseFloat(b.getAttribute('data-training-score'));
+                    if (aVal < 0) aVal = ascending ? Infinity : -Infinity;
+                    if (bVal < 0) bVal = ascending ? Infinity : -Infinity;
+                } else if (columnIndex === 4) { // Home Score
+                    aVal = parseFloat(a.getAttribute('data-home-score'));
+                    bVal = parseFloat(b.getAttribute('data-home-score'));
+                    if (aVal < 0) aVal = ascending ? Infinity : -Infinity;
+                    if (bVal < 0) bVal = ascending ? Infinity : -Infinity;
+                } else if (columnIndex === 5) { // Submissions
+                    aVal = parseInt(a.getAttribute('data-submissions')) || 0;
+                    bVal = parseInt(b.getAttribute('data-submissions')) || 0;
+                }
+
+                if (aVal < bVal) return ascending ? -1 : 1;
+                if (aVal > bVal) return ascending ? 1 : -1;
+                return 0;
+            });
+
+            rows.forEach(function(row) {
+                tbody.appendChild(row);
+            });
+        });
+    });
+})();
+</script>
 {% endblock core %}
diff --git a/cms/server/admin/templates/training_program_combined_ranking.html b/cms/server/admin/templates/training_program_combined_ranking.html
index c1efaf6a5b..59a66ac985 100644
--- a/cms/server/admin/templates/training_program_combined_ranking.html
+++ b/cms/server/admin/templates/training_program_combined_ranking.html
@@ -145,7 +145,7 @@
 
 function openHistogramModal(scores, title, type, trainingDayId, maxPossibleScore) {
     if (!histogramModal) return;
-    currentHistogramData = { scores: scores, title: title, type: type, trainingDayId: trainingDayId, maxPossibleScore: maxPossibleScore || 100 };
+    currentHistogramData = { scores: scores, title: title, type: type, trainingDayId: trainingDayId, maxPossibleScore: (maxPossibleScore === undefined || maxPossibleScore === null) ? 100 : maxPossibleScore };
     document.getElementById('histogramTitle').textContent = title + ' - Score Distribution';
 
     // Update the whitelist to only show tags that existed in this training day
@@ -248,56 +248,81 @@
     var trainingDayId = currentHistogramData ? currentHistogramData.trainingDayId : null;
     var maxPossibleScore = calculateFilteredMaxScore(filteredScores, trainingDayId, type);
 
-    // Calculate bucket size: divide max score into 10 equal parts
-    // For max=100: buckets are 0, (0,10], (10,20], ..., (80,90], >90
-    // For max=200: buckets are 0, (0,20], (20,40], ..., (160,180], >180
-    // Guard against division by zero when maxPossibleScore is 0
-    if (maxPossibleScore === 0) {
-        maxPossibleScore = 1; // Avoid division by zero
-    }
-    var bucketSize = maxPossibleScore / 10;
-    var lastBucketThreshold = maxPossibleScore * 0.9; // 90% of max
-
     // Build histogram buckets dynamically based on max possible score
     var buckets = {};
     var bucketLabels = {};
     var bucketOrder = [];
 
-    // First bucket: exactly 0
-    buckets['0'] = 0;
-    bucketLabels['0'] = '0';
-    bucketOrder.push('0');
-
-    // Middle buckets: (0, bucketSize], (bucketSize, 2*bucketSize], ..., up to 90% of max
-    for (var i = 1; i <= 9; i++) {
-        var upperBound = Math.round(i * bucketSize);
-        var lowerBound = Math.round((i - 1) * bucketSize);
-        var key = upperBound.toString();
-        buckets[key] = 0;
-        bucketLabels[key] = '(' + lowerBound + ',' + upperBound + ']';
-        bucketOrder.push(key);
+    // Guard against division by zero when maxPossibleScore is 0
+    if (maxPossibleScore === 0) {
+        maxPossibleScore = 1; // Avoid division by zero
     }
 
-    // Last bucket: >90% of max
-    var lastKey = Math.round(maxPossibleScore).toString();
-    buckets[lastKey] = 0;
-    bucketLabels[lastKey] = '>' + Math.round(lastBucketThreshold);
-    bucketOrder.push(lastKey);
+    if (maxPossibleScore <= 15) {
+        var maxInt = Math.ceil(maxPossibleScore);
 
-    scoreValues.forEach(function(score) {
-        if (score === 0) {
-            buckets['0']++;
-        } else if (score > lastBucketThreshold) {
-            buckets[lastKey]++;
-        } else {
-            // For (0,bucketSize], (bucketSize,2*bucketSize], etc. - use ceiling to get the bucket
-            var bucketIndex = Math.ceil(score / bucketSize);
-            if (bucketIndex < 1) bucketIndex = 1;
-            if (bucketIndex > 9) bucketIndex = 9;
-            var bucketKey = Math.round(bucketIndex * bucketSize).toString();
-            buckets[bucketKey]++;
+        // Create a bucket for every integer from 0 to max
+        for (var i = 0; i <= maxInt; i++) {
+            var key = i.toString();
+            buckets[key] = 0;
+            bucketLabels[key] = key; // Label is just "1", "2", etc.
+            bucketOrder.push(key);
         }
-    });
+
+        // Fill buckets
+        scoreValues.forEach(function(score) {
+            // Round score to nearest integer to fit in bucket
+            // (e.g., 4.9 becomes 5, 4.1 becomes 4)
+            var rounded = Math.round(score);
+
+            // Safety clamp: if score exceeds max (e.g. bonus points), put in last bucket
+            if (rounded > maxInt) rounded = maxInt;
+            if (rounded < 0) rounded = 0;
+
+            buckets[rounded.toString()]++;
+        });
+    } else {
+        // Calculate bucket size: divide max score into 10 equal parts
+        // For max=100: buckets are 0, (0,10], (10,20], ..., (80,90], >90
+        // For max=200: buckets are 0, (0,20], (20,40], ..., (160,180], >180
+        var bucketSize = maxPossibleScore / 10;
+        var lastBucketThreshold = maxPossibleScore * 0.9; // 90% of max
+        // First bucket: exactly 0
+        buckets['0'] = 0;
+        bucketLabels['0'] = '0';
+        bucketOrder.push('0');
+
+        // Middle buckets: (0, bucketSize], (bucketSize, 2*bucketSize], ..., up to 90% of max
+        for (var i = 1; i <= 9; i++) {
+            var upperBound = Math.round(i * bucketSize);
+            var lowerBound = Math.round((i - 1) * bucketSize);
+            var key = upperBound.toString();
+            buckets[key] = 0;
+            bucketLabels[key] = '(' + lowerBound + ',' + upperBound + ']';
+            bucketOrder.push(key);
+        }
+
+        // Last bucket: >90% of max
+        var lastKey = Math.round(maxPossibleScore).toString();
+        buckets[lastKey] = 0;
+        bucketLabels[lastKey] = '>' + Math.round(lastBucketThreshold);
+        bucketOrder.push(lastKey);
+
+        scoreValues.forEach(function(score) {
+            if (score === 0) {
+                buckets['0']++;
+            } else if (score > lastBucketThreshold) {
+                buckets[lastKey]++;
+            } else {
+                // For (0,bucketSize], (bucketSize,2*bucketSize], etc. - use ceiling to get the bucket
+                var bucketIndex = Math.ceil(score / bucketSize);
+                if (bucketIndex < 1) bucketIndex = 1;
+                if (bucketIndex > 9) bucketIndex = 9;
+                var bucketKey = Math.round(bucketIndex * bucketSize).toString();
+                buckets[bucketKey]++;
+            }
+        });
+    }
 
     // Render histogram bars
     var histogramBars = document.getElementById('histogramBars');
@@ -423,7 +448,7 @@
     if (!table) return;
 
     // Get max possible score for this task
-    var maxPossibleScore = taskMaxScores[taskId] || 100;
+    var maxPossibleScore = (taskMaxScores[taskId] === undefined) ? 100 : taskMaxScores[taskId];
 
     // Collect scores from the table - only include students who had access to the task
     var rows = table.querySelectorAll('tbody tr');
@@ -454,7 +479,7 @@
     if (!table) return;
 
     // Get max possible score for this training day (sum of all task max scores)
-    var maxPossibleScore = trainingDayMaxScores[trainingDayId] || 100;
+    var maxPossibleScore = (trainingDayMaxScores[trainingDayId] === undefined) ? 100 : trainingDayMaxScores[trainingDayId];
 
     // Collect total scores for this training day - only include students who participated
     var rows = table.querySelectorAll('tbody tr');
@@ -586,17 +611,16 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
       {% set global_total = namespace(value=0) %}
       <tr data-student-id="{{ student.id }}">
         <th>
-          <div class="student-name-wrapper" style="display: flex; flex-direction: row; align-items: center; gap: 8px; padding: 6px 10px;">
+          <div class="student-name-wrapper combined-ranking-student-wrapper">
             {% if student.participation %}
-                <div style="flex: 1; min-width: 0;">
-                    <div style="display: flex; align-items: baseline; gap: 6px; max-width: 100%;">
-                        <a class="student-name-link"
+                <div class="combined-ranking-student-info">
+                    <div class="combined-ranking-name-row">
+                        <a class="student-name-link combined-ranking-name-link"
                            href="{{ url('training_program', training_program.id, 'student', student.participation.user.id, 'edit') }}"
-                           title="{{ student.participation.user.first_name }} {{ student.participation.user.last_name }}"
-                           style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block; max-width: 100%;">
+                           title="{{ student.participation.user.first_name }} {{ student.participation.user.last_name }}">
                             {{ student.participation.user.first_name }} {{ student.participation.user.last_name }}
                         </a>
-                        <span class="student-username" style="font-size: 0.8em; color: #64748b;">
+                        <span class="student-username">
                             ({{ student.participation.user.username }})
                         </span>
 
@@ -609,21 +633,20 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
 
                         <a class="history-link"
                            href="{{ url('training_program', training_program.id, 'student', student.id, 'combined_ranking_detail') }}{% if params %}?{{ params | join('&') }}{% endif %}"
-                           title="View score/rank history"
-                           style="margin-left: auto; text-decoration: none;">
+                           title="View score/rank history">
                             📊
                         </a>
                     </div>
                     {% if student.student_tags %}
-                    <div style="margin-top: 3px; display: flex; flex-wrap: wrap; gap: 2px;">
+                    <div class="combined-ranking-tags">
                         {% for tag in student.student_tags %}
-                          <span class="badge badge-teal" style="font-weight: normal; font-size: 0.7em;">{{ tag }}</span>
+                          <span class="badge badge-teal combined-ranking-tag">{{ tag }}</span>
                         {% endfor %}
                     </div>
                     {% endif %}
                 </div>
             {% else %}
-                <span style="color:#9ca3af;">(Unknown)</span>
+                <span class="text-muted">(Unknown)</span>
             {% endif %}
           </div>
         </th>
@@ -645,7 +668,7 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
                     {{ render_score_cell(score_val) }}
                 {% else %}
                      <div class="cell-content inaccessible-cell" title="Inaccessible">
-                        <span style="opacity: 0.5;">&mdash;</span>
+                        <span>&mdash;</span>
                      </div>
                 {% endif %}
             </td>
@@ -705,11 +728,6 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
 </div>
 
 <script>
-  $(document).ready(function() {
-    if (CMS && CMS.AWSUtils) {
-        CMS.AWSUtils.init_table_sort($("#ranking_table"), false, 0, false);
-    }
-  });
   function updateStickyHeaderOffset() {
     var firstRow = document.querySelector('.ranking-table thead tr:first-child');
     if (firstRow) {
@@ -721,8 +739,6 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
   window.addEventListener('resize', updateStickyHeaderOffset);
 
   $(document).ready(function() {
-      initHistogramModal();
-
       updateStickyHeaderOffset();
 
       setTimeout(updateStickyHeaderOffset, 100);
@@ -735,9 +751,9 @@ <h1>Combined Ranking: <a href="{{ url('training_program', training_program.id) }
 </script>
 
 {% else %}
-  <div style="text-align: center; padding: 40px; background: #f9fafb; border-radius: 8px; border: 1px dashed #d1d5db; margin-top: 20px;">
-    <h3 style="color: #4b5563; margin-bottom: 8px; font-weight: 600;">No Data Available</h3>
-    <p style="color: #6b7280;">No archived training days found matching your current filter.</p>
+  <div class="empty-state-box">
+    <h3>No Data Available</h3>
+    <p>No archived training days found matching your current filter.</p>
   </div>
 {% endif %}
 
@@ -765,200 +781,4 @@ <h2 id="histogramTitle">Score Distribution</h2>
   </div>
 </div>
 
-<style>
-.histogram-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 10000;
-}
-
-/* Ensure Tagify dropdown appears above the modal */
-.tagify__dropdown {
-  z-index: 10001 !important;
-}
-
-.histogram-modal-content {
-  background: white;
-  border-radius: 12px;
-  padding: 24px;
-  max-width: 800px;
-  width: 90%;
-  max-height: 90vh;
-  overflow-y: auto;
-  box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
-}
-
-.histogram-modal-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-  padding-bottom: 12px;
-  border-bottom: 1px solid #e5e7eb;
-}
-
-.histogram-modal-header h2 {
-  margin: 0;
-  font-size: 1.25rem;
-  color: #1f2937;
-}
-
-.histogram-close-btn {
-  background: none;
-  border: none;
-  font-size: 28px;
-  cursor: pointer;
-  color: #6b7280;
-  line-height: 1;
-  padding: 0;
-}
-
-.histogram-close-btn:hover {
-  color: #1f2937;
-}
-
-.histogram-filter-row {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 20px;
-}
-
-.histogram-filter-row label {
-  font-weight: 500;
-  color: #374151;
-  white-space: nowrap;
-}
-
-.histogram-chart-container {
-  background: #f9fafb;
-  border-radius: 8px;
-  padding: 20px;
-  margin-bottom: 16px;
-}
-
-.histogram-bars {
-  display: flex;
-  align-items: flex-end;
-  justify-content: space-between;
-  height: 200px;
-  gap: 4px;
-}
-
-.histogram-bar-container {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
-}
-
-.histogram-bar-wrapper {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-  width: 100%;
-}
-
-.histogram-bar {
-  width: 100%;
-  min-height: 2px;
-  border-radius: 4px 4px 0 0;
-  transition: height 0.3s ease;
-}
-
-.histogram-label {
-  font-size: 10px;
-  color: #6b7280;
-  margin-top: 4px;
-  text-align: center;
-}
-
-.histogram-count {
-  font-size: 11px;
-  font-weight: 600;
-  color: #374151;
-  margin-top: 2px;
-}
-
-.histogram-stats {
-  background: #f0f9ff;
-  border: 1px solid #bae6fd;
-  border-radius: 6px;
-  padding: 12px 16px;
-  margin-bottom: 16px;
-  font-size: 0.9rem;
-  color: #0369a1;
-}
-
-.histogram-text-section {
-  border: 1px solid #e5e7eb;
-  border-radius: 8px;
-  overflow: hidden;
-}
-
-.histogram-text-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 14px;
-  background: #f9fafb;
-  border-bottom: 1px solid #e5e7eb;
-}
-
-.histogram-text-header span {
-  font-weight: 500;
-  color: #374151;
-}
-
-.copy-btn {
-  background: #3b82f6;
-  color: white;
-  border: none;
-  padding: 6px 12px;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-}
-
-.copy-btn:hover {
-  background: #2563eb;
-}
-
-#histogramTextData {
-  width: 100%;
-  border: none;
-  padding: 12px 14px;
-  font-family: monospace;
-  font-size: 12px;
-  resize: vertical;
-  background: white;
-}
-
-.histogram-icon {
-  cursor: pointer;
-  font-size: 12px;
-  margin-left: 4px;
-  opacity: 0.6;
-  transition: opacity 0.2s;
-  vertical-align: middle;
-}
-
-.histogram-icon:hover {
-  opacity: 1;
-}
-
-.task-header .header-text,
-.total-col-header .header-text {
-  vertical-align: middle;
-}
-</style>
 {% endblock core %}
diff --git a/cms/server/admin/templates/training_program_combined_ranking_detail.html b/cms/server/admin/templates/training_program_combined_ranking_detail.html
index f7b3221e3b..2b6c86ff31 100644
--- a/cms/server/admin/templates/training_program_combined_ranking_detail.html
+++ b/cms/server/admin/templates/training_program_combined_ranking_detail.html
@@ -1,211 +1,9 @@
 {% extends "base.html" %}
 
 {% block core %}
-<style>
-#UserDetail_bg {
-  display: block;
-}
+{% include "fragments/user_detail_styles.html" %}
 
-#UserDetail {
-  max-width: 960px;
-  margin: 0 auto;
-  padding: 20px;
-}
-
-#UserDetail_close {
-  display: none;
-}
-
-#UserDetail_header {
-  display: flex;
-  min-height: 120px;
-  margin-bottom: 20px;
-}
-
-#UserDetail_summary {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  font-size: 1.5em;
-  line-height: 1.5em;
-}
-
-#UserDetail_face {
-  display: block;
-  max-width: 160px;
-  max-height: 240px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  margin: 10px 0;
-}
-
-#UserDetail_flag {
-  display: none;
-}
-
-#UserDetail_navigator {
-  flex: 1;
-  max-width: 450px;
-}
-
-#UserDetail_navigator table {
-  width: 100%;
-  table-layout: fixed;
-  border-spacing: 2px;
-  border-collapse: separate;
-}
-
-#UserDetail_navigator tr {
-  height: 28px;
-}
-
-#UserDetail_navigator col.name {
-  width: 55%;
-}
-
-#UserDetail_navigator col.score,
-#UserDetail_navigator col.rank {
-  width: 15%;
-}
-
-#UserDetail_navigator col.show {
-  width: 15%;
-}
-
-#UserDetail_navigator tr td.score,
-#UserDetail_navigator tr td.rank {
-  padding-left: 4px;
-  text-align: right;
-}
-
-#UserDetail_navigator tbody tr td.btn {
-  text-align: center;
-  border: 1px solid #999999;
-  box-shadow: 0 0 2px gray;
-  background-color: #EEEEEE;
-  border-radius: 3px;
-  cursor: pointer;
-  user-select: none;
-}
-
-#UserDetail_navigator tbody tr td.btn:hover {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_navigator tbody tr td.btn:active {
-  background-color: #CCCCCC;
-}
-
-#UserDetail_navigator tbody tr.active td.btn {
-  background-color: #EEEEEE;
-  opacity: 0.4;
-  cursor: default;
-}
-
-#UserDetail_navigator tr.global,
-#UserDetail_navigator tr.contest {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_navigator tr.task {
-  background-color: #FFFFFF;
-}
-
-#UserDetail_navigator tr.global td.name,
-#UserDetail_navigator tr.contest td.name {
-  padding-left: 5px;
-  font-weight: bold;
-}
-
-#UserDetail_navigator tr.task td.name {
-  padding-left: 25px;
-}
-
-#UserDetail_title {
-  margin-top: 24px;
-  font-size: 1.5em;
-  line-height: 1.5em;
-  text-align: center;
-}
-
-#UserDetail_charts {
-  margin-top: 24px;
-  width: 100%;
-  text-align: center;
-}
-
-#UserDetail_charts canvas {
-  display: block;
-  margin: 10px auto;
-}
-
-#UserDetail_submissions {
-  margin-top: 24px;
-  width: 100%;
-}
-
-#UserDetail_submissions:empty {
-  margin-top: 0;
-}
-
-#UserDetail_submissions table {
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: collapse;
-}
-
-#UserDetail_submissions td,
-#UserDetail_submissions th {
-  height: 28px;
-  padding: 4px 8px;
-  text-align: left;
-}
-
-#UserDetail_submissions thead {
-  background-color: #DDDDDD;
-}
-
-#UserDetail_submissions tbody tr:nth-child(even) {
-  background-color: #EEEEEE;
-}
-
-#UserDetail_submissions tbody tr:nth-child(odd) {
-  background-color: #F8F8F8;
-}
-
-#UserDetail_submissions tbody td[colspan] {
-  text-align: center;
-  font-style: italic;
-}
-
-.back-link {
-  margin-bottom: 20px;
-  font-family: "Inter", "Segoe UI", sans-serif;
-}
-
-.back-link a {
-    color: #0F766E;
-    text-decoration: none;
-    font-weight: 500;
-}
-
-.back-link a:hover {
-    text-decoration: underline;
-    color: #0d655e;
-}
-
-.filter-info {
-  background-color: #F0FDFA;
-  border: 1px solid #0F766E;
-  border-radius: 4px;
-  padding: 8px 12px;
-  margin-bottom: 16px;
-  font-size: 0.9rem;
-  color: #0F766E;
-}
-</style>
-
-<div class="back-link">
+<div class="user-detail-back-link">
   {% set params = [] %}
   {% if start_date %}{% set _ = params.append('start_date=' ~ start_date.strftime('%Y-%m-%d')) %}{% endif %}
   {% if end_date %}{% set _ = params.append('end_date=' ~ end_date.strftime('%Y-%m-%d')) %}{% endif %}
@@ -218,7 +16,7 @@
 </div>
 
 {% if start_date or end_date or training_day_types or student_tags %}
-<div class="filter-info">
+<div class="user-detail-filter-info">
   {% if start_date or end_date %}
   Showing data for training days
   {% if start_date and end_date %}
@@ -241,76 +39,15 @@
 </div>
 {% endif %}
 
-<div id="UserDetail_bg">
-  <div id="UserDetail">
-    <img id="UserDetail_close" src="" alt="Close"/>
-    <div id="UserDetail_header">
-      <div id="UserDetail_summary">
-        <div>
-          <span id="UserDetail_f_name">{% if student.participation %}{{ student.participation.user.first_name }}{% endif %}</span>
-          <span id="UserDetail_l_name">{% if student.participation %}{{ student.participation.user.last_name }}{% endif %}</span>
-        </div>
-        <div style="font-size: 0.6em; color: #666;">
-          {% if student.participation %}{{ student.participation.user.username }}{% endif %}
-        </div>
-        {% if student.participation and student.participation.user.picture %}<img id="UserDetail_face" src="{{ url("file", student.participation.user.picture, "picture") }}" alt="Profile picture of {{ student.participation.user.first_name }} {{ student.participation.user.last_name }}"/>{% else %}<img id="UserDetail_face" src="" alt="" style="display: none;"/>{% endif %}
-        <div id="UserDetail_spacer"></div>
-        <div id="UserDetail_team"></div>
-        <img id="UserDetail_flag" src="" alt="Flag"/>
-      </div>
-      <div id="UserDetail_navigator">
-        <table>
-          <col class="name"/>
-          <col class="score"/>
-          <col class="rank"/>
-          <col class="show"/>
-          <thead>
-            <tr>
-              <td></td>
-              <td style="text-align: right;">Score</td>
-              <td style="text-align: right;">Rank</td>
-              <td></td>
-            </tr>
-          </thead>
-          <tbody id="UserDetail_scores">
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    <div id="UserDetail_title"></div>
-
-    <div id="UserDetail_charts">
-      <div style="margin-bottom: 10px;"><strong>Score</strong></div>
-      <canvas id="UserDetail_score_chart" width="920" height="200"></canvas>
-      <div style="margin-top: 20px; margin-bottom: 10px;"><strong>Rank</strong></div>
-      <canvas id="UserDetail_rank_chart" width="920" height="200"></canvas>
-    </div>
-
-    <div id="UserDetail_submissions">
-    </div>
-  </div>
-</div>
+{% with first_name=student.participation.user.first_name if student.participation else '',
+        last_name=student.participation.user.last_name if student.participation else '',
+        username=student.participation.user.username if student.participation else '',
+        picture_url=url("file", student.participation.user.picture, "picture") if student.participation and student.participation.user.picture else none,
+        team_name=none %}
+{% include "fragments/user_detail_layout.html" %}
+{% endwith %}
 
 <script>
-function format_time(time, full) {
-  var h = Math.floor(time / 3600);
-  var m = Math.floor((time % 3600) / 60);
-  var s = Math.floor(time % 60);
-  h = full && h < 10 ? "0" + h : "" + h;
-  m = m < 10 ? "0" + m : "" + m;
-  s = s < 10 ? "0" + s : "" + s;
-  return (h + ":" + m + ":" + s);
-}
-
-function round_to_str(value, ndigits) {
-  if (ndigits > 0) {
-    return value.toFixed(ndigits).replace(/\.?0+$/, "");
-  } else {
-    return value.toFixed(0);
-  }
-}
-
 var Config = new function() {
   var self = this;
   self.get_history_url = function() {
@@ -347,105 +84,16 @@
 };
 </script>
 
-<script src="{{ url("static", "js", "Chart.js") }}"></script>
-<script src="{{ url("static", "js", "HistoryStore.js") }}"></script>
-<script src="{{ url("static", "js", "UserDetail.js") }}"></script>
+{% include "fragments/user_detail_scripts.html" %}
 
 <script>
 (function() {
-  var userId = {{ user_id | tojson | safe }};
-
-  HistoryStore.init();
-
-  var originalInit = UserDetail.init;
-  UserDetail.init = function() {
-    UserDetail.f_name_label = $('#UserDetail_f_name');
-    UserDetail.l_name_label = $('#UserDetail_l_name');
-    UserDetail.team_label = $('#UserDetail_team');
-    UserDetail.flag_image = $('#UserDetail_flag');
-    UserDetail.face_image = $('#UserDetail_face');
-    UserDetail.title_label = $('#UserDetail_title');
-    UserDetail.navigator = $('#UserDetail_navigator table tbody');
-    UserDetail.submission_table = $('#UserDetail_submissions');
-    UserDetail.score_chart = $('#UserDetail_score_chart')[0];
-    UserDetail.rank_chart = $('#UserDetail_rank_chart')[0];
-
-    UserDetail.navigator.on("click", "td.btn", function() {
-      if (UserDetail.active !== null) {
-        UserDetail.active.removeClass("active");
-      }
-      UserDetail.active = $(this).parent();
-      UserDetail.active.addClass("active");
-
-      if (UserDetail.active.hasClass('global')) {
-        UserDetail.show_global();
-      } else if (UserDetail.active.hasClass('contest')) {
-        UserDetail.show_contest(UserDetail.active.attr('data-contest'));
-      } else if (UserDetail.active.hasClass('task')) {
-        UserDetail.show_task(UserDetail.active.attr('data-task'));
-      }
-    });
-  };
-
-  UserDetail.show = function(user_id) {
-    UserDetail.user_id = user_id;
-    UserDetail.user = DataStore.users[user_id];
-    UserDetail.data_fetched = 0;
-
-    HistoryStore.request_update(UserDetail.history_callback);
-
-    UserDetail.submissions = {{ submissions_data | tojson | safe }};
-    UserDetail.data_fetched += 1;
-    UserDetail.do_show();
-  };
-
-  var originalDoShow = UserDetail.do_show;
-  UserDetail.do_show = function() {
-    if (UserDetail.data_fetched == 2) {
-      var s = "<tr class=\"global\"> \
-                  <td class=\"name\">Global</td> \
-                  <td class=\"score\">" + (UserDetail.global_s.length > 0 ? round_to_str(UserDetail.global_s[UserDetail.global_s.length-1][1], DataStore.global_score_precision) : 0) + "</td> \
-                  <td class=\"rank\">" + (UserDetail.global_r.length > 0 ? UserDetail.global_r[UserDetail.global_r.length-1][1] : 1) + "</td> \
-                  <td class=\"btn\"><a>Show</a></td> \
-              </tr>";
-
-      var contests = DataStore.contest_list;
-      for (var i in contests) {
-        var contest = contests[i];
-        var c_id = contest["key"];
-
-        s += "<tr class=\"contest\" data-contest=\"" + c_id +"\"> \
-                 <td class=\"name\">" + contest['name'] + "</td> \
-                 <td class=\"score\">" + (UserDetail.contest_s[c_id] && UserDetail.contest_s[c_id].length > 0 ? round_to_str(UserDetail.contest_s[c_id][UserDetail.contest_s[c_id].length-1][1], contest["score_precision"]) : 0) + "</td> \
-                 <td class=\"rank\">" + (UserDetail.contest_r[c_id] && UserDetail.contest_r[c_id].length > 0 ? UserDetail.contest_r[c_id][UserDetail.contest_r[c_id].length-1][1] : 1) + "</td> \
-                 <td class=\"btn\"><a>Show</a></td> \
-              </tr>";
-
-        var tasks = contest["tasks"];
-        for (var j in tasks) {
-          var task = tasks[j];
-          var t_id = task["key"];
-
-          s += "<tr class=\"task\" data-task=\"" + t_id +"\"> \
-                   <td class=\"name\">" + task['name'] + "</td> \
-                   <td class=\"score\">" + (UserDetail.task_s[t_id] && UserDetail.task_s[t_id].length > 0 ? round_to_str(UserDetail.task_s[t_id][UserDetail.task_s[t_id].length-1][1], task["score_precision"]) : 0) + "</td> \
-                   <td class=\"rank\">" + (UserDetail.task_r[t_id] && UserDetail.task_r[t_id].length > 0 ? UserDetail.task_r[t_id][UserDetail.task_r[t_id].length-1][1] : 1) + "</td> \
-                   <td class=\"btn\"><a>Show</a></td> \
-                </tr>";
-        }
-      }
-
-      UserDetail.navigator.html(s);
-      UserDetail.active = null;
-
-      $('tr.global td.btn', UserDetail.navigator).click();
-    }
-  };
-
-  UserDetail.hide = function() {};
-
-  UserDetail.init();
-  UserDetail.show(userId);
+  initUserDetail({
+    userId: {{ user_id | tojson | safe }},
+    showContestRows: true,
+    fetchSubmissionsViaAjax: false,
+    submissionsData: {{ submissions_data | tojson | safe }}
+  });
 })();
 </script>
 
diff --git a/cms/server/admin/templates/training_program_students.html b/cms/server/admin/templates/training_program_students.html
index 866e58d9a1..7d6613808a 100644
--- a/cms/server/admin/templates/training_program_students.html
+++ b/cms/server/admin/templates/training_program_students.html
@@ -1,88 +1,381 @@
 {% extends "base.html" %}
 
-{% block js_init %}
-CMS.AWSUtils.initReadOnlyTagify('.student-tags-display');
-{% endblock js_init %}
-
 {% block core %}
-<div class="core_title">
-  <h1>Students list</h1>
+<div class="content-constraint" style="max-width: 900px;">
+    <!-- Header -->
+    <div class="page-title" style="margin-bottom: 24px;">
+        <h1>Students</h1>
+        <div class="page-subtitle">
+            Program: <a href="{{ url("training_program", training_program.id) }}" style="color: #475569; font-weight: 600; text-decoration: none;">{{ training_program.name }}</a>
+        </div>
+    </div>
+
+    {% include "fragments/overload_warning.html" %}
+
+    <!-- Action Buttons Row -->
+    <div class="action-buttons-row">
+        <!-- Add Students from List Button -->
+        <form id="bulk-add-form" action="{{ url("training_program", training_program.id, "students", "bulk_add") }}" method="POST" enctype="multipart/form-data" style="display: inline;">
+            {{ xsrf_form_html|safe }}
+            <input type="file" name="students_file" accept=".txt" class="file-input-hidden" id="students-file-input"
+                {% if not admin.permission_all %}disabled{% endif %}
+                onchange="if(this.files.length) this.form.submit();" />
+            <label for="students-file-input" class="btn-outline" style="{% if admin.permission_all %}cursor: pointer;{% else %}opacity: 0.5; cursor: not-allowed;{% endif %}">
+                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
+                    <polyline points="17 8 12 3 7 8"></polyline>
+                    <line x1="12" y1="3" x2="12" y2="15"></line>
+                </svg>
+                Add Students from List
+            </label>
+        </form>
+
+        <!-- Bulk Assign Task Button -->
+        <button type="button" class="btn-outline" onclick="openBulkAssignModal()">
+            <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                <path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"></path>
+                <line x1="7" y1="7" x2="7.01" y2="7"></line>
+            </svg>
+            Bulk Assign Task
+        </button>
+
+        <!-- Add Student Button with Dropdown -->
+        <div class="add-student-dropdown">
+            <button type="button" class="btn-filled-primary" onclick="toggleAddStudentForm()">
+                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <line x1="12" y1="5" x2="12" y2="19"></line>
+                    <line x1="5" y1="12" x2="19" y2="12"></line>
+                </svg>
+                Add Student
+            </button>
+            <div id="add-student-form" class="add-student-form">
+                <form action="{{ url("training_program", training_program.id, "students", "add") }}" method="POST">
+                    {{ xsrf_form_html|safe }}
+                    <label for="user_id">Select a user to add:</label>
+                    <select name="user_id" id="user_id" class="searchable-select">
+                        <option value="" selected disabled hidden>Search for a user...</option>
+                        {% for u in unassigned_users %}
+                        <option value="{{ u.id }}">{{ u.username }} - {{ u.first_name }} {{ u.last_name }}</option>
+                        {% endfor %}
+                    </select>
+                    <button type="submit" class="tp-btn-primary" {% if not admin.permission_all %}disabled{% endif %} style="width: 100%;">
+                        Add to Program
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <!-- Bulk Add Results (if any) -->
+    {% if bulk_add_results %}
+    <div class="tp-filter-card" style="margin-bottom: 24px;">
+        <div style="width: 100%;">
+            <h3 style="margin: 0 0 12px 0; font-size: 1rem; color: #1f2937;">Bulk Add Results</h3>
+            <p style="margin: 0 0 12px 0; color: #6b7280;">{{ students_added }} student(s) successfully added to the training program.</p>
+            <table class="ranking-table" style="width: 100%;">
+                <thead>
+                    <tr>
+                        <th style="text-align: left;">Username</th>
+                        <th style="text-align: left;">Status</th>
+                        <th style="text-align: left;">Message</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for result in bulk_add_results %}
+                    <tr>
+                        <td><div class="list-cell-wrapper">{{ result.username }}</div></td>
+                        <td>
+                            <div class="list-cell-wrapper">
+                                {% if result.status == "success" %}
+                                <span class="source-badge badge-training">Success</span>
+                                {% elif result.status == "already_exists" %}
+                                <span class="source-badge badge-archived">Already in program</span>
+                                {% else %}
+                                <span class="source-badge" style="background: #fef2f2; color: #991b1b; border: 1px solid #fecaca;">Not found</span>
+                                {% endif %}
+                            </div>
+                        </td>
+                        <td><div class="list-cell-wrapper">{{ result.message }}</div></td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+    {% endif %}
+
+    <!-- Students Table -->
+    <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; padding: 0 4px;">
+        <h2 style="font-size: 1.25rem; color: #1e293b; font-weight: 700; margin: 0;">All Students ({{ training_program.students|length }})</h2>
+    </div>
+
+    <form action="{{ url("training_program", training_program.id, "students") }}" method="POST" id="students-form">
+        {{ xsrf_form_html|safe }}
+        <div class="tp-table-container">
+            <table class="ranking-table" id="students-table" style="width: 100%;">
+                <thead>
+                    <tr>
+                        <th class="sortable-header" data-sort="string" style="text-align: left;">Student</th>
+                        <th class="sortable-header" data-sort="number" style="text-align: left; width: 30%;">Task Archive Progress</th>
+                        <th class="text-center" style="width: 20%;">Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for student in training_program.students|sort(attribute="participation.user.username") %}
+                    {% set u = student.participation.user %}
+                    {% set progress = student_progress.get(student.id, {}) %}
+                    <tr data-name="{{ u.first_name }} {{ u.last_name }}"
+                        data-progress="{{ progress.percentage|default(0) }}"
+                        data-has-tasks="{{ 'true' if progress.task_count > 0 else 'false' }}">
+                        <!-- Student (combined name column with avatar and tags inline) -->
+                        <td>
+                            <div class="student-name-wrapper">
+                                {% if u.picture %}
+                                <img class="student-avatar" src="{{ url("file", u.picture, "picture") }}" alt="{{ u.first_name }} {{ u.last_name }}"/>
+                                {% else %}
+                                <div class="student-avatar-placeholder">{{ u.first_name[:1] or '?' }}{{ u.last_name[:1] }}</div>
+                                {% endif %}
+                                <div class="student-info">
+                                    <a class="student-name-link"
+                                       href="{{ url("training_program", training_program.id, "student", u.id, "edit") }}"
+                                       title="{{ u.first_name }} {{ u.last_name }}">
+                                        {{ u.first_name }} {{ u.last_name }}
+                                    </a>
+                                    <span class="student-username">({{ u.username }})</span>
+                                    {% for tag in student.student_tags %}
+                                    <span class="badge badge-teal student-tag-inline">{{ tag }}</span>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </td>
+
+                        <!-- Task Archive Progress (with small bar and score) -->
+                        <td>
+                            <div class="list-cell-wrapper">
+                                {% if progress.task_count > 0 %}
+                                <a href="{{ url("training_program", training_program.id, "student", u.id, "tasks") }}" style="text-decoration: none;">
+                                    <div class="progress-bar-inline">
+                                        {% set pct_color = '#059669' if progress.percentage >= 80 else '#d97706' if progress.percentage >= 40 else '#dc2626' %}
+                                        {% set bar_color = 'color-green' if progress.percentage >= 80 else 'color-orange' if progress.percentage >= 40 else 'color-red' %}
+                                        <span class="percentage" style="color: {{ pct_color }};">
+                                            {{ "%.0f"|format(progress.percentage) }}%
+                                        </span>
+                                        <div class="bar-container">
+                                            <div class="bar-fill {{ bar_color }}" style="width: {{ [progress.percentage, 5]|max if progress.percentage > 0 else 0 }}%;"></div>
+                                        </div>
+                                        <span style="font-size: 0.8rem; color: #6b7280; white-space: nowrap;">
+                                            {{ "%.0f"|format(progress.total_score) }}/{{ "%.0f"|format(progress.max_score) }}
+                                        </span>
+                                    </div>
+                                </a>
+                                {% else %}
+                                <a href="{{ url("training_program", training_program.id, "student", u.id, "tasks") }}" style="text-decoration: none; color: #9ca3af; font-size: 0.85rem;">
+                                    No tasks
+                                </a>
+                                {% endif %}
+                            </div>
+                        </td>
+
+                        <!-- Actions -->
+                        <td class="text-center">
+                            <div class="list-cell-wrapper center-content">
+                                <button type="submit" name="operation" value="remove_{{ u.id }}" class="btn-icon-only"
+                                    {% if not admin.permission_all %}disabled{% endif %}
+                                    onclick="return confirm('Are you sure you want to remove {{ u.username }} from the training program?');"
+                                    title="Remove from program">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                                        <polyline points="3 6 5 6 21 6"></polyline>
+                                        <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
+                                        <line x1="10" y1="11" x2="10" y2="17"></line>
+                                        <line x1="14" y1="11" x2="14" y2="17"></line>
+                                    </svg>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </form>
+
+    {% if not training_program.students %}
+    <div style="text-align: center; padding: 80px 20px; color: #64748b;">
+        <div style="font-size: 3em; margin-bottom: 10px; opacity: 0.15; filter: grayscale(1);">👥</div>
+        <p style="margin: 0; font-size: 1.1em; font-weight: 500;">No students in this program yet</p>
+        <p style="margin: 5px 0 0 0; font-size: 0.9em; opacity: 0.7;">Use the "Add Student" button above to add students.</p>
+    </div>
+    {% endif %}
 </div>
 
-{% include "fragments/overload_warning.html" %}
-
-<p>
-  <a href="{{ url("training_program", training_program.id, "bulk_assign_task") }}">Bulk Assign Task by Tag</a>
-</p>
-
-<form action="{{ url("training_program", training_program.id, "students", "add") }}" method="POST">
-  {{ xsrf_form_html|safe }}
-  Add a new student:
-  <select name="user_id" class="searchable-select">
-    <option value="" selected disabled hidden>Select a new user...</option>
-    {% for u in unassigned_users %}
-    <option value="{{ u.id }}">
-      {{ u.username }}
-    </option>
-    {% endfor %}
-  </select>
-  <input type="submit"
-{% if not admin.permission_all %}
-         disabled
-{% endif %}
-         value="Add student" />
-</form>
-
-<form action="{{ url("training_program", training_program.id, "students") }}" method="POST">
-  {{ xsrf_form_html|safe }}
-  Edit selected student:
-  <input type="submit"
-         name="operation"
-         value="Remove from training program"
-{% if not admin.permission_all %}
-         disabled
-{% endif %}
-         />
-  <table class="bordered">
-    <thead>
-      <tr>
-        <th></th>
-        <th>Username</th>
-        <th>First Name</th>
-        <th>Last Name</th>
-        <th>Student Tags</th>
-        <th>Task Archive Progress</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for student in training_program.students|sort(attribute="participation.user.username") %}
-      {% set u = student.participation.user %}
-      {% set progress = student_progress.get(student.id, {}) %}
-      <tr>
-        <td>
-          <input type="radio" name="user_id" value="{{ u.id }}"/>
-        </td>
-        <td><a href="{{ url("training_program", training_program.id, "student", u.id, "edit") }}">{{ u.username }}</a></td>
-        <td>{{ u.first_name }}</td>
-        <td>{{ u.last_name }}</td>
-        <td>
-          {% if student.student_tags %}
-          <input type="text" class="student-tags-display" value="{{ student.student_tags|join(", ") }}" readonly/>
-          {% else %}
-          <span class="no-tags-indicator">No tags</span>
-          {% endif %}
-        </td>
-        <td>
-          {% if progress.task_count > 0 %}
-          {{ "%.1f"|format(progress.percentage) }}% ({{ "%.1f"|format(progress.total_score) }}/{{ "%.1f"|format(progress.max_score) }}) [<a href="{{ url("training_program", training_program.id, "student", u.id, "tasks") }}">details</a>]
-          {% else %}
-          No tasks [<a href="{{ url("training_program", training_program.id, "student", u.id, "tasks") }}">details</a>]
-          {% endif %}
-        </td>
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-</form>
+<script>
+function toggleAddStudentForm() {
+    var form = document.getElementById('add-student-form');
+    form.classList.toggle('show');
+}
+
+// Close dropdown when clicking outside
+document.addEventListener('click', function(event) {
+    var dropdown = document.querySelector('.add-student-dropdown');
+    var form = document.getElementById('add-student-form');
+    if (dropdown && !dropdown.contains(event.target)) {
+        form.classList.remove('show');
+    }
+});
+
+// Table sorting
+(function() {
+    var table = document.getElementById('students-table');
+    if (!table) return;
+
+    var headers = table.querySelectorAll('.sortable-header');
+    var sortState = {};
+
+    headers.forEach(function(header, index) {
+        header.addEventListener('click', function() {
+            var columnIndex = header.cellIndex;
+            var ascending = !sortState[index];
+            sortState[index] = ascending;
+
+            // Update UI
+            headers.forEach(function(h) { h.classList.remove('sort-asc', 'sort-desc'); });
+            header.classList.add(ascending ? 'sort-asc' : 'sort-desc');
 
+            var tbody = table.querySelector('tbody');
+            var rows = Array.from(tbody.querySelectorAll('tr'));
+
+            rows.sort(function(a, b) {
+                var aVal, bVal;
+                var aHasTasks = a.getAttribute('data-has-tasks') === 'true';
+                var bHasTasks = b.getAttribute('data-has-tasks') === 'true';
+
+                // Always put "No tasks" students at the end
+                if (columnIndex === 1) { // Task Archive Progress
+                    if (!aHasTasks && bHasTasks) return 1;
+                    if (aHasTasks && !bHasTasks) return -1;
+                }
+
+                if (columnIndex === 0) { // Student (name)
+                    aVal = a.getAttribute('data-name').toLowerCase();
+                    bVal = b.getAttribute('data-name').toLowerCase();
+                } else if (columnIndex === 1) { // Task Archive Progress
+                    aVal = parseFloat(a.getAttribute('data-progress')) || 0;
+                    bVal = parseFloat(b.getAttribute('data-progress')) || 0;
+                }
+
+                if (aVal < bVal) return ascending ? -1 : 1;
+                if (aVal > bVal) return ascending ? 1 : -1;
+                return 0;
+            });
+
+            rows.forEach(function(row) {
+                tbody.appendChild(row);
+            });
+        });
+    });
+})();
+
+// Bulk Assign Task Modal
+var bulkAssignModal = null;
+var bulkAssignTagify = null;
+
+function initBulkAssignModal() {
+    bulkAssignModal = document.getElementById('bulkAssignModal');
+    if (!bulkAssignModal) return;
+
+    // Initialize tagify for tag selection
+    var tagInput = document.getElementById('bulkAssignTagInput');
+    if (tagInput && typeof Tagify !== 'undefined') {
+        var whitelist = {{ (all_student_tags or []) | tojson }};
+        bulkAssignTagify = new Tagify(tagInput, {
+            mode: 'select',
+            whitelist: whitelist,
+            enforceWhitelist: true,
+            editTags: false,
+            dropdown: {
+                maxItems: 20,
+                enabled: 0,
+                closeOnSelect: true
+            },
+            originalInputValueFormat: function(valuesArr) {
+                return valuesArr.length ? valuesArr[0].value : '';
+            }
+        });
+    }
+
+    // Close modal on backdrop click
+    bulkAssignModal.addEventListener('click', function(e) {
+        if (e.target === bulkAssignModal) {
+            closeBulkAssignModal();
+        }
+    });
+
+    // Close modal on Escape key
+    document.addEventListener('keydown', function(e) {
+        if (e.key === 'Escape' && bulkAssignModal.style.display === 'flex') {
+            closeBulkAssignModal();
+        }
+    });
+}
+
+function openBulkAssignModal() {
+    if (!bulkAssignModal) {
+        initBulkAssignModal();
+    }
+    if (bulkAssignModal) {
+        bulkAssignModal.style.display = 'flex';
+        // Reset form
+        var taskSelect = document.getElementById('bulkAssignTaskSelect');
+        if (taskSelect) taskSelect.selectedIndex = 0;
+        if (bulkAssignTagify) bulkAssignTagify.removeAllTags();
+    }
+}
+
+function closeBulkAssignModal() {
+    if (bulkAssignModal) {
+        bulkAssignModal.style.display = 'none';
+    }
+}
+
+// Initialize modal on page load
+document.addEventListener('DOMContentLoaded', function() {
+    initBulkAssignModal();
+});
+</script>
+
+<!-- Bulk Assign Task Modal -->
+<div id="bulkAssignModal" class="bulk-assign-modal" style="display: none;">
+    <div class="bulk-assign-modal-content">
+        <div class="bulk-assign-modal-header">
+            <h2>Bulk Assign Task</h2>
+            <button type="button" class="bulk-assign-close-btn" onclick="closeBulkAssignModal()">&times;</button>
+        </div>
+        <p class="bulk-assign-description">
+            Assign a task to all students who have the specified tag.
+            Students who already have the task assigned will be skipped.
+        </p>
+        <form action="{{ url("training_program", training_program.id, "bulk_assign_task") }}" method="POST">
+            {{ xsrf_form_html|safe }}
+            <div class="bulk-assign-form-group">
+                <label for="bulkAssignTaskSelect">Task</label>
+                <select name="task_id" id="bulkAssignTaskSelect" class="searchable-select" style="width: 100%;">
+                    <option value="" selected disabled hidden>Select a task...</option>
+                    {% for task in (all_tasks or []) %}
+                    <option value="{{ task.id }}">{{ task.name }} - {{ task.title }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="bulk-assign-form-group">
+                <label for="bulkAssignTagInput">Student Tag</label>
+                <input type="text" name="tag" id="bulkAssignTagInput" placeholder="Select a student tag..." />
+            </div>
+            <div class="bulk-assign-form-actions">
+                <button type="button" class="btn-outline" onclick="closeBulkAssignModal()">Cancel</button>
+                <button type="submit" class="tp-btn-primary" {% if not admin.permission_all %}disabled{% endif %}>
+                    Assign Task to Group
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
 {% endblock core %}
diff --git a/cms/server/contest/handlers/trainingprogram.py b/cms/server/contest/handlers/trainingprogram.py
index 497951fc03..4725988e2f 100644
--- a/cms/server/contest/handlers/trainingprogram.py
+++ b/cms/server/contest/handlers/trainingprogram.py
@@ -24,8 +24,10 @@
 from datetime import timedelta
 
 import tornado.web
+from sqlalchemy import func
 
-from cms.db import Participation, Student, ArchivedStudentRanking
+from cms.db import Participation, Student, ArchivedStudentRanking, Submission, Task
+from cms.grading.scorecache import get_cached_score_entry
 from cms.server import multi_contest
 from cms.server.contest.phase_management import compute_actual_phase, compute_effective_times
 from cms.server.util import check_training_day_eligibility, calculate_task_archive_progress
@@ -66,13 +68,36 @@ def get(self):
 
         # Calculate task archive progress using shared utility
         if student is not None:
+            # Get submission counts for each task (batch query for efficiency)
+            student_task_ids = [st.task_id for st in student.student_tasks]
+            submission_counts = {}
+            if student_task_ids:
+                counts = (
+                    self.sql_session.query(
+                        Submission.task_id,
+                        func.count(Submission.id)
+                    )
+                    .filter(Submission.participation_id == participation.id)
+                    .filter(Submission.task_id.in_(student_task_ids))
+                    .group_by(Submission.task_id)
+                    .all()
+                )
+                submission_counts = {task_id: count for task_id, count in counts}
+
             progress = calculate_task_archive_progress(
-                student, participation, contest, include_task_details=True
+                student,
+                participation,
+                contest,
+                self.sql_session,
+                include_task_details=True,
+                submission_counts=submission_counts,
             )
             total_score = progress["total_score"]
             max_score = progress["max_score"]
             percentage = progress["percentage"]
             task_scores = progress["task_scores"]
+            # Commit to release any advisory locks taken by get_cached_score_entry
+            self.sql_session.commit()
         else:
             # No student record - show no tasks
             total_score = 0.0
@@ -217,12 +242,17 @@ def get(self):
             )
             archived_rankings_map = {r.training_day_id: r for r in archived_rankings}
 
+        # Build task_by_id mapping for get_cached_score_entry in _build_past_training_info
+        managing_contest = training_program.managing_contest
+        task_by_id = {task.id: task for task in managing_contest.get_tasks()}
+
         for training_day in training_program.training_days:
             td_contest = training_day.contest
 
             if td_contest is None:
                 past_trainings.append(self._build_past_training_info(
-                    training_day, student, participation, archived_rankings_map
+                    training_day, student, participation, archived_rankings_map,
+                    task_by_id
                 ))
                 continue
 
@@ -282,6 +312,9 @@ def get(self):
                 "can_enter_soon": can_enter_soon,
             })
 
+        # Commit to release advisory locks from cache rebuilds in _build_past_training_info
+        self.sql_session.commit()
+
         ongoing_upcoming_trainings.sort(key=lambda x: x["user_start_time"])
         past_trainings.sort(
             key=lambda x: x["start_time"] if x["start_time"] else self.timestamp,
@@ -301,9 +334,14 @@ def _build_past_training_info(
         training_day,
         student: Student | None,
         participation: Participation,
-        archived_rankings_map: dict
+        archived_rankings_map: dict,
+        task_by_id: dict[int, Task],
     ) -> dict:
-        """Build info dict for a past (archived) training day."""
+        """Build info dict for a past (archived) training day.
+
+        task_by_id: mapping of task_id -> Task for tasks in the managing contest.
+                    Used to get fresh home scores via get_cached_score_entry.
+        """
         training_score = 0.0
         home_score = 0.0
         max_score = 0.0
@@ -318,10 +356,6 @@ def _build_past_training_info(
             if archived_ranking and archived_ranking.task_scores:
                 archived_task_scores = archived_ranking.task_scores
 
-            cached_scores = {}
-            for pts in participation.task_scores:
-                cached_scores[pts.task_id] = pts.score
-
             for task_id_str, task_data in archived_tasks_data.items():
                 task_max_score = task_data.get("max_score", 100.0)
                 max_score += task_max_score
@@ -330,7 +364,16 @@ def _build_past_training_info(
                 training_score += task_training_score
 
                 task_id = int(task_id_str)
-                task_home_score = cached_scores.get(task_id, 0.0)
+                # Get fresh home score using get_cached_score_entry if task exists
+                task = task_by_id.get(task_id)
+                if task is not None:
+                    cache_entry = get_cached_score_entry(
+                        self.sql_session, participation, task
+                    )
+                    task_home_score = cache_entry.score
+                else:
+                    # Task no longer exists in managing contest
+                    task_home_score = 0.0
                 home_score += task_home_score
 
                 tasks_info.append({
diff --git a/cms/server/contest/templates/training_program_overview.html b/cms/server/contest/templates/training_program_overview.html
index 1384f5eded..72994787a6 100644
--- a/cms/server/contest/templates/training_program_overview.html
+++ b/cms/server/contest/templates/training_program_overview.html
@@ -124,17 +124,21 @@ <h2 style="margin-bottom: 15px;">{% trans %}Statistics{% endtrans %}</h2>
 </div>
 
 <div style="display: flex; gap: 15px; margin-bottom: 20px; flex-wrap: wrap;">
-    <div style="flex: 1; background: #e8f5e9; border: 2px solid #28a745; border-radius: 8px; padding: 15px; text-align: center; flex: 1; min-width: 120px;">
+    <div style="flex: 1; background: #e8f5e9; border: 2px solid #28a745; border-radius: 8px; padding: 15px; text-align: center; min-width: 100px;">
         <div style="font-size: 36px; font-weight: 800; color: #28a745; line-height: 1;" id="solved-count">0</div>
         <div style="font-size: 11px; text-transform: uppercase; letter-spacing: 1px; color: #2e7d32; margin-top: 5px; opacity: 0.8;">{% trans %}Solved{% endtrans %}</div>
     </div>
-    <div style="flex: 1; background: #fff8e1; border: 2px solid #ffc107; border-radius: 8px; padding: 15px; text-align: center; flex: 1; min-width: 120px;">
+    <div style="flex: 1; background: #fff8e1; border: 2px solid #ffc107; border-radius: 8px; padding: 15px; text-align: center; min-width: 100px;">
         <div style="font-size: 36px; font-weight: 800; color: #f57c00; line-height: 1;" id="partial-count">0</div>
         <div style="font-size: 11px; text-transform: uppercase; letter-spacing: 1px; color: #ef6c00; margin-top: 5px; opacity: 0.8;">{% trans %}Partial{% endtrans %}</div>
     </div>
-    <div style="flex: 1; background: #ffebee; border: 2px solid #dc3545; border-radius: 8px; padding: 15px; text-align: center; flex: 1; min-width: 120px;">
-        <div style="font-size: 36px; font-weight: 800; color: #dc3545; line-height: 1;" id="unsolved-count">0</div>
-        <div style="font-size: 11px; text-transform: uppercase; letter-spacing: 1px; color: #c62828; margin-top: 5px; opacity: 0.8;">{% trans %}Not Solved{% endtrans %}</div>
+    <div style="flex: 1; background: #e3f2fd; border: 2px solid #2196f3; border-radius: 8px; padding: 15px; text-align: center; min-width: 100px;">
+        <div style="font-size: 36px; font-weight: 800; color: #1976d2; line-height: 1;" id="attempted-count">0</div>
+        <div style="font-size: 11px; text-transform: uppercase; letter-spacing: 1px; color: #1565c0; margin-top: 5px; opacity: 0.8;">{% trans %}Attempted{% endtrans %}</div>
+    </div>
+    <div style="flex: 1; background: #f5f5f5; border: 2px solid #616161; border-radius: 8px; padding: 15px; text-align: center; min-width: 100px;">
+        <div style="font-size: 36px; font-weight: 800; color: #616161; line-height: 1;" id="not-attempted-count">0</div>
+        <div style="font-size: 11px; text-transform: uppercase; letter-spacing: 1px; color: #424242; margin-top: 5px; opacity: 0.8;">{% trans %}Not Attempted{% endtrans %}</div>
     </div>
 </div>
 
@@ -149,7 +153,8 @@ <h2 style="margin-bottom: 15px;">{% trans %}Task Archive{% endtrans %}</h2>
     <button class="btn btn-small filter-btn active" data-filter="all" onclick="filterTasks('all')">{% trans %}All{% endtrans %}</button>
     <button class="btn btn-small btn-success filter-btn" data-filter="solved" onclick="filterTasks('solved')">{% trans %}Solved{% endtrans %}</button>
     <button class="btn btn-small btn-warning filter-btn" data-filter="partial" onclick="filterTasks('partial')">{% trans %}Partial{% endtrans %}</button>
-    <button class="btn btn-small btn-danger filter-btn" data-filter="unsolved" onclick="filterTasks('unsolved')">{% trans %}Not Solved{% endtrans %}</button>
+    <button class="btn btn-small btn-info filter-btn" data-filter="attempted" onclick="filterTasks('attempted')">{% trans %}Attempted{% endtrans %}</button>
+    <button class="btn btn-small filter-btn" data-filter="not-attempted" onclick="filterTasks('not-attempted')" style="background-color: #616161; color: white; background-image: none; text-shadow: none;">{% trans %}Not Attempted{% endtrans %}</button>
 </div>
 
 <table class="table table-bordered table-striped" id="task-table">
@@ -166,7 +171,7 @@ <h2 style="margin-bottom: 15px;">{% trans %}Task Archive{% endtrans %}</h2>
     </thead>
     <tbody>
 {% for ts in task_scores %}
-        <tr data-status="{% if ts.score >= ts.max_score %}solved{% elif ts.score > 0 %}partial{% else %}unsolved{% endif %}" data-score="{{ ts.score }}" data-assigned="{{ ts.assigned_at.timestamp() if ts.assigned_at else 0 }}" data-source="{{ ts.source_training_day.name if ts.source_training_day else '' }}">
+        <tr data-status="{% if ts.score >= ts.max_score %}solved{% elif ts.score > 0 %}partial{% elif ts.submission_count > 0 %}attempted{% else %}not-attempted{% endif %}" data-score="{{ ts.score }}" data-assigned="{{ ts.assigned_at.timestamp() if ts.assigned_at else 0 }}" data-source="{{ ts.source_training_day.name if ts.source_training_day else '' }}" data-submissions="{{ ts.submission_count }}">
             <td><a href="{{ contest_url("tasks", ts.task.name, "description") }}" style="font-weight: bold;">{{ ts.task.name }}</a></td>
             <td>{{ ts.task.title }}</td>
             <td>
@@ -181,8 +186,10 @@ <h2 style="margin-bottom: 15px;">{% trans %}Task Archive{% endtrans %}</h2>
                 <span class="label label-success" style="font-size: 12px;">{% trans %}Solved{% endtrans %}</span>
     {% elif ts.score > 0 %}
                 <span class="label label-warning" style="font-size: 12px;">{% trans %}Partial{% endtrans %}</span>
+    {% elif ts.submission_count > 0 %}
+                <span class="label label-info" style="font-size: 12px;">{% trans %}Attempted{% endtrans %}</span>
     {% else %}
-                <span class="label label-important" style="font-size: 12px;">{% trans %}Not Solved{% endtrans %}</span>
+                <span class="label" style="font-size: 12px; background-color: #9e9e9e;">{% trans %}Not Attempted{% endtrans %}</span>
     {% endif %}
             </td>
             <td>
@@ -301,20 +308,23 @@ <h2 style="margin-bottom: 15px;">{% trans %}Task Archive{% endtrans %}</h2>
 
 <script>
 (function() {
-    var solvedCount = 0, partialCount = 0, unsolvedCount = 0;
+    var solvedCount = 0, partialCount = 0, attemptedCount = 0, notAttemptedCount = 0;
     var rows = document.querySelectorAll('#task-table tbody tr');
     rows.forEach(function(row) {
         var status = row.getAttribute('data-status');
         if (status === 'solved') solvedCount++;
         else if (status === 'partial') partialCount++;
-        else unsolvedCount++;
+        else if (status === 'attempted') attemptedCount++;
+        else notAttemptedCount++;
     });
     var solvedEl = document.getElementById('solved-count');
     if (solvedEl) solvedEl.textContent = solvedCount;
     var partialEl = document.getElementById('partial-count');
     if (partialEl) partialEl.textContent = partialCount;
-    var unsolvedEl = document.getElementById('unsolved-count');
-    if (unsolvedEl) unsolvedEl.textContent = unsolvedCount;
+    var attemptedEl = document.getElementById('attempted-count');
+    if (attemptedEl) attemptedEl.textContent = attemptedCount;
+    var notAttemptedEl = document.getElementById('not-attempted-count');
+    if (notAttemptedEl) notAttemptedEl.textContent = notAttemptedCount;
 })();
 
 // Server timestamp for timezone-correct countdown
diff --git a/cms/server/util.py b/cms/server/util.py
index d3b2d45e49..12362f6fb2 100644
--- a/cms/server/util.py
+++ b/cms/server/util.py
@@ -42,7 +42,9 @@
 
 from tornado.web import RequestHandler
 
-from cms.db import Session, Contest, Student, Task, Participation
+from cms.db import Session, Contest, Student, Task, Participation, StudentTask
+from sqlalchemy.orm import joinedload
+from cms.grading.scorecache import get_cached_score_entry
 from cms.server.file_middleware import FileServerMiddleware
 from cmscommon.datetime import make_datetime
 
@@ -238,11 +240,45 @@ def can_access_task(sql_session: Session, task: "Task", participation: "Particip
     return bool(student_tags_set & task_tags_set)
 
 
+def get_student_archive_scores(
+    sql_session: Session,
+    student: "Student",
+    participation: "Participation",
+    contest: "Contest",
+) -> dict[int, float]:
+    """Get fresh task scores for all tasks in a student's archive.
+    This utility uses get_cached_score_entry to ensure scores are fresh
+    and not stale. It returns a mapping of task_id -> score for all tasks
+    that are both in the student's archive AND currently exist in the contest.
+    IMPORTANT: This function may trigger cache rebuilds which acquire advisory
+    locks. The caller MUST commit the session after calling this function to
+    release the locks and persist any cache updates.
+    sql_session: the database session.
+    student: the Student object (with student_tasks relationship).
+    participation: the Participation object for the managing contest.
+    contest: the Contest object (managing contest for the training program).
+    return: dict mapping task_id -> score for tasks in the student's archive.
+    """
+
+    student_task_ids = {st.task_id for st in student.student_tasks}
+    scores = {}
+
+    for task in contest.get_tasks():
+        if task.id not in student_task_ids:
+            continue
+        cache_entry = get_cached_score_entry(sql_session, participation, task)
+        scores[task.id] = cache_entry.score
+
+    return scores
+
+
 def calculate_task_archive_progress(
     student: "Student",
     participation: "Participation",
     contest: "Contest",
-    include_task_details: bool = False
+    sql_session: Session,
+    include_task_details: bool = False,
+    submission_counts: dict[int, int] | None = None,
 ) -> dict:
     """Calculate task archive progress for a student.
 
@@ -250,47 +286,58 @@ def calculate_task_archive_progress(
     the contest training program overview page.
 
     student: the Student object (with student_tasks relationship).
-    participation: the Participation object (with task_scores relationship).
+    participation: the Participation object.
     contest: the Contest object (managing contest for the training program).
+    sql_session: SQLAlchemy session for using get_cached_score_entry.
     include_task_details: if True, include per-task breakdown in task_scores list.
+    submission_counts: optional dict mapping task_id to submission count.
+        If provided and include_task_details is True, each task will include
+        a submission_count field.
 
     return: dict with total_score, max_score, percentage, task_count.
             If include_task_details is True, also includes task_scores list.
 
     """
-    # Build maps for efficient lookup
-    student_tasks_map = {st.task_id: st for st in student.student_tasks}
-    student_task_ids = set(student_tasks_map.keys())
-
-    # Build a map of task_id -> cached score for this participation
-    cached_scores = {}
-    for pts in participation.task_scores:
-        cached_scores[pts.task_id] = pts.score
+    # Get the tasks in the student's archive
+    student_tasks = (
+        sql_session.query(StudentTask)
+        .options(joinedload(StudentTask.task))
+        .filter(StudentTask.student_id == student.id)
+        .all()
+    )
+    cached_scores = get_student_archive_scores(
+        sql_session, student, participation, contest
+    )
 
     total_score = 0.0
     max_score = 0.0
     task_count = 0
     task_scores = [] if include_task_details else None
 
-    for task in contest.get_tasks():
-        if task.id not in student_task_ids:
+    contest_tasks = contest.get_tasks()
+    # Iterate only over tasks in the student's archive (StudentTask entries)
+    for student_task in student_tasks:
+        task = student_task.task
+        if task is None or task not in contest_tasks:
             continue
         task_count += 1
         max_task_score = task.active_dataset.score_type_object.max_score \
             if task.active_dataset else 100.0
         max_score += max_task_score
-        best_score = cached_scores.get(task.id, 0.0)
+        best_score = cached_scores[task.id]
         total_score += best_score
 
         if include_task_details:
-            student_task = student_tasks_map.get(task.id)
-            task_scores.append({
+            task_info = {
                 "task": task,
                 "score": best_score,
                 "max_score": max_task_score,
-                "source_training_day": student_task.source_training_day if student_task else None,
-                "assigned_at": student_task.assigned_at if student_task else None,
-            })
+                "source_training_day": student_task.source_training_day,
+                "assigned_at": student_task.assigned_at,
+            }
+            if submission_counts is not None:
+                task_info["submission_count"] = submission_counts.get(task.id, 0)
+            task_scores.append(task_info)
 
     percentage = (total_score / max_score * 100) if max_score > 0 else 0.0
 
@@ -550,3 +597,25 @@ def parse_tags(tags_str: str) -> list[str]:
 
     tags = [tag.strip().lower() for tag in tags_str.split(",") if tag.strip()]
     return deduplicate_preserving_order(tags)
+
+
+def parse_usernames_from_file(file_content: str) -> list[str]:
+    """Parse whitespace-separated usernames from file content.
+
+    This utility handles:
+    - Splitting by whitespace (spaces, newlines, tabs)
+    - Stripping whitespace from each username
+    - Removing empty entries
+    - Deduplicating while preserving order
+
+    Args:
+        file_content: String content of the uploaded file
+
+    Returns:
+        List of unique usernames in order of first appearance
+    """
+    if not file_content:
+        return []
+
+    usernames = [u.strip() for u in file_content.split() if u.strip()]
+    return deduplicate_preserving_order(usernames)