diff --git a/cms/server/admin/handlers/__init__.py b/cms/server/admin/handlers/__init__.py
index 833c8f9dc8..d371dfea26 100644
--- a/cms/server/admin/handlers/__init__.py
+++ b/cms/server/admin/handlers/__init__.py
@@ -189,7 +189,9 @@
     TrainingProgramAttendanceHandler, \
     TrainingProgramCombinedRankingHandler, \
     TrainingProgramCombinedRankingHistoryHandler, \
-    TrainingProgramCombinedRankingDetailHandler
+    TrainingProgramCombinedRankingDetailHandler, \
+    TrainingProgramOverviewRedirectHandler, \
+    TrainingProgramResourcesListRedirectHandler
 
 
 HANDLERS = [
@@ -366,6 +368,8 @@
     (r"/training_program/([0-9]+)/combined_ranking", TrainingProgramCombinedRankingHandler),
     (r"/training_program/([0-9]+)/combined_ranking/history", TrainingProgramCombinedRankingHistoryHandler),
     (r"/training_program/([0-9]+)/student/([0-9]+)/combined_ranking_detail", TrainingProgramCombinedRankingDetailHandler),
+    (r"/training_program/([0-9]+)/overview", TrainingProgramOverviewRedirectHandler),
+    (r"/training_program/([0-9]+)/resourceslist", TrainingProgramResourcesListRedirectHandler),
 
     # Training day groups (main groups configuration on contest page)
     (r"/contest/([0-9]+)/training_day_group/add", AddTrainingDayGroupHandler),
diff --git a/cms/server/admin/handlers/base.py b/cms/server/admin/handlers/base.py
index a9ce94c3a7..9b71563d26 100644
--- a/cms/server/admin/handlers/base.py
+++ b/cms/server/admin/handlers/base.py
@@ -329,13 +329,16 @@ def prepare(self):
             contest_id = match.group(1)
             remaining_path = match.group(2) or ""
 
-            # Don't redirect question/announcement/message actions - they should use
-            # the contest handlers directly since questions/announcements
-            # belong to the managing contest, and messages use the contest user
+            # Don't redirect certain actions - they should use the contest handlers
+            # directly since questions/announcements belong to the managing contest,
+            # messages use the contest user, and overview/resourceslist are contest-
+            # specific pages that training programs redirect to
             if (
                 remaining_path.startswith("/question/")
                 or remaining_path.startswith("/announcement/")
                 or remaining_path.endswith("/message")
+                or remaining_path == "/overview"
+                or remaining_path == "/resourceslist"
             ):
                 return
 
diff --git a/cms/server/admin/handlers/contesttask.py b/cms/server/admin/handlers/contesttask.py
index 110b4759b7..f7199e1b3c 100644
--- a/cms/server/admin/handlers/contesttask.py
+++ b/cms/server/admin/handlers/contesttask.py
@@ -52,15 +52,28 @@ def get(self, contest_id):
         self.r_params["is_training_day"] = training_day is not None
 
         if training_day is not None:
-            # For training days, show tasks from the training program's
-            # managing contest that are not already assigned to any training day
+            # For training days, show all tasks that are not already assigned
+            # to any training day. Tasks in the training program are shown first,
+            # followed by tasks not in the training program.
             training_program = training_day.training_program
-            self.r_params["unassigned_tasks"] = \
-                self.sql_session.query(Task)\
-                    .filter(Task.contest_id == training_program.managing_contest_id)\
-                    .filter(Task.training_day_id.is_(None))\
-                    .order_by(Task.num)\
-                    .all()
+
+            # Tasks in the training program (not assigned to any training day)
+            program_tasks = self.sql_session.query(Task)\
+                .filter(Task.contest_id == training_program.managing_contest_id)\
+                .filter(Task.training_day_id.is_(None))\
+                .order_by(Task.num)\
+                .all()
+
+            # All other tasks (not in any contest or training day)
+            other_tasks = self.sql_session.query(Task)\
+                .filter(Task.contest_id.is_(None))\
+                .filter(Task.training_day_id.is_(None))\
+                .order_by(Task.name)\
+                .all()
+
+            self.r_params["unassigned_tasks"] = program_tasks + other_tasks
+            # Track which task IDs are in the training program for the template
+            self.r_params["program_task_ids"] = [t.id for t in program_tasks]
 
             # Get all student tags for autocomplete (for task visibility tags)
             self.r_params["all_student_tags"] = get_all_student_tags(training_program)
@@ -282,6 +295,15 @@ def post(self, contest_id):
         task = self.safe_get_item(Task, task_id)
 
         if training_day is not None:
+            training_program = training_day.training_program
+
+            # Check if task is not in the training program
+            if task.contest_id != training_program.managing_contest_id:
+                # Add the task to the training program's managing contest first
+                managing_contest = training_program.managing_contest
+                task.num = len(managing_contest.tasks)
+                task.contest = managing_contest
+
             # Assign the task to the training day.
             # Task keeps its contest_id (managing contest) and gets training_day_id set.
             # Use training_day_num for ordering within the training day.
diff --git a/cms/server/admin/handlers/task.py b/cms/server/admin/handlers/task.py
index 6882f34f6a..f7fdb6380e 100644
--- a/cms/server/admin/handlers/task.py
+++ b/cms/server/admin/handlers/task.py
@@ -112,7 +112,12 @@ class TaskHandler(BaseHandler):
     @require_permission(BaseHandler.AUTHENTICATED)
     def get(self, task_id):
         task = self.safe_get_item(Task, task_id)
-        self.contest = task.contest
+        # If the task is assigned to an active training day (not archived),
+        # show the training day's contest sidebar instead of the training program sidebar
+        if task.training_day is not None and task.training_day.contest is not None:
+            self.contest = task.training_day.contest
+        else:
+            self.contest = task.contest
 
         self.r_params = self.render_params()
         self.r_params["task"] = task
diff --git a/cms/server/admin/handlers/trainingprogram.py b/cms/server/admin/handlers/trainingprogram.py
index e8a5fd3942..a86c445c3a 100644
--- a/cms/server/admin/handlers/trainingprogram.py
+++ b/cms/server/admin/handlers/trainingprogram.py
@@ -107,8 +107,10 @@ def get(self, training_program_id: str):
     def post(self, training_program_id: str):
         fallback = self.url("training_program", training_program_id)
         training_program = self.safe_get_item(TrainingProgram, training_program_id)
+        contest = training_program.managing_contest
 
         try:
+            # Update training program attributes
             attrs = training_program.get_attrs()
             self.get_string(attrs, "name")
             self.get_string(attrs, "description")
@@ -122,28 +124,72 @@ def post(self, training_program_id: str):
             training_program.set_attrs(attrs)
 
             # Sync description to managing contest
-            training_program.managing_contest.description = attrs["description"]
-
-            # Parse and update start/stop times on managing contest
-            start_str = self.get_argument("start", "")
-            stop_str = self.get_argument("stop", "")
-
-            if start_str:
-                training_program.managing_contest.start = dt.strptime(
-                    start_str, "%Y-%m-%dT%H:%M"
-                )
-
-            if stop_str:
-                training_program.managing_contest.stop = dt.strptime(
-                    stop_str, "%Y-%m-%dT%H:%M"
-                )
+            contest.description = attrs["description"]
+
+            # Update managing contest configuration fields
+            contest_attrs = contest.get_attrs()
+
+            # Allowed localizations (comma-separated list)
+            allowed_localizations: str = self.get_argument("allowed_localizations", "")
+            if allowed_localizations:
+                contest_attrs["allowed_localizations"] = [
+                    x.strip()
+                    for x in allowed_localizations.split(",")
+                    if len(x) > 0 and not x.isspace()
+                ]
+            else:
+                contest_attrs["allowed_localizations"] = []
+
+            # Programming languages
+            contest_attrs["languages"] = self.get_arguments("languages")
+
+            # Boolean settings
+            self.get_bool(contest_attrs, "submissions_download_allowed")
+            self.get_bool(contest_attrs, "allow_questions")
+            self.get_bool(contest_attrs, "allow_user_tests")
+            self.get_bool(contest_attrs, "allow_unofficial_submission_before_analysis_mode")
+            self.get_bool(contest_attrs, "allow_delay_requests")
+
+            # Login section boolean settings
+            self.get_bool(contest_attrs, "block_hidden_participations")
+            self.get_bool(contest_attrs, "allow_password_authentication")
+            self.get_bool(contest_attrs, "allow_registration")
+            self.get_bool(contest_attrs, "ip_restriction")
+            self.get_bool(contest_attrs, "ip_autologin")
+
+            # Score precision
+            self.get_int(contest_attrs, "score_precision")
+
+            # Times
+            self.get_datetime(contest_attrs, "start")
+            self.get_datetime(contest_attrs, "stop")
+            self.get_string(contest_attrs, "timezone", empty=None)
+            self.get_timedelta_sec(contest_attrs, "per_user_time")
+
+            # Limits
+            self.get_int(contest_attrs, "max_submission_number")
+            self.get_int(contest_attrs, "max_user_test_number")
+            self.get_timedelta_sec(contest_attrs, "min_submission_interval")
+            self.get_timedelta_sec(contest_attrs, "min_submission_interval_grace_period")
+            self.get_timedelta_sec(contest_attrs, "min_user_test_interval")
+
+            # Token parameters
+            self.get_string(contest_attrs, "token_mode")
+            self.get_int(contest_attrs, "token_max_number")
+            self.get_timedelta_sec(contest_attrs, "token_min_interval")
+            self.get_int(contest_attrs, "token_gen_initial")
+            self.get_int(contest_attrs, "token_gen_number")
+            self.get_timedelta_min(contest_attrs, "token_gen_interval")
+            self.get_int(contest_attrs, "token_gen_max")
+
+            # Apply contest attributes
+            contest.set_attrs(contest_attrs)
 
             # Validate that stop is not before start (only if both are set)
             if (
-                training_program.managing_contest.start is not None
-                and training_program.managing_contest.stop is not None
-                and training_program.managing_contest.stop
-                < training_program.managing_contest.start
+                contest.start is not None
+                and contest.stop is not None
+                and contest.stop < contest.start
             ):
                 raise ValueError("End time must be after start time")
 
@@ -154,7 +200,9 @@ def post(self, training_program_id: str):
             self.redirect(fallback)
             return
 
-        self.try_commit()
+        if self.try_commit():
+            # Update the contest on RWS.
+            self.service.proxy_service.reinitialize()
         self.redirect(fallback)
 
 
@@ -440,7 +488,7 @@ def post(self, training_program_id: str):
 
         try:
             user_id: str = self.get_argument("user_id")
-            assert user_id != "null", "Please select a valid user"
+            assert user_id != "", "Please select a valid user"
         except Exception as error:
             self.service.add_notification(
                 make_datetime(), "Invalid field(s)", repr(error))
@@ -449,7 +497,13 @@ def post(self, training_program_id: str):
 
         user = self.safe_get_item(User, user_id)
 
-        participation = Participation(contest=managing_contest, user=user)
+        # Set starting_time to now so the student can see everything immediately
+        # (training programs don't have a start button)
+        participation = Participation(
+            contest=managing_contest,
+            user=user,
+            starting_time=make_datetime()
+        )
         self.sql_session.add(participation)
         self.sql_session.flush()
 
@@ -1841,7 +1895,7 @@ def post(self, training_program_id: str, user_id: str):
 
         try:
             task_id = self.get_argument("task_id")
-            if task_id == "null":
+            if task_id in ("", "null"):
                 raise ValueError("Please select a task")
 
             task = self.safe_get_item(Task, task_id)
@@ -1973,7 +2027,7 @@ def post(self, training_program_id: str):
 
         try:
             task_id = self.get_argument("task_id")
-            if task_id == "null":
+            if task_id in ("", "null"):
                 raise ValueError("Please select a task")
 
             tag_name = self.get_argument("tag", "").strip().lower()
@@ -2812,3 +2866,25 @@ def get_training_day_num(task_id: int) -> tuple[int, int]:
             .filter(Question.ignored.is_(False))\
             .count()
         self.render("training_program_combined_ranking_detail.html", **self.r_params)
+
+
+class TrainingProgramOverviewRedirectHandler(BaseHandler):
+    """Redirect /training_program/{id}/overview to the managing contest's overview page."""
+
+    @require_permission(BaseHandler.AUTHENTICATED)
+    def get(self, training_program_id: str):
+        training_program = self.safe_get_item(TrainingProgram, training_program_id)
+        self.redirect(
+            self.url("contest", training_program.managing_contest.id, "overview")
+        )
+
+
+class TrainingProgramResourcesListRedirectHandler(BaseHandler):
+    """Redirect /training_program/{id}/resourceslist to the managing contest's resourceslist page."""
+
+    @require_permission(BaseHandler.AUTHENTICATED)
+    def get(self, training_program_id: str):
+        training_program = self.safe_get_item(TrainingProgram, training_program_id)
+        self.redirect(
+            self.url("contest", training_program.managing_contest.id, "resourceslist")
+        )
diff --git a/cms/server/admin/handlers/user.py b/cms/server/admin/handlers/user.py
index ff9617bff6..fb50f1bd9f 100644
--- a/cms/server/admin/handlers/user.py
+++ b/cms/server/admin/handlers/user.py
@@ -32,7 +32,7 @@
 import re
 
 from sqlalchemy import and_, exists
-from cms.db import Contest, Participation, Submission, Team, User
+from cms.db import Contest, Participation, Submission, Team, User, TrainingDay, TrainingProgram
 from cms.server.util import exclude_internal_contests
 from cmscommon.crypto import (parse_authentication,
                                hash_password, validate_password_strength)
@@ -48,10 +48,35 @@ def get(self, user_id):
 
         self.r_params = self.render_params()
         self.r_params["user"] = user
-        self.r_params["participations"] = \
-            self.sql_session.query(Participation)\
-                .filter(Participation.user == user)\
-                .all()
+
+        # Get all participations and separate them into categories
+        all_participations = self.sql_session.query(Participation)\
+            .filter(Participation.user == user)\
+            .all()
+
+        # Separate participations into:
+        # 1. Training program participations (managing contest)
+        # 2. Training day participations (hidden from list)
+        # 3. Regular contest participations
+        training_program_participations = []
+        regular_participations = []
+
+        for p in all_participations:
+            # Check if this is a training program's managing contest
+            if p.contest.training_program is not None:
+                training_program_participations.append(p)
+            # Check if this is a training day contest (hide from list)
+            elif p.contest.training_day is not None:
+                # Skip training day participations - they're managed via training program
+                pass
+            else:
+                regular_participations.append(p)
+
+        self.r_params["participations"] = regular_participations
+        self.r_params["training_program_participations"] = training_program_participations
+
+        # Filter out training day contests and managing contests from unassigned list
+        # (users should be added to training programs via the training program UI)
         self.r_params["unassigned_contests"] = exclude_internal_contests(
             self.sql_session.query(Contest).filter(
                 ~exists().where(
@@ -60,6 +85,12 @@ def get(self, user_id):
                         Participation.user == user
                     )
                 )
+            ).filter(
+                # Exclude training day contests
+                ~exists().where(TrainingDay.contest_id == Contest.id)
+            ).filter(
+                # Exclude managing contests (training program contests)
+                ~exists().where(TrainingProgram.managing_contest_id == Contest.id)
             )
         ).all()
         self.render("user.html", **self.r_params)
diff --git a/cms/server/admin/templates/base.html b/cms/server/admin/templates/base.html
index 5dfe0c22bd..55500200a4 100644
--- a/cms/server/admin/templates/base.html
+++ b/cms/server/admin/templates/base.html
@@ -6,7 +6,7 @@
     // Pre-paint CSS injection to prevent flash of expanded menus
     // Uses a hydration class on <html> so these rules only apply during initial render
     (function() {
-      var validSectionKeys = ['training-programs', 'contests', 'tasks', 'users', 'teams'];
+      var validSectionKeys = ['training-programs', 'contests', 'tasks', 'users', 'teams', 'training-days'];
       var folderKeyPattern = /^(folder|subfolder|training-program)-\d+$/;
       var css = '';
 
@@ -284,9 +284,12 @@ <h1 class="sidebar-title"><a href="{{ url() }}">Administration</a></h1>
         </div>
         {% endif %}
         <ul class="menu">
-        {% if contest is none or training_program is defined %}
+        {% if contest is none and training_program is not defined %}
           <li class="menu_entry"><a class="menu_link" href="{{ url() }}">Overview</a></li>
           <li class="menu_entry"><a class="menu_link" href="{{ url("resourceslist") }}">Resource usage</a></li>
+        {% elif training_program is defined %}
+          <li class="menu_entry"><a class="menu_link" href="{{ url("contest", training_program.managing_contest.id, "overview") }}">Overview</a></li>
+          <li class="menu_entry"><a class="menu_link" href="{{ url("contest", training_program.managing_contest.id, "resourceslist") }}">Resource usage</a></li>
         {% else %}
           <li class="menu_entry"><a class="menu_link" href="{{ url("contest", contest.id, "overview") }}">Overview</a></li>
           <li class="menu_entry"><a class="menu_link" href="{{ url("contest", contest.id, "resourceslist") }}">Resource usage</a></li>
@@ -478,7 +481,6 @@ <h2 class="sidebar-section-title">
             <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>
-            <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "training_days") }}">Training Days</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "attendance") }}">Attendance</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "combined_ranking") }}">Combined Ranking</a></li>
             <li class="menu_entry"><a class="menu_link" href="{{ url("training_program", training_program.id, "announcements") }}">Announcements</a></li>
@@ -491,6 +493,31 @@ <h2 class="sidebar-section-title">
             </li>
           </ul>
           <div class="hr"></div>
+          <div class="sidebar-section" data-section-key="training-days">
+            <h2 class="sidebar-section-title">
+              <span class="section-caret"></span>
+              <a href="{{ url("training_program", training_program.id, "training_days") }}">Training Days</a>
+            </h2>
+            <div class="sidebar-section-body">
+              {% set active_training_days = training_program.training_days | selectattr("contest") | list %}
+              {% if active_training_days|length > 0 %}
+              <ul class="sidebar-menu">
+                {% for td in active_training_days %}
+                <li class="sidebar-contest">
+                  <a href="{{ url("contest", td.contest_id) }}" title="{{ td.contest.description }}">{{ td.contest.name }}</a>
+                </li>
+                {% endfor %}
+              </ul>
+              {% else %}
+              <p class="sidebar-empty">No active training days</p>
+              {% endif %}
+              {% if admin.permission_all %}
+              <div class="sidebar-actions">
+                <a class="sidebar-action-link" href="{{ url("training_program", training_program.id, "training_days", "add") }}">Add a training day</a>
+              </div>
+              {% endif %}
+            </div>
+          </div>
           <div class="footer">
             <span id="remaining_text"></span>
             <span id="remaining_value"></span>
diff --git a/cms/server/admin/templates/bulk_assign_task.html b/cms/server/admin/templates/bulk_assign_task.html
index 323a2dd6ab..0107b822b6 100644
--- a/cms/server/admin/templates/bulk_assign_task.html
+++ b/cms/server/admin/templates/bulk_assign_task.html
@@ -50,8 +50,8 @@ <h2 id="title_assign_task_to_group" class="toggling_on">Assign Task to a Group</
           Task
         </td>
         <td>
-          <select name="task_id">
-            <option value="null" selected>-- Select a task --</option>
+          <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 %}
diff --git a/cms/server/admin/templates/contest.html b/cms/server/admin/templates/contest.html
index 5d9c5eaf21..c69ed8c13c 100644
--- a/cms/server/admin/templates/contest.html
+++ b/cms/server/admin/templates/contest.html
@@ -14,323 +14,10 @@ <h1>Contest configuration</h1>
 <form enctype="multipart/form-data" action="{{ url("contest", contest.id) }}" method="POST" name="edit_contest" style="display:inline;">
   {{ xsrf_form_html|safe }}
   <table class="sub_table">
-    <tr><td colspan=2><h2>Contest information</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="A short name for the contest, preferably using only letters, numbers and underscores."></span>
-        Name
-      </td>
-      <td><input type="text" name="name" value="{{ contest.name }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The name of the contest as seen by the contestants."></span>
-        Description
-      </td>
-      <td><textarea name="description">{{ contest.description }}</textarea></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Folder that contains this contest. Leave as (root) for top-level."></span>
-        Folder
-      </td>
-      <td>
-        <select name="folder_id">
-          <option value="none">(root)</option>
-          {% for f in all_folders %}
-            <option value="{{ f.id }}" {{ 'selected' if contest.folder is not none and contest.folder.id == f.id else '' }}>{{ f.description }}</option>
-          {% endfor %}
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The list of languages that contestants can use, or empty for allowing any language.
-                                  Example: 'en,ja' (without quotes)."></span>
-        Allowed localizations
-      </td>
-      <td><input type="text" name="allowed_localizations" value="{{ contest.allowed_localizations|join(",") }}"/></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Programming languages that contestants can use to solve the tasks.
-                                  All the allowed languages must have task support, for example in managed tasks."></span>
-        Allowed programming languages
-      </td>
-      <td class="wrapping-options">
-        {% for lang in LANGUAGES %}
-          <label><input type="checkbox" name="languages" value="{{ lang.name }}" {{ "checked" if lang.name in contest.languages else "" }}>{{ lang.name }}</label>
-        {% endfor %}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Whether contestants can download their own submissions."></span>
-        <label for="submissions_download_allowed">Submissions download allowed</label>
-      </td>
-      <td>
-        <input type="checkbox" id="submissions_download_allowed" name="submissions_download_allowed" {{ "checked" if contest.submissions_download_allowed else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Whether contestants can submit questions."></span>
-        <label for="allow_questions">Allow questions</label>
-      </td>
-      <td>
-        <input type="checkbox" id="allow_questions" name="allow_questions" {{ "checked" if contest.allow_questions else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="If checked, contestants will be able to submit delay requests for this contest."></span>
-        <label for="allow_delay_requests">Allow delay requests</label>
-      </td>
-      <td>
-        <input type="checkbox" id="allow_delay_requests" name="allow_delay_requests" {{ "checked" if contest.allow_delay_requests else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Whether contestants can submit user tests."></span>
-        <label for="allow_user_tests">Allow user tests</label>
-      </td>
-      <td>
-        <input type="checkbox" id="allow_user_tests" name="allow_user_tests" {{ "checked" if contest.allow_user_tests else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The number of decimal places the scores will be rounded to.
-                                  Example: '2' to allow 98.76."></span>
-        Score decimal places
-      </td>
-      <td><input type="text" name="score_precision" value="{{ contest.score_precision }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Allow contestant to make unofficial submission before analysis mode"></span>
-        Allow unofficial submission before analysis mode
-      </td>
-      <td>
-        <input type="checkbox" id="allow_unofficial_submission_before_analysis_mode" name="allow_unofficial_submission_before_analysis_mode" {{ "checked" if contest.allow_unofficial_submission_before_analysis_mode else "" }}/>
-      </td>
-    </tr>
-
-    <tr><td colspan=2><h2>Logging in</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="If checked, contestants that are marked as hidden in this contest will not be able to log in."></span>
-        <label for="block_hidden_participations">Block hidden participations</label>
-      </td>
-      <td>
-        <input type="checkbox" id="block_hidden_participations" name="block_hidden_participations" {{ "checked" if contest.block_hidden_participations else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="If checked, contestants will be able to log in using username and password."></span>
-        <label for="allow_password_authentication">Allow password authentication</label>
-      </td>
-      <td>
-        <input type="checkbox" id="allow_password_authentication" name="allow_password_authentication" {{ "checked" if contest.allow_password_authentication else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="If checked, contestants will be able to autonomously create a user account and a participation in the contest."></span>
-        <label for="allow_registration">Allow registration</label>
-      </td>
-      <td>
-        <input type="checkbox" id="allow_registration" name="allow_registration" {{ "checked" if contest.allow_registration else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="If true, contestants with an IP address specified for this contest will only be able to log in from that address."></span>
-        <label for="ip_restriction">IP based login restriction</label>
-      </td>
-      <td>
-        <input type="checkbox" id="ip_restriction" name="ip_restriction" {{ "checked" if contest.ip_restriction else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="If true, contestants with an IP address specified for this contest will be automatically logged in when connecting from that address."></span>
-        <label for="ip_autologin">IP based autologin</label>
-      </td>
-      <td>
-        <input type="checkbox" id="ip_autologin" name="ip_autologin" {{ "checked" if contest.ip_autologin else "" }}/>
-      </td>
-    </tr>
-
-    <tr><td colspan=2><h2>Tokens parameters (<a href="http://cms.readthedocs.org/en/{{ rtd_version }}/Configuring%20a%20contest.html#feedback-to-contestants" target="_blank">documentation</a>)</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="Select 'disabled' to remove tokens completely, 'infinite' for allowing any number of tokens, or 'finite' to specify the amount with the following parameters.
-                                  If you prefer to control tokens at the task level, select 'infinite' here."></span>
-        Token mode
-      </td>
-      <td>
-        <select name="token_mode">
-          <option value="{{ TOKEN_MODE_DISABLED }}" {{ "selected" if contest.token_mode == TOKEN_MODE_DISABLED else "" }}>Disabled</option>
-          <option value="{{ TOKEN_MODE_FINITE }}" {{ "selected" if contest.token_mode == TOKEN_MODE_FINITE else "" }}>Finite</option>
-          <option value="{{ TOKEN_MODE_INFINITE }}" {{ "selected" if contest.token_mode == TOKEN_MODE_INFINITE else "" }}>Infinite</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The maximum number of tokens a contestant can use in the whole contest.
-                                  It is used only if tokens are finite."></span>
-        Maximum number of tokens
-      </td>
-      <td><input type="text" name="token_max_number" value="{{ contest.token_max_number if contest.token_max_number is not none else "" }}" size="3"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after using a token before being able to use another.
-                                  It is used only if tokens are finite."></span>
-        Minimum interval between tokens
-      </td>
-      <td><input type="text" name="token_min_interval" value="{{ contest.token_min_interval.total_seconds()|int }}" size="3"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The number of tokens that a contestant has available when their contest time starts.
-                                  It is used only if tokens are finite."></span>
-        Initial number of tokens
-      </td>
-      <td><input type="text" name="token_gen_initial" value="{{ contest.token_gen_initial }}" size="3"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The number of tokens that are generated periodically.
-                                  It is used only if tokens are finite."></span>
-        Token generation number
-      </td>
-      <td><input type="text" name="token_gen_number" value="{{ contest.token_gen_number }}" size="3"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The amount of time (in minutes) between two token generation events.
-                                  It is used only if tokens are finite."></span>
-        Token generation period
-      </td>
-      <td><input type="text" name="token_gen_interval" value="{{ contest.token_gen_interval.total_seconds()|int // 60 }}" size="3"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Maximum number of tokens available to a contestant at any given time during the contest.
-                                  It is used only if tokens are finite."></span>
-        Maximum accumulated tokens
-      </td>
-      <td><input type="text" name="token_gen_max" value="{{ contest.token_gen_max if contest.token_gen_max is not none else "" }}" size="3"></td>
-    </tr>
-
-    <tr><td colspan=2><h2>Times</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="Start time of the contest in the UTC timezone.
-                                  Example: '2015-12-31 15:00:00'."></span>
-        Start time (in UTC)
-      </td>
-      <td><input type="text" name="start" value="{{ contest.start }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="End time of the contest in the UTC timezone.
-                                  Example: '2015-12-31 18:00:00'."></span>
-        End time (in UTC)
-      </td>
-      <td><input type="text" name="stop" value="{{ contest.stop }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Timezone of the server, used to display start, end times and the current server time to contestants.
-                                  Example: 'Europe/Rome', 'America/New_York', ..."></span>
-        Timezone
-      </td>
-      <td><input type="text" name="timezone" value="{{ contest.timezone if contest.timezone is not none else "" }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Length of the contest (in seconds) for each contestant.
-                                  If not specified, each contestant can submit solutions for the whole duration of the contest.
-                                  If specified, only up to this length after the first log in (or up to the end of the contest, whichever comes first)."></span>
-        Length of the contest
-      </td>
-      <td><input type="text" name="per_user_time" value="{{ contest.per_user_time.total_seconds()|int if contest.per_user_time is not none else "" }}"></td>
-    </tr>
-
-    <tr><td colspan=2><h2>Limits</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="Maximum number of submissions each contestant can submit, for the whole contest.
-                                  Leave empty for no limits."></span>
-        Maximum number of submissions
-      </td>
-      <td><input type="text" name="max_submission_number" value="{{ contest.max_submission_number if contest.max_submission_number is not none else "" }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Maximum number of user tests each contestant can submit, for the whole contest.
-                                  Leave empty for no limits."></span>
-        Maximum number of user tests
-      </td>
-      <td><input type="text" name="max_user_test_number" value="{{ contest.max_user_test_number if contest.max_user_test_number is not none else "" }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after a submission before being able to submit another.
-                                  Leave empty for no limits."></span>
-        Minimum interval between submissions
-      </td>
-      <td><input type="text" name="min_submission_interval" value="{{ contest.min_submission_interval.total_seconds()|int if contest.min_submission_interval is not none else "" }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The amount of time (in seconds) until the end of participation in which the minimum interval between submissions is not enforced."></span>
-        Minimum submission interval grace period
-      </td>
-      <td><input type="text" name="min_submission_interval_grace_period" value="{{ contest.min_submission_interval_grace_period.total_seconds()|int if contest.min_submission_interval_grace_period is not none else "" }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after a user test before being able to send another.
-                                  Leave empty for no limits."></span>
-        Minimum interval between user tests
-      </td>
-      <td><input type="text" name="min_user_test_interval" value="{{ contest.min_user_test_interval.total_seconds()|int if contest.min_user_test_interval is not none else "" }}"></td>
-    </tr>
-    <tr><td colspan=2><h2>Analysis mode</h2></td></tr>
-    <tr>
-      <td>
-        <span class="info" title="If true, analysis mode for this contest will be enabled."></span>
-        Enabled
-      </td>
-      <td>
-        <input type="checkbox" id="analysis_enabled" name="analysis_enabled" {{ "checked" if contest.analysis_enabled else "" }}/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="Start time of the analysis mode in the UTC timezone.
-                                  Example: '2015-12-31 15:00:00'."></span>
-        Analysis mode start time (in UTC)
-      </td>
-      <td><input type="text" name="analysis_start" value="{{ contest.analysis_start }}"></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="End time of the analysis mode in the UTC timezone.
-                                  Example: '2015-12-31 18:00:00'."></span>
-        Analysis mode end time (in UTC)
-      </td>
-      <td><input type="text" name="analysis_stop" value="{{ contest.analysis_stop }}"></td>
-    </tr>
-
-    </table>
+    {% with show_folder=true, show_name=true, show_description=true, show_login_section=true, show_analysis_section=true %}
+      {% include "fragments/contest_config_fields.html" %}
+    {% endwith %}
+  </table>
   <input type="submit"
          value="Update"
 {% if not admin.permission_all %}
diff --git a/cms/server/admin/templates/contest_tasks.html b/cms/server/admin/templates/contest_tasks.html
index 34757f622c..382d6eabf3 100644
--- a/cms/server/admin/templates/contest_tasks.html
+++ b/cms/server/admin/templates/contest_tasks.html
@@ -12,6 +12,26 @@
     placeholder: 'All students',
     enforceWhitelist: true
 });
+
+// Confirmation for adding tasks not in the training program
+var programTaskIds = {{ program_task_ids | default([]) | tojson }};
+var addTaskForm = document.getElementById('add-task-form');
+if (addTaskForm) {
+    addTaskForm.addEventListener('submit', function(e) {
+        var select = this.querySelector('select[name="task_id"]');
+        var selectedTaskId = parseInt(select.value, 10);
+        if (selectedTaskId && !programTaskIds.includes(selectedTaskId)) {
+            var confirmed = confirm(
+                'This task is not in the training program. ' +
+                'Adding it to this training day will also add it to the training program. ' +
+                'Do you want to continue?'
+            );
+            if (!confirmed) {
+                e.preventDefault();
+            }
+        }
+    });
+}
 {% endif %}
 {% endblock js_init %}
 
@@ -28,14 +48,14 @@ <h1>Tasks list of <a href="{{ url("contest", contest.id) }}">{{ contest.name }}<
 <span style="color: red;">Warning: the contest is visible to contestants, tasks added can be seen</span>
 {% endif %}
 
-<form action="{{ url("contest", contest.id, "tasks", "add") }}" method="POST">
+<form id="add-task-form" action="{{ url("contest", contest.id, "tasks", "add") }}" method="POST">
   {{ xsrf_form_html|safe }}
-  Add a new task{% if is_training_day %} from training program{% endif %}:
+  Add a new task:
   <select name="task_id" class="searchable-select">
     <option value="" selected disabled hidden>Select a new task...</option>
     {% for t in unassigned_tasks %}
-    <option value="{{ t.id }}">
-      {{ t.name }}
+    <option value="{{ t.id }}"{% if is_training_day and program_task_ids is defined and t.id not in program_task_ids %} data-not-in-program="true"{% endif %}>
+      {{ t.name }}{% if is_training_day and program_task_ids is defined and t.id not in program_task_ids %} (not in training program){% endif %}
     </option>
     {% endfor %}
   </select>
diff --git a/cms/server/admin/templates/fragments/contest_config_fields.html b/cms/server/admin/templates/fragments/contest_config_fields.html
new file mode 100644
index 0000000000..ef71dad52e
--- /dev/null
+++ b/cms/server/admin/templates/fragments/contest_config_fields.html
@@ -0,0 +1,354 @@
+{# 
+  Contest configuration fields fragment.
+  
+  This fragment contains all the configuration fields for a contest.
+  It can be included in both contest.html and training_program.html.
+  
+  Required variables:
+  - contest: The contest object to configure
+  - LANGUAGES: List of available programming languages
+  - TOKEN_MODE_DISABLED, TOKEN_MODE_FINITE, TOKEN_MODE_INFINITE: Token mode constants
+  - admin: The admin user object (for permission checks)
+  - rtd_version: ReadTheDocs version for documentation links (optional)
+  
+  Optional variables:
+  - all_folders: List of contest folders (only used in contest.html, not training programs)
+  - show_folder: Whether to show the folder selection (default: false)
+  - show_name: Whether to show the name field (default: true)
+  - show_description: Whether to show the description field (default: true)
+  - show_login_section: Whether to show the "Logging in" section (default: true)
+  - show_analysis_section: Whether to show the "Analysis mode" section (default: true)
+#}
+
+{% set show_folder = show_folder|default(false) %}
+{% set show_name = show_name|default(true) %}
+{% set show_description = show_description|default(true) %}
+{% set show_login_section = show_login_section|default(true) %}
+{% set show_analysis_section = show_analysis_section|default(true) %}
+
+<tr><td colspan=2><h2>Contest information</h2></td></tr>
+{% if show_name %}
+<tr>
+  <td>
+    <span class="info" title="A short name for the contest, preferably using only letters, numbers and underscores."></span>
+    Name
+  </td>
+  <td><input type="text" name="name" value="{{ contest.name }}"></td>
+</tr>
+{% endif %}
+{% if show_description %}
+<tr>
+  <td>
+    <span class="info" title="The name of the contest as seen by the contestants."></span>
+    Description
+  </td>
+  <td><textarea name="description">{{ contest.description }}</textarea></td>
+</tr>
+{% endif %}
+{% if show_folder and all_folders is defined %}
+<tr>
+  <td>
+    <span class="info" title="Folder that contains this contest. Leave as (root) for top-level."></span>
+    Folder
+  </td>
+  <td>
+    <select name="folder_id">
+      <option value="none">(root)</option>
+      {% for f in all_folders %}
+        <option value="{{ f.id }}" {{ 'selected' if contest.folder is not none and contest.folder.id == f.id else '' }}>{{ f.description }}</option>
+      {% endfor %}
+    </select>
+  </td>
+</tr>
+{% endif %}
+<tr>
+  <td>
+    <span class="info" title="The list of languages that contestants can use, or empty for allowing any language.
+                              Example: 'en,ja' (without quotes)."></span>
+    Allowed localizations
+  </td>
+  <td><input type="text" name="allowed_localizations" value="{{ contest.allowed_localizations|join(",") }}"/></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Programming languages that contestants can use to solve the tasks.
+                              All the allowed languages must have task support, for example in managed tasks."></span>
+    Allowed programming languages
+  </td>
+  <td class="wrapping-options">
+    {% for lang in LANGUAGES %}
+      <label><input type="checkbox" name="languages" value="{{ lang.name }}" {{ "checked" if lang.name in contest.languages else "" }}>{{ lang.name }}</label>
+    {% endfor %}
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Whether contestants can download their own submissions."></span>
+    <label for="submissions_download_allowed">Submissions download allowed</label>
+  </td>
+  <td>
+    <input type="checkbox" id="submissions_download_allowed" name="submissions_download_allowed" {{ "checked" if contest.submissions_download_allowed else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Whether contestants can submit questions."></span>
+    <label for="allow_questions">Allow questions</label>
+  </td>
+  <td>
+    <input type="checkbox" id="allow_questions" name="allow_questions" {{ "checked" if contest.allow_questions else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="If checked, contestants will be able to submit delay requests for this contest."></span>
+    <label for="allow_delay_requests">Allow delay requests</label>
+  </td>
+  <td>
+    <input type="checkbox" id="allow_delay_requests" name="allow_delay_requests" {{ "checked" if contest.allow_delay_requests else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Whether contestants can submit user tests."></span>
+    <label for="allow_user_tests">Allow user tests</label>
+  </td>
+  <td>
+    <input type="checkbox" id="allow_user_tests" name="allow_user_tests" {{ "checked" if contest.allow_user_tests else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The number of decimal places the scores will be rounded to.
+                              Example: '2' to allow 98.76."></span>
+    Score decimal places
+  </td>
+  <td><input type="text" name="score_precision" value="{{ contest.score_precision }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Allow contestant to make unofficial submission before analysis mode"></span>
+    Allow unofficial submission before analysis mode
+  </td>
+  <td>
+    <input type="checkbox" id="allow_unofficial_submission_before_analysis_mode" name="allow_unofficial_submission_before_analysis_mode" {{ "checked" if contest.allow_unofficial_submission_before_analysis_mode else "" }}/>
+  </td>
+</tr>
+
+{% if show_login_section %}
+<tr><td colspan=2><h2>Logging in</h2></td></tr>
+<tr>
+  <td>
+    <span class="info" title="If checked, contestants that are marked as hidden in this contest will not be able to log in."></span>
+    <label for="block_hidden_participations">Block hidden participations</label>
+  </td>
+  <td>
+    <input type="checkbox" id="block_hidden_participations" name="block_hidden_participations" {{ "checked" if contest.block_hidden_participations else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="If checked, contestants will be able to log in using username and password."></span>
+    <label for="allow_password_authentication">Allow password authentication</label>
+  </td>
+  <td>
+    <input type="checkbox" id="allow_password_authentication" name="allow_password_authentication" {{ "checked" if contest.allow_password_authentication else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="If checked, contestants will be able to autonomously create a user account and a participation in the contest."></span>
+    <label for="allow_registration">Allow registration</label>
+  </td>
+  <td>
+    <input type="checkbox" id="allow_registration" name="allow_registration" {{ "checked" if contest.allow_registration else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="If true, contestants with an IP address specified for this contest will only be able to log in from that address."></span>
+    <label for="ip_restriction">IP based login restriction</label>
+  </td>
+  <td>
+    <input type="checkbox" id="ip_restriction" name="ip_restriction" {{ "checked" if contest.ip_restriction else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="If true, contestants with an IP address specified for this contest will be automatically logged in when connecting from that address."></span>
+    <label for="ip_autologin">IP based autologin</label>
+  </td>
+  <td>
+    <input type="checkbox" id="ip_autologin" name="ip_autologin" {{ "checked" if contest.ip_autologin else "" }}/>
+  </td>
+</tr>
+{% endif %}
+
+<tr><td colspan=2><h2>Tokens parameters{% if rtd_version is defined %} (<a href="https://cms.readthedocs.io/en/{{ rtd_version }}/Configuring%20a%20contest.html#feedback-to-contestants" target="_blank" rel="noopener noreferrer">documentation</a>){% endif %}</h2></td></tr>
+<tr>
+  <td>
+    <span class="info" title="Select 'disabled' to remove tokens completely, 'infinite' for allowing any number of tokens, or 'finite' to specify the amount with the following parameters.
+                              If you prefer to control tokens at the task level, select 'infinite' here."></span>
+    Token mode
+  </td>
+  <td>
+    <select name="token_mode">
+      <option value="{{ TOKEN_MODE_DISABLED }}" {{ "selected" if contest.token_mode == TOKEN_MODE_DISABLED else "" }}>Disabled</option>
+      <option value="{{ TOKEN_MODE_FINITE }}" {{ "selected" if contest.token_mode == TOKEN_MODE_FINITE else "" }}>Finite</option>
+      <option value="{{ TOKEN_MODE_INFINITE }}" {{ "selected" if contest.token_mode == TOKEN_MODE_INFINITE else "" }}>Infinite</option>
+    </select>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The maximum number of tokens a contestant can use in the whole contest.
+                              It is used only if tokens are finite."></span>
+    Maximum number of tokens
+  </td>
+  <td><input type="text" name="token_max_number" value="{{ contest.token_max_number if contest.token_max_number is not none else "" }}" size="3"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after using a token before being able to use another.
+                              It is used only if tokens are finite."></span>
+    Minimum interval between tokens
+  </td>
+  <td><input type="text" name="token_min_interval" value="{{ contest.token_min_interval.total_seconds()|int }}" size="3"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The number of tokens that a contestant has available when their contest time starts.
+                              It is used only if tokens are finite."></span>
+    Initial number of tokens
+  </td>
+  <td><input type="text" name="token_gen_initial" value="{{ contest.token_gen_initial }}" size="3"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The number of tokens that are generated periodically.
+                              It is used only if tokens are finite."></span>
+    Token generation number
+  </td>
+  <td><input type="text" name="token_gen_number" value="{{ contest.token_gen_number }}" size="3"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The amount of time (in minutes) between two token generation events.
+                              It is used only if tokens are finite."></span>
+    Token generation period
+  </td>
+  <td><input type="text" name="token_gen_interval" value="{{ contest.token_gen_interval.total_seconds()|int // 60 }}" size="3"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Maximum number of tokens available to a contestant at any given time during the contest.
+                              It is used only if tokens are finite."></span>
+    Maximum accumulated tokens
+  </td>
+  <td><input type="text" name="token_gen_max" value="{{ contest.token_gen_max if contest.token_gen_max is not none else "" }}" size="3"></td>
+</tr>
+
+<tr><td colspan=2><h2>Times</h2></td></tr>
+<tr>
+  <td>
+    <span class="info" title="Start time of the contest in the UTC timezone.
+                              Example: '2015-12-31 15:00:00'."></span>
+    Start time (in UTC)
+  </td>
+  <td><input type="text" name="start" value="{{ contest.start }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="End time of the contest in the UTC timezone.
+                              Example: '2015-12-31 18:00:00'."></span>
+    End time (in UTC)
+  </td>
+  <td><input type="text" name="stop" value="{{ contest.stop }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Timezone of the server, used to display start, end times and the current server time to contestants.
+                              Example: 'Europe/Rome', 'America/New_York', ..."></span>
+    Timezone
+  </td>
+  <td><input type="text" name="timezone" value="{{ contest.timezone if contest.timezone is not none else "" }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Length of the contest (in seconds) for each contestant.
+                              If not specified, each contestant can submit solutions for the whole duration of the contest.
+                              If specified, only up to this length after the first log in (or up to the end of the contest, whichever comes first)."></span>
+    Length of the contest
+  </td>
+  <td><input type="text" name="per_user_time" value="{{ contest.per_user_time.total_seconds()|int if contest.per_user_time is not none else "" }}"></td>
+</tr>
+
+<tr><td colspan=2><h2>Limits</h2></td></tr>
+<tr>
+  <td>
+    <span class="info" title="Maximum number of submissions each contestant can submit, for the whole contest.
+                              Leave empty for no limits."></span>
+    Maximum number of submissions
+  </td>
+  <td><input type="text" name="max_submission_number" value="{{ contest.max_submission_number if contest.max_submission_number is not none else "" }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Maximum number of user tests each contestant can submit, for the whole contest.
+                              Leave empty for no limits."></span>
+    Maximum number of user tests
+  </td>
+  <td><input type="text" name="max_user_test_number" value="{{ contest.max_user_test_number if contest.max_user_test_number is not none else "" }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after a submission before being able to submit another.
+                              Leave empty for no limits."></span>
+    Minimum interval between submissions
+  </td>
+  <td><input type="text" name="min_submission_interval" value="{{ contest.min_submission_interval.total_seconds()|int if contest.min_submission_interval is not none else "" }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The amount of time (in seconds) until the end of participation in which the minimum interval between submissions is not enforced."></span>
+    Minimum submission interval grace period
+  </td>
+  <td><input type="text" name="min_submission_interval_grace_period" value="{{ contest.min_submission_interval_grace_period.total_seconds()|int if contest.min_submission_interval_grace_period is not none else "" }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="The minimum amount of time (in seconds) that a contestant needs to wait after a user test before being able to send another.
+                              Leave empty for no limits."></span>
+    Minimum interval between user tests
+  </td>
+  <td><input type="text" name="min_user_test_interval" value="{{ contest.min_user_test_interval.total_seconds()|int if contest.min_user_test_interval is not none else "" }}"></td>
+</tr>
+
+{% if show_analysis_section %}
+<tr><td colspan=2><h2>Analysis mode</h2></td></tr>
+<tr>
+  <td>
+    <span class="info" title="If true, analysis mode for this contest will be enabled."></span>
+    Enabled
+  </td>
+  <td>
+    <input type="checkbox" id="analysis_enabled" name="analysis_enabled" {{ "checked" if contest.analysis_enabled else "" }}/>
+  </td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="Start time of the analysis mode in the UTC timezone.
+                              Example: '2015-12-31 15:00:00'."></span>
+    Analysis mode start time (in UTC)
+  </td>
+  <td><input type="text" name="analysis_start" value="{{ contest.analysis_start }}"></td>
+</tr>
+<tr>
+  <td>
+    <span class="info" title="End time of the analysis mode in the UTC timezone.
+                              Example: '2015-12-31 18:00:00'."></span>
+    Analysis mode end time (in UTC)
+  </td>
+  <td><input type="text" name="analysis_stop" value="{{ contest.analysis_stop }}"></td>
+</tr>
+{% endif %}
diff --git a/cms/server/admin/templates/student_tasks.html b/cms/server/admin/templates/student_tasks.html
index 0555f8b02b..3e9abf4d18 100644
--- a/cms/server/admin/templates/student_tasks.html
+++ b/cms/server/admin/templates/student_tasks.html
@@ -20,8 +20,8 @@ <h2 id="title_add_task" class="toggling_on">Add Task</h2>
           Task
         </td>
         <td>
-          <select name="task_id">
-            <option value="null" selected>-- Select a task --</option>
+          <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 %}
diff --git a/cms/server/admin/templates/training_program.html b/cms/server/admin/templates/training_program.html
index b58871b228..d00baab061 100644
--- a/cms/server/admin/templates/training_program.html
+++ b/cms/server/admin/templates/training_program.html
@@ -5,9 +5,11 @@
   <h1>Training Program</h1>
 </div>
 
-<form action="{{ url("training_program", training_program.id) }}" method="POST" name="edit_training_program" style="display:inline;">
+<!-- We use "multipart/form-data" to have Tornado distinguish between missing and empty values. -->
+<form enctype="multipart/form-data" action="{{ url("training_program", training_program.id) }}" method="POST" name="edit_training_program" style="display:inline;">
   {{ xsrf_form_html|safe }}
   <table class="sub_table">
+    <tr><td colspan=2><h2>Training Program Information</h2></td></tr>
     <tr>
       <td>
         <span class="info" title="A short name for the training program, preferably using only letters, numbers and underscores."></span>
@@ -20,68 +22,23 @@ <h1>Training Program</h1>
         <span class="info" title="The name of the training program as seen by users."></span>
         Description
       </td>
-      <td><input type="text" name="description" value="{{ training_program.description }}"/></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="When the training program starts."></span>
-        Start time
-      </td>
-      <td><input type="datetime-local" name="start" value="{{ training_program.managing_contest.start.strftime('%Y-%m-%dT%H:%M') }}"/></td>
-    </tr>
-    <tr>
-      <td>
-        <span class="info" title="When the training program ends. Must be after start time."></span>
-        End time
-      </td>
-      <td><input type="datetime-local" name="stop" value="{{ training_program.managing_contest.stop.strftime('%Y-%m-%dT%H:%M') }}"/></td>
+      <td><textarea name="description">{{ training_program.description }}</textarea></td>
     </tr>
+
+    {# Include contest configuration fields for the managing contest #}
+    {% set contest = training_program.managing_contest %}
+    {% with show_folder=false, show_name=false, show_description=false, show_login_section=true, show_analysis_section=false %}
+      {% include "fragments/contest_config_fields.html" %}
+    {% endwith %}
   </table>
-  <input type="submit" value="Update"/>
+  <input type="submit" value="Update"{% if not admin.permission_all %} disabled{% endif %}/>
+  <input type="reset" value="Reset">
 </form>
 
-<script>
-CMS.AWSUtils.initDateTimeValidation(
-  'form[name="edit_training_program"]',
-  'input[name="start"]',
-  'input[name="stop"]'
-);
-</script>
-
 <form action="{{ url("training_programs") }}" method="POST" style="display:inline;">
   {{ xsrf_form_html|safe }}
   <input type="hidden" name="training_program_id" value="{{ training_program.id }}"/>
   <input type="submit" name="operation" value="Remove" style="float: right;"/>
 </form>
 
-
-<h3>Students ({{ training_program.students|length }})</h3>
-<ul>
-  {% if training_program.students|length == 0 %}
-    <li>(no students yet)</li>
-  {% else %}
-    {% for student in training_program.students[:10] %}
-      {% set u = student.participation.user %}
-      <li><a href="{{ url("training_program", training_program.id, "student", u.id, "edit") }}">{{ u.username }}</a> - {{ u.first_name }} {{ u.last_name }}</li>
-    {% endfor %}
-    {% if training_program.students|length > 10 %}
-      <li>... and {{ training_program.students|length - 10 }} more</li>
-    {% endif %}
-  {% endif %}
-</ul>
-
-<h3>Tasks ({{ training_program.managing_contest.tasks|length }})</h3>
-<ul>
-  {% if training_program.managing_contest.tasks|length == 0 %}
-    <li>(no tasks yet)</li>
-  {% else %}
-    {% for t in training_program.managing_contest.tasks[:10] %}
-      <li><a href="{{ url("task", t.id) }}">{{ t.name }}</a> - {{ t.title }}</li>
-    {% endfor %}
-    {% if training_program.managing_contest.tasks|length > 10 %}
-      <li>... and {{ training_program.managing_contest.tasks|length - 10 }} more</li>
-    {% endif %}
-  {% endif %}
-</ul>
-
 {% endblock core %}
diff --git a/cms/server/admin/templates/training_program_students.html b/cms/server/admin/templates/training_program_students.html
index 0ef07c5164..866e58d9a1 100644
--- a/cms/server/admin/templates/training_program_students.html
+++ b/cms/server/admin/templates/training_program_students.html
@@ -18,8 +18,8 @@ <h1>Students list</h1>
 <form action="{{ url("training_program", training_program.id, "students", "add") }}" method="POST">
   {{ xsrf_form_html|safe }}
   Add a new student:
-  <select name="user_id">
-    <option value="null" selected>Select a new user</option>
+  <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 }}
diff --git a/cms/server/admin/templates/user.html b/cms/server/admin/templates/user.html
index 4760c7131a..fcafab107c 100644
--- a/cms/server/admin/templates/user.html
+++ b/cms/server/admin/templates/user.html
@@ -3,7 +3,37 @@
 {% block core %}
 <h1>{{ user.first_name }} {{ user.last_name }} ({{ user.username }})</h1>
 
-<h2 id="title_participations" class="toggling_on">Participations</h2>
+<h2 id="title_training_programs" class="toggling_on">Training Program Participations</h2>
+<div id="training_programs">
+  {% if training_program_participations|length == 0 %}
+  <p>No training program participations found.</p>
+  {% else %}
+  <p><em>Training program participations are managed via the training program interface. Use "Remove from training program" to remove a student.</em></p>
+  <table class="bordered">
+    <thead>
+      <tr>
+        <th>Training Program</th>
+        <th>Description</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for p in training_program_participations %}
+      <tr>
+        <td><a href="{{ url("training_program", p.contest.training_program.id) }}">{{ p.contest.training_program.name }}</a></td>
+        <td>{{ p.contest.training_program.description }}</td>
+        <td>
+          <a href="{{ url("training_program", p.contest.training_program.id, "student", p.user.id, "remove") }}" onclick="return confirm('Remove {{ p.user.username }} from training program {{ p.contest.training_program.name }}? This will also remove all training day participations.');">Remove from training program</a>
+        </td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  {% endif %}
+  <div class="hr"></div>
+</div>
+
+<h2 id="title_participations" class="toggling_on">Contest Participations</h2>
 <div id="participations">
 
   <form action="{{ url("user", user.id, "add_participation") }}" method="POST">
@@ -22,10 +52,10 @@ <h2 id="title_participations" class="toggling_on">Participations</h2>
     <input type="submit" value="Add participation" />
   </form>
 
-  {% if participations == [] %}
-  <p>No participations found.</p>
+  {% if participations|length == 0 %}
+  <p>No contest participations found.</p>
   {% else %}
-  <form action="{{ url("user", user.id, "edit_participation") }}" method="POST">
+  <form action="{{ url("user", user.id, "edit_participation") }}" method="POST" onsubmit="return confirm('Are you sure you want to remove this participation?');">
     {{ xsrf_form_html|safe }}
     Edit selected participation:
     <input type="submit" name="operation" value="Remove" />
diff --git a/cms/server/contest/handlers/main.py b/cms/server/contest/handlers/main.py
index 1ce73fc821..b602dc328f 100644
--- a/cms/server/contest/handlers/main.py
+++ b/cms/server/contest/handlers/main.py
@@ -142,10 +142,39 @@ def post(self):
 
             # Create participation
             team = self._get_team()
+            # For training programs, set starting_time to now so the user can
+            # see everything immediately (training programs don't have a start button)
+            training_program = self.contest.training_program
+            starting_time = None
+            if training_program is not None:
+                starting_time = make_datetime()
             participation = Participation(user=user, contest=self.contest,
-                                          team=team)
+                                          team=team, starting_time=starting_time)
             self.sql_session.add(participation)
 
+            # For training programs, also create a Student record and add
+            # participations to all existing training days (mirroring the
+            # behavior of AddTrainingProgramStudentHandler)
+            if training_program is not None:
+                self.sql_session.flush()  # Ensure participation has an ID
+
+                student = Student(
+                    training_program=training_program,
+                    participation=participation,
+                    student_tags=[]
+                )
+                self.sql_session.add(student)
+
+                # Add the student to all existing training days
+                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)
+
             self.sql_session.commit()
 
             self.finish(user.username)