From ac4c2c1f170f9573eacc81b49246cbb7a58b93fa Mon Sep 17 00:00:00 2001
From: Florian Glombik <63976129+florian-glombik@users.noreply.github.com>
Date: Tue, 29 Oct 2024 23:14:35 +0100
Subject: [PATCH] Programming exercises: Add simple mode to create and edit
 view (#9283)

---
 .../dto/CourseExistingExerciseDetailsDTO.java |   9 +
 .../aet/artemis/core/web/CourseResource.java  |  34 ++
 .../manage/detail/course-detail.component.ts  |   2 +-
 .../app/exam/manage/exam-management.module.ts |   1 -
 .../manage/exams/exam-update.component.html   |   3 +-
 .../manage/exams/exam-update.component.ts     |  18 +-
 ...d-auxiliary-repository-button.component.ts |   8 +-
 ...programming-exercise-update.component.html |  32 +-
 .../programming-exercise-update.component.ts  | 191 ++++++++---
 .../programming-exercise-update.helper.ts     |  97 ++++++
 .../programming-exercise-update.module.ts     |  20 +-
 .../switch-edit-mode-button.component.html    |   9 +
 .../switch-edit-mode-button.component.ts      |  25 ++
 ...ramming-exercise-difficulty.component.html |   6 +
 ...ogramming-exercise-difficulty.component.ts |  15 +
 ...rogramming-exercise-grading.component.html | 139 ++++++++
 .../programming-exercise-grading.component.ts |  19 +-
 ...amming-exercise-information.component.html | 122 ++++---
 ...amming-exercise-information.component.scss |   0
 ...gramming-exercise-information.component.ts | 318 ++++++++++++++++++
 ...ogramming-exercise-language.component.html | 240 +++++++++++++
 ...programming-exercise-language.component.ts |  10 +-
 .../programming-exercise-mode.component.html} |  83 ++---
 .../programming-exercise-mode.component.ts}   |  24 +-
 ...rogramming-exercise-problem.component.html |  58 ++++
 .../programming-exercise-problem.component.ts |  23 +-
 ...rogramming-exercise-grading.component.html | 127 -------
 ...gramming-exercise-information.component.ts | 157 ---------
 ...ogramming-exercise-language.component.html | 228 -------------
 ...rogramming-exercise-problem.component.html |  50 ---
 ...gramming-exercise-lifecycle.component.html |  91 ++---
 ...rogramming-exercise-lifecycle.component.ts |  27 +-
 ...exercise-title-channel-name.component.html |   2 +
 .../exercise-title-channel-name.component.ts  |  29 +-
 .../shared/exercise/exercise.service.ts       |  22 ++
 .../form-footer/form-footer.component.html    |  23 +-
 .../form-footer/form-footer.component.scss    |   2 +-
 .../form-footer/form-footer.component.ts      |  24 +-
 .../form-status-bar.component.html            |   8 +-
 .../form-status-bar.component.ts              |   5 +-
 src/main/webapp/app/forms/forms.module.ts     |   3 +-
 .../category-selector.component.ts            |  27 +-
 .../shared/components/help-icon.component.ts  |  11 +-
 .../app/shared/constants/input.constants.ts   |  21 ++
 .../title-channel-name.component.html         |  43 ++-
 .../title-channel-name.component.ts           |  48 ++-
 .../title-channel-name.module.ts              |   4 +-
 src/main/webapp/app/shared/util/utils.ts      |   4 +
 ...tom-not-included-in-validator.directive.ts |  30 ++
 src/main/webapp/i18n/de/exercise.json         |   9 +-
 .../webapp/i18n/de/programmingExercise.json   |  13 +-
 src/main/webapp/i18n/en/exercise.json         |   9 +-
 .../webapp/i18n/en/programmingExercise.json   |  13 +-
 .../artemis/core/util/CourseTestService.java  |  12 +
 .../artemis/core/util/CourseUtilService.java  |  13 +
 .../CourseGitlabJenkinsIntegrationTest.java   |  13 +
 .../util/ProgrammingExerciseUtilService.java  |  10 +-
 .../exam/exam-update.component.spec.ts        |   9 +-
 ...rcise-title-channel-name.component.spec.ts |  76 ++++-
 .../forms/form-status-bar.component.spec.ts   |   8 +-
 ...mming-exercise-lifecycle.component.spec.ts |  26 +-
 ...gramming-exercise-update.component.spec.ts | 242 +++++++++++--
 ...iliary-repository-button.component.spec.ts |  45 +++
 ...ramming-exercise-grading.component.spec.ts |  98 +++++-
 ...ing-exercise-information.component.spec.ts |  79 ++++-
 ...amming-exercise-language.component.spec.ts |  12 +-
 ...ogramming-exercise-mode.component.spec.ts} |  28 +-
 ...ramming-exercise-problem.component.spec.ts |   7 +-
 .../switch-edit-mode-button.component.spec.ts |  42 +++
 .../form/title-channel-name.component.spec.ts |   7 +-
 .../javascript/spec/util/shared/utils.spec.ts |   9 +
 .../e2e/exam/ExamManagement.spec.ts           |   1 +
 .../exam/test-exam/TestExamManagement.spec.ts |   1 +
 .../ProgrammingExerciseManagement.spec.ts     |   2 +
 .../ProgrammingExerciseCreationPage.ts        |   4 +
 75 files changed, 2292 insertions(+), 988 deletions(-)
 create mode 100644 src/main/java/de/tum/cit/aet/artemis/core/dto/CourseExistingExerciseDetailsDTO.java
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.helper.ts
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.html
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.ts
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.html
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.ts
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.html
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{ => grading}/programming-exercise-grading.component.ts (91%)
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{ => information}/programming-exercise-information.component.html (71%)
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{ => information}/programming-exercise-information.component.scss (100%)
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.ts
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.html
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{ => language}/programming-exercise-language.component.ts (92%)
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{programming-exercise-difficulty.component.html => mode/programming-exercise-mode.component.html} (60%)
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{programming-exercise-difficulty.component.ts => mode/programming-exercise-mode.component.ts} (61%)
 create mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.html
 rename src/main/webapp/app/exercises/programming/manage/update/update-components/{ => problem}/programming-exercise-problem.component.ts (59%)
 delete mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
 delete mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
 delete mode 100644 src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
 create mode 100644 src/main/webapp/app/shared/validators/custom-not-included-in-validator.directive.ts
 create mode 100644 src/test/javascript/spec/component/programming-exercise/update-components/add-auxiliary-repository-button.component.spec.ts
 rename src/test/javascript/spec/component/programming-exercise/update-components/{programming-exercise-difficulty.component.spec.ts => programming-exercise-mode.component.spec.ts} (74%)
 create mode 100644 src/test/javascript/spec/component/programming-exercise/update-components/switch-edit-mode-button.component.spec.ts

diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseExistingExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseExistingExerciseDetailsDTO.java
new file mode 100644
index 000000000000..cae411dfb905
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseExistingExerciseDetailsDTO.java
@@ -0,0 +1,9 @@
+package de.tum.cit.aet.artemis.core.dto;
+
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record CourseExistingExerciseDetailsDTO(Set<String> exerciseTitles, Set<String> shortNames) {
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java
index c1eac3ba3a66..16b7dd554842 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java
@@ -72,6 +72,7 @@
 import de.tum.cit.aet.artemis.core.config.Constants;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
+import de.tum.cit.aet.artemis.core.dto.CourseExistingExerciseDetailsDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForArchiveDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO;
@@ -97,6 +98,7 @@
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor;
+import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse;
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
 import de.tum.cit.aet.artemis.core.service.CourseService;
 import de.tum.cit.aet.artemis.core.service.FilePathService;
@@ -107,6 +109,7 @@
 import de.tum.cit.aet.artemis.exam.repository.ExamRepository;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode;
+import de.tum.cit.aet.artemis.exercise.domain.ExerciseType;
 import de.tum.cit.aet.artemis.exercise.domain.Submission;
 import de.tum.cit.aet.artemis.exercise.domain.Team;
 import de.tum.cit.aet.artemis.exercise.domain.participation.Participant;
@@ -1473,4 +1476,35 @@ public ResponseEntity<Long> getNumberOfAllowedComplaintsInCourse(@PathVariable L
         long unacceptedComplaints = complaintService.countUnacceptedComplaintsByParticipantAndCourseId(participant, courseId);
         return ResponseEntity.ok(Math.max(complaintService.getMaxComplaintsPerParticipant(course, participant) - unacceptedComplaints, 0));
     }
+
+    /**
+     * GET courses/{courseId}/existing-exercise-details: Get the exercise names (and shortNames for {@link ExerciseType#PROGRAMMING} exercises)
+     * of all exercises with the given type in the given course.
+     *
+     * @param courseId     of the course for which all exercise names should be fetched
+     * @param exerciseType for which the details should be fetched, as the name of an exercise only needs to be unique for each exercise type
+     * @return {@link CourseExistingExerciseDetailsDTO} with the exerciseNames (and already used shortNames if a {@link ExerciseType#PROGRAMMING} exercise is requested)
+     */
+    @GetMapping("courses/{courseId}/existing-exercise-details")
+    @EnforceAtLeastEditorInCourse
+    public ResponseEntity<CourseExistingExerciseDetailsDTO> getExistingExerciseDetails(@PathVariable Long courseId, @RequestParam String exerciseType) {
+        log.debug("REST request to get details of existing exercises in course : {}", courseId);
+        Course course = courseRepository.findByIdWithEagerExercisesElseThrow(courseId);
+
+        Set<String> alreadyTakenExerciseNames = new HashSet<>();
+        Set<String> alreadyTakenShortNames = new HashSet<>();
+
+        boolean includeShortNames = exerciseType.equals(ExerciseType.PROGRAMMING.toString());
+
+        course.getExercises().forEach((exercise -> {
+            if (exercise.getType().equals(exerciseType)) {
+                alreadyTakenExerciseNames.add(exercise.getTitle());
+                if (includeShortNames && exercise.getShortName() != null) {
+                    alreadyTakenShortNames.add(exercise.getShortName());
+                }
+            }
+        }));
+
+        return ResponseEntity.ok(new CourseExistingExerciseDetailsDTO(alreadyTakenExerciseNames, alreadyTakenShortNames));
+    }
 }
diff --git a/src/main/webapp/app/course/manage/detail/course-detail.component.ts b/src/main/webapp/app/course/manage/detail/course-detail.component.ts
index 29858e79b334..e75bc32beab8 100644
--- a/src/main/webapp/app/course/manage/detail/course-detail.component.ts
+++ b/src/main/webapp/app/course/manage/detail/course-detail.component.ts
@@ -367,7 +367,7 @@ export class CourseDetailComponent implements OnInit, OnDestroy {
         if (this.paramSub) {
             this.paramSub.unsubscribe();
         }
-        this.eventManager.destroy(this.eventSubscriber);
+        this.eventManager?.destroy(this.eventSubscriber);
     }
 
     /**
diff --git a/src/main/webapp/app/exam/manage/exam-management.module.ts b/src/main/webapp/app/exam/manage/exam-management.module.ts
index b9a9829ab1fa..ddc813cc21f6 100644
--- a/src/main/webapp/app/exam/manage/exam-management.module.ts
+++ b/src/main/webapp/app/exam/manage/exam-management.module.ts
@@ -88,7 +88,6 @@ const ENTITY_STATES = [...examManagementState];
         ArtemisMarkdownEditorModule,
         NgxDatatableModule,
         ArtemisDataTableModule,
-        ArtemisTextExerciseModule,
         ArtemisFileUploadExerciseManagementModule,
         ArtemisProgrammingExerciseManagementModule,
         ArtemisQuizManagementModule,
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html
index 780e07a92c40..57ebf71c3272 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html
@@ -5,8 +5,7 @@
                 <div class="d-flex align-items-center">
                     @if (!isImport) {
                         <h4 jhiTranslate="artemisApp.examManagement.createExam"></h4>
-                    }
-                    @if (isImport) {
+                    } @else {
                         <h4 jhiTranslate="artemisApp.examManagement.importExam"></h4>
                     }
                     <jhi-documentation-button [type]="documentationType" />
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
index ea4d3a510ec4..610798664c76 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
@@ -24,28 +24,27 @@ import { examWorkingTime, normalWorkingTime } from 'app/exam/participate/exam.ut
     templateUrl: './exam-update.component.html',
 })
 export class ExamUpdateComponent implements OnInit, OnDestroy {
+    protected readonly faSave = faSave;
+    protected readonly faBan = faBan;
+    protected readonly faExclamationTriangle = faExclamationTriangle;
+    protected readonly documentationType: DocumentationType = 'Exams';
+
     exam: Exam;
     course: Course;
     isSaving: boolean;
     isImport = false;
     isImportInSameCourse = false;
-    hideChannelNameInput = false;
 
+    hideChannelNameInput = false;
     private originalStartDate?: dayjs.Dayjs;
+
     private originalEndDate?: dayjs.Dayjs;
 
     private componentActive = true;
-
     // Link to the component enabling the selection of exercise groups and exercises for import
     @ViewChild(ExamExerciseImportComponent) examExerciseImportComponent: ExamExerciseImportComponent;
-    @ViewChild('workingTimeConfirmationContent') public workingTimeConfirmationContent: TemplateRef<any>;
-
-    readonly documentationType: DocumentationType = 'Exams';
 
-    // Icons
-    faSave = faSave;
-    faBan = faBan;
-    faExclamationTriangle = faExclamationTriangle;
+    @ViewChild('workingTimeConfirmationContent') public workingTimeConfirmationContent: TemplateRef<any>;
 
     constructor(
         private route: ActivatedRoute,
@@ -471,6 +470,7 @@ export class ExamUpdateComponent implements OnInit, OnDestroy {
             dayjs(this.exam.exampleSolutionPublicationDate).isBefore(this.exam.endDate || null)
         );
     }
+
     /**
      * Default exam start text, which can be edited by instructors in the text editor
      */
diff --git a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
index 06d5d6940c83..e913910c0b29 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
@@ -17,16 +17,14 @@ import { faPlus } from '@fortawesome/free-solid-svg-icons';
     `,
 })
 export class AddAuxiliaryRepositoryButtonComponent {
-    ButtonType = ButtonType;
-    ButtonSize = ButtonSize;
+    protected readonly ButtonType = ButtonType;
+    protected readonly ButtonSize = ButtonSize;
+    protected readonly faPlus = faPlus;
 
     @Input() programmingExercise: ProgrammingExercise;
 
     @Output() onRefresh: EventEmitter<any> = new EventEmitter<any>();
 
-    // Icons
-    faPlus = faPlus;
-
     /**
      * Adds a new auxiliary repository, which is displayed as a new row, to the respective programming exercise and activates the angular change detection.
      */
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html
index 6dcae2b857a3..4092b38225b2 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html
@@ -9,7 +9,7 @@ <h2 id="jhi-programming-exercise-heading-import" jhiTranslate="artemisApp.progra
         }
         <jhi-documentation-button [type]="documentationType" />
     </div>
-    <jhi-form-status-bar [formStatusSections]="formStatusSections" />
+    <jhi-form-status-bar [formStatusSections]="formStatusSections()" />
     <form name="editForm" role="form" novalidate #editForm="ngForm" (keydown.enter)="isEventInsideTextArea($event)">
         <div class="update-programming-exercise">
             <jhi-programming-exercise-info
@@ -19,19 +19,33 @@ <h2 id="jhi-programming-exercise-heading-import" jhiTranslate="artemisApp.progra
                 [isImport]="isImportFromExistingExercise || isImportFromFile"
                 [isLocal]="isLocal"
                 [importOptions]="importOptions"
+                [isSimpleMode]="isSimpleMode()"
+                [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
+                [courseId]="courseId"
+                [(isAuxiliaryRepositoryInputValid)]="isAuxiliaryRepositoryInputValid"
             />
             <hr class="mb-5" />
-            <jhi-programming-exercise-difficulty
+            @if (!isSimpleMode()) {
+                <!-- The mode section would only contain the difficulty in the simple mode,
+                in the simple mode the difficulty will be part of the general section -->
+                <jhi-programming-exercise-mode
+                    [programmingExercise]="programmingExercise"
+                    [programmingExerciseCreationConfig]="getProgrammingExerciseCreationConfig()"
+                    [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
+                    (triggerValidation)="calculateFormStatusSections()"
+                />
+                <hr class="mb-5" />
+            }
+            <jhi-programming-exercise-language
                 [programmingExercise]="programmingExercise"
                 [programmingExerciseCreationConfig]="getProgrammingExerciseCreationConfig()"
-                (triggerValidation)="calculateFormStatusSections()"
+                [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
             />
             <hr class="mb-5" />
-            <jhi-programming-exercise-language [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="getProgrammingExerciseCreationConfig()" />
-            <hr class="mb-5" />
             <jhi-programming-exercise-problem
                 [(exercise)]="programmingExercise"
                 [programmingExerciseCreationConfig]="getProgrammingExerciseCreationConfig()"
+                [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
                 (problemStatementChange)="calculateFormStatusSections()"
             />
             <hr class="mb-5" />
@@ -40,18 +54,22 @@ <h2 id="jhi-programming-exercise-heading-import" jhiTranslate="artemisApp.progra
                 [programmingExercise]="programmingExercise"
                 [programmingExerciseCreationConfig]="getProgrammingExerciseCreationConfig()"
                 [importOptions]="importOptions"
+                [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
             />
-            @if (!isExamMode) {
+            @if (isEditFieldDisplayedRecord().plagiarismControl && !isExamMode) {
                 <jhi-exercise-update-plagiarism [exercise]="programmingExercise" />
             }
             <jhi-form-footer
                 [isCreation]="!programmingExercise.id"
                 [isImport]="isImportFromExistingExercise || isImportFromFile"
                 [isSaving]="isSaving"
+                [(notificationText)]="notificationText"
+                [isSimpleMode]="isSimpleMode()"
+                [switchEditMode]="switchEditMode"
+                [areAuxiliaryRepositoriesValid]="isAuxiliaryRepositoryInputValid()"
                 [invalidReasons]="getInvalidReasons()"
                 (save)="save()"
                 (onCancel)="previousState()"
-                [(notificationText)]="notificationText"
             />
         </div>
     </form>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
index 8b1a5ef9529a..5bdde2d8c65c 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
@@ -1,5 +1,5 @@
 import { ActivatedRoute, Params } from '@angular/router';
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild, computed, effect, signal } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
 import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config';
@@ -10,22 +10,29 @@ import { ProgrammingExerciseService } from '../services/programming-exercise.ser
 import { FileService } from 'app/shared/http/file.service';
 import { TranslateService } from '@ngx-translate/core';
 import { switchMap, tap } from 'rxjs/operators';
-import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
-import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Exercise, IncludedInOverallScore, ValidationReason } from 'app/entities/exercise.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { ProgrammingLanguageFeatureService } from 'app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
-import { EXERCISE_TITLE_NAME_PATTERN, EXERCISE_TITLE_NAME_REGEX, SHORT_NAME_PATTERN } from 'app/shared/constants/input.constants';
+import {
+    APP_NAME_PATTERN_FOR_SWIFT,
+    EXERCISE_TITLE_NAME_PATTERN,
+    EXERCISE_TITLE_NAME_REGEX,
+    INVALID_DIRECTORY_NAME_PATTERN,
+    INVALID_REPOSITORY_NAME_PATTERN,
+    MAX_PENALTY_PATTERN,
+    PACKAGE_NAME_PATTERN_FOR_JAVA_BLACKBOX,
+    PACKAGE_NAME_PATTERN_FOR_JAVA_KOTLIN,
+    PROGRAMMING_EXERCISE_SHORT_NAME_PATTERN,
+} from 'app/shared/constants/input.constants';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { cloneDeep } from 'lodash-es';
 import { ExerciseUpdateWarningService } from 'app/exercises/shared/exercise-update-warning/exercise-update-warning.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
-import { faExclamationCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ModePickerOption } from 'app/exercises/shared/mode-picker/mode-picker.component';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
@@ -33,12 +40,15 @@ import { loadCourseExerciseCategories } from 'app/exercises/shared/course-exerci
 import { PROFILE_AEOLUS, PROFILE_LOCALCI, PROFILE_THEIA } from 'app/app.constants';
 import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service';
 import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.component';
-import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
-import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component';
-import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component';
-import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component';
+import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component';
+import { ProgrammingExerciseModeComponent } from 'app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component';
+import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component';
+import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component';
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
 import { ImportOptions } from 'app/types/programming-exercises';
+import { IS_DISPLAYED_IN_SIMPLE_MODE, ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
+
+export const LOCAL_STORAGE_KEY_IS_SIMPLE_MODE = 'isSimpleMode';
 
 @Component({
     selector: 'jhi-programming-exercise-update',
@@ -46,17 +56,40 @@ import { ImportOptions } from 'app/types/programming-exercises';
     styleUrls: ['../programming-exercise-form.scss'],
 })
 export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit {
+    protected readonly documentationType: DocumentationType = 'Programming';
+    protected readonly maxPenaltyPattern = MAX_PENALTY_PATTERN;
+    protected readonly packageNamePatternForJavaBlackbox = PACKAGE_NAME_PATTERN_FOR_JAVA_BLACKBOX;
+    protected readonly invalidRepositoryNamePattern = INVALID_REPOSITORY_NAME_PATTERN;
+    protected readonly invalidDirectoryNamePattern = INVALID_DIRECTORY_NAME_PATTERN;
+    protected readonly shortNamePattern = PROGRAMMING_EXERCISE_SHORT_NAME_PATTERN;
+    readonly packageNamePatternForJavaKotlin = PACKAGE_NAME_PATTERN_FOR_JAVA_KOTLIN;
+    readonly appNamePatternForSwift = APP_NAME_PATTERN_FOR_SWIFT;
+
     @ViewChild(ProgrammingExerciseInformationComponent) exerciseInfoComponent?: ProgrammingExerciseInformationComponent;
-    @ViewChild(ProgrammingExerciseDifficultyComponent) exerciseDifficultyComponent?: ProgrammingExerciseDifficultyComponent;
+    @ViewChild(ProgrammingExerciseModeComponent) exerciseDifficultyComponent?: ProgrammingExerciseModeComponent;
     @ViewChild(ProgrammingExerciseLanguageComponent) exerciseLanguageComponent?: ProgrammingExerciseLanguageComponent;
     @ViewChild(ProgrammingExerciseGradingComponent) exerciseGradingComponent?: ProgrammingExerciseGradingComponent;
     @ViewChild(ExerciseUpdatePlagiarismComponent) exercisePlagiarismComponent?: ExerciseUpdatePlagiarismComponent;
 
-    readonly IncludedInOverallScore = IncludedInOverallScore;
-    readonly FeatureToggle = FeatureToggle;
-    readonly ProgrammingLanguage = ProgrammingLanguage;
-    readonly ProjectType = ProjectType;
-    readonly documentationType: DocumentationType = 'Programming';
+    packageNamePattern = '';
+    isSimpleMode = signal<boolean>(true);
+    isAuxiliaryRepositoryInputValid = signal<boolean>(true);
+
+    isEditFieldDisplayedRecord = computed(() => {
+        const inputFieldEditModeMapping = IS_DISPLAYED_IN_SIMPLE_MODE;
+
+        const isEditFieldDisplayedMapping: Record<ProgrammingExerciseInputField, boolean> = {} as Record<ProgrammingExerciseInputField, boolean>;
+        Object.keys(inputFieldEditModeMapping).forEach((key) => {
+            let isDisplayed = true;
+            if (this.isSimpleMode() && !(this.isImportFromFile || this.isImportFromExistingExercise)) {
+                isDisplayed = inputFieldEditModeMapping[key as ProgrammingExerciseInputField];
+            }
+
+            isEditFieldDisplayedMapping[key as ProgrammingExerciseInputField] = isDisplayed;
+        });
+
+        return isEditFieldDisplayedMapping;
+    });
 
     private translationBasePath = 'artemisApp.programmingExercise.';
 
@@ -72,6 +105,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     isImportFromExistingExercise: boolean;
     isImportFromFile: boolean;
     isEdit: boolean;
+    isCreate: boolean;
     isExamMode: boolean;
     isLocal: boolean;
     hasUnsavedChanges = false;
@@ -85,40 +119,16 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     notificationText?: string;
     courseId: number;
 
-    AssessmentType = AssessmentType;
     rerenderSubject = new Subject<void>();
     // This is used to revert the select if the user cancels to override the new selected programming language.
     private selectedProgrammingLanguageValue: ProgrammingLanguage;
     // This is used to revert the select if the user cancels to override the new selected project type.
     private selectedProjectTypeValue?: ProjectType;
-    maxPenaltyPattern = '^([0-9]|([1-9][0-9])|100)$';
-    // Java package name Regex according to Java 14 JLS (https://docs.oracle.com/javase/specs/jls/se14/html/jls-7.html#jls-7.4.1),
-    // with the restriction to a-z,A-Z,_ as "Java letter" and 0-9 as digits due to JavaScript/Browser Unicode character class limitations
-    packageNamePatternForJavaKotlin =
-        '^(?!.*(?:\\.|^)(?:abstract|continue|for|new|switch|assert|default|if|package|synchronized|boolean|do|goto|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|_|true|false|null)(?:\\.|$))[A-Z_a-z][0-9A-Z_a-z]*(?:\\.[A-Z_a-z][0-9A-Z_a-z]*)*$';
-    // No dots allowed for the blackbox project type, because the folder naming works slightly different here.
-    packageNamePatternForJavaBlackbox =
-        '^(?!.*(?:\\.|^)(?:abstract|continue|for|new|switch|assert|default|if|package|synchronized|boolean|do|goto|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|_|true|false|null)(?:\\.|$))[A-Z_a-z][0-9A-Z_a-z]*$';
-    // Swift package name Regex derived from (https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID412),
-    // with the restriction to a-z,A-Z as "Swift letter" and 0-9 as digits where no separators are allowed
-    appNamePatternForSwift =
-        '^(?!(?:associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|rethrows|static|struct|subscript|typealias|var|break|case|continue|default|defer|do|else|fallthrough|for|guard|if|in|repeat|return|switch|where|while|as|Any|catch|false|is|nil|super|self|Self|throw|throws|true|try|_|[sS]wift)$)[A-Za-z][0-9A-Za-z]*$';
-    packageNamePattern = '';
-
-    // Auxiliary Repository names must only include words or '-' characters.
-    invalidRepositoryNamePattern = RegExp('^(?!(solution|exercise|tests|auxiliary)\\b)\\b(\\w|-)+$');
-
-    // Auxiliary Repository checkout directories must be valid directory paths. Those must only include words,
-    // '-' or '/' characters.
-    invalidDirectoryNamePattern = RegExp('^[\\w-]+(/[\\w-]+)*$');
-
-    // length of < 3 is also accepted in order to provide more accurate validation error messages
-    readonly shortNamePattern = RegExp('(^(?![\\s\\S]))|^[a-zA-Z][a-zA-Z0-9]*$|' + SHORT_NAME_PATTERN); // must start with a letter and cannot contain special characters
 
     exerciseCategories: ExerciseCategory[];
     existingCategories: ExerciseCategory[];
 
-    formStatusSections: FormSectionStatus[];
+    formStatusSections = signal<FormSectionStatus[]>([]);
 
     inputFieldSubscriptions: (Subscription | undefined)[] = [];
 
@@ -133,7 +143,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     public sequentialTestRunsAllowed = false;
     public testwiseCoverageAnalysisSupported = false;
     public auxiliaryRepositoriesSupported = false;
-    public auxiliaryRepositoriesValid = true;
+    auxiliaryRepositoriesValid = signal<boolean>(true);
     public customBuildPlansSupported: string = '';
     public theiaEnabled = false;
 
@@ -152,10 +162,6 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
 
     public modePickerOptions?: ModePickerOption<ProjectType>[] = [];
 
-    // Icons
-    faQuestionCircle = faQuestionCircle;
-    faExclamationCircle = faExclamationCircle;
-
     constructor(
         private programmingExerciseService: ProgrammingExerciseService,
         private modalService: NgbModal,
@@ -171,7 +177,29 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         private programmingLanguageFeatureService: ProgrammingLanguageFeatureService,
         private navigationUtilService: ArtemisNavigationUtilService,
         private aeolusService: AeolusService,
-    ) {}
+    ) {
+        effect(
+            function updateStatusBarSectionsWhenEditModeChanges() {
+                if (this.isSimpleMode()) {
+                    this.calculateFormStatusSections();
+                }
+            }.bind(this),
+            { allowSignalWrites: true },
+        );
+
+        effect(
+            function initializeEditMode() {
+                const editModeRetrievedFromLocalStorage = localStorage.getItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE);
+                if (editModeRetrievedFromLocalStorage) {
+                    this.isSimpleMode.set(editModeRetrievedFromLocalStorage === 'true');
+                } else {
+                    const DEFAULT_EDIT_MODE_IS_SIMPLE_MODE = true;
+                    this.isSimpleMode.set(DEFAULT_EDIT_MODE_IS_SIMPLE_MODE);
+                }
+            }.bind(this),
+            { allowSignalWrites: true },
+        );
+    }
 
     /**
      * Updates the name of the editedAuxiliaryRepository.
@@ -231,7 +259,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         this.auxiliaryRepositoryNamedCorrectly = this.programmingExercise.auxiliaryRepositories!.length === auxReposWithName?.length && !legalNameAndDirs;
 
         // Combining auxiliary variables to one to keep the template readable
-        this.auxiliaryRepositoriesValid = this.auxiliaryRepositoryNamedCorrectly && !this.auxiliaryRepositoryDuplicateNames && !this.auxiliaryRepositoryDuplicateDirectories;
+        this.auxiliaryRepositoriesValid.set(this.auxiliaryRepositoryNamedCorrectly && !this.auxiliaryRepositoryDuplicateNames && !this.auxiliaryRepositoryDuplicateDirectories);
     }
 
     /**
@@ -244,7 +272,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         this.selectedProgrammingLanguageValue = language;
 
         const programmingLanguageFeature = this.programmingLanguageFeatureService.getProgrammingLanguageFeature(language);
-        this.packageNameRequired = programmingLanguageFeature.packageNameRequired;
+        this.packageNameRequired = programmingLanguageFeature?.packageNameRequired;
         this.staticCodeAnalysisAllowed = programmingLanguageFeature.staticCodeAnalysis;
         this.checkoutSolutionRepositoryAllowed = programmingLanguageFeature.checkoutSolutionRepositoryAllowed;
         this.sequentialTestRunsAllowed = programmingLanguageFeature.sequentialTestRuns;
@@ -412,6 +440,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
                         this.isImportFromExistingExercise = segments.some((segment) => segment.path === 'import');
                         this.isImportFromFile = segments.some((segment) => segment.path === 'import-from-file');
                         this.isEdit = segments.some((segment) => segment.path === 'edit');
+                        this.isCreate = segments.some((segment) => segment.path === 'new');
                     }),
                     switchMap(() => this.activatedRoute.params),
                     tap((params) => {
@@ -498,26 +527,65 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     }
 
     calculateFormStatusSections() {
-        this.formStatusSections = [
+        const updatedFormStatusSections = [
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.generalInfoStepTitle',
                 valid: this.exerciseInfoComponent?.formValid ?? false,
             },
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.difficultyStepTitle',
-                valid: (this.exerciseDifficultyComponent?.teamConfigComponent.formValid && this.validIdeSelection()) ?? false,
+                valid: (this.exerciseDifficultyComponent?.teamConfigComponent?.formValid && this.validIdeSelection()) ?? false,
             },
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle',
                 valid: (this.exerciseLanguageComponent?.formValid && this.validOnlineIdeSelection()) ?? false,
             },
-            { title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle', valid: true, empty: !this.programmingExercise.problemStatement },
+            {
+                title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle',
+                valid: true,
+                empty: !this.programmingExercise.problemStatement,
+            },
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle',
-                valid: Boolean(this.exerciseGradingComponent?.formValid && (this.isExamMode || this.exercisePlagiarismComponent?.formValid)),
+                valid: Boolean(
+                    this.exerciseGradingComponent?.formValid &&
+                        (this.isExamMode || !this.isEditFieldDisplayedRecord().plagiarismControl || this.exercisePlagiarismComponent?.formValid),
+                ),
                 empty: this.exerciseGradingComponent?.formEmpty,
             },
         ];
+
+        if (this.isSimpleMode()) {
+            // the mode section would only contain the difficulty in the simple mode,
+            // which is why the difficulty is moved to the general section instead
+            const MODE_SECTION_INDEX = 1;
+            updatedFormStatusSections.splice(MODE_SECTION_INDEX, MODE_SECTION_INDEX);
+        }
+
+        this.formStatusSections.set(updatedFormStatusSections);
+    }
+
+    /**
+     * Depending on the build environment not all project types might be supported. Per default the project type is currently set to {@link ProjectType.GRADLE_GRADLE}.
+     * This is also the case, even if {@link ProjectType.GRADLE_GRADLE} is not supported by the build environment.
+     *
+     * This method is called to ensure that a valid project type is selected from the simple mode, if the project type cannot be determined automatically, an error message is
+     * displayed to the user that indicates that the advanced mode should be used to define the project type.
+     */
+    private determineProjectTypeIfNotSelectedAndInSimpleMode() {
+        if (this.isSimpleMode() && this.isCreate && this.projectTypes) {
+            const selectedProjectType = this.programmingExercise.projectType;
+            const isInvalidProjectTypeSelected = selectedProjectType === undefined || !this.projectTypes.includes(selectedProjectType);
+            if (isInvalidProjectTypeSelected) {
+                if (this.projectTypes.includes(ProjectType.PLAIN_GRADLE)) {
+                    this.programmingExercise.projectType = ProjectType.PLAIN_GRADLE;
+                } else if (this.projectTypes.includes(ProjectType.PLAIN_MAVEN)) {
+                    this.programmingExercise.projectType = ProjectType.PLAIN_MAVEN;
+                } else {
+                    this.alertService.addErrorAlert('Could not automatically determine project type', 'artemisApp.exercise.errors.projectTypeCouldNotBeDetermined');
+                }
+            }
+        }
     }
 
     private defineSupportedProgrammingLanguages() {
@@ -597,6 +665,8 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
 
     save() {
         const ref = this.popupService.checkExerciseBeforeUpdate(this.programmingExercise, this.backupExercise, this.isExamMode);
+        this.determineProjectTypeIfNotSelectedAndInSimpleMode();
+
         if (!this.modalService.hasOpenModals()) {
             this.saveExercise();
         } else {
@@ -811,6 +881,11 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         }
     }
 
+    switchEditMode = () => {
+        this.isSimpleMode.update((isSimpleMode) => !isSimpleMode);
+        localStorage.setItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE, JSON.stringify(this.isSimpleMode()));
+    };
+
     /**
      * Change the selected programming language for the current exercise. If there are unsaved changes, the user
      * will see a confirmation dialog about switching to a new template
@@ -893,6 +968,11 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
                 translateKey: 'artemisApp.exercise.form.title.pattern',
                 translateValues: {},
             });
+        } else if (this.exerciseInfoComponent?.titleComponent?.titleChannelNameComponent?.field_title?.control?.errors?.disallowedValue) {
+            validationErrorReasons.push({
+                translateKey: 'artemisApp.exercise.form.title.disallowedValue',
+                translateValues: {},
+            });
         }
     }
 
@@ -911,6 +991,11 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
                 translateKey: 'artemisApp.exercise.form.shortName.undefined',
                 translateValues: {},
             });
+        } else if (this.exerciseInfoComponent?.shortNameField()?.control?.errors?.disallowedValue) {
+            validationErrorReasons.push({
+                translateKey: 'artemisApp.exercise.form.title.disallowedValue',
+                translateValues: {},
+            });
         } else {
             if (this.programmingExercise.shortName.length < 3) {
                 validationErrorReasons.push({
@@ -1062,7 +1147,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     }
 
     private validateExerciseAuxiliaryRepositories(validationErrorReasons: ValidationReason[]): void {
-        if (!this.auxiliaryRepositoriesValid) {
+        if (!this.auxiliaryRepositoriesValid()) {
             validationErrorReasons.push({
                 translateKey: 'artemisApp.programmingExercise.auxiliaryRepository.error',
                 translateValues: {},
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.helper.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.helper.ts
new file mode 100644
index 000000000000..fc81642785d7
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.helper.ts
@@ -0,0 +1,97 @@
+export enum ProgrammingExerciseInputField {
+    // General section
+    TITLE = 'title',
+    CHANNEL_NAME = 'channelName',
+    SHORT_NAME = 'shortName',
+    EDIT_REPOSITORIES_CHECKOUT_PATH = 'editRepositoriesCheckoutPath',
+    ADD_AUXILIARY_REPOSITORY = 'addAuxiliaryRepository',
+    CATEGORIES = 'categories',
+
+    // Mode section
+    DIFFICULTY = 'difficulty',
+    PARTICIPATION_MODE = 'participationMode',
+    ALLOW_OFFLINE_IDE = 'allowOfflineIde',
+    ALLOW_ONLINE_CODE_EDITOR = 'allowOnlineCodeEditor',
+    ALLOW_ONLINE_IDE = 'allowOnlineIde',
+
+    // Language section
+    PROGRAMMING_LANGUAGE = 'programmingLanguage',
+    PROJECT_TYPE = 'projectType',
+    WITH_EXEMPLARY_DEPENDENCY = 'withExemplaryDependency',
+    PACKAGE_NAME = 'packageName',
+    ENABLE_STATIC_CODE_ANALYSIS = 'enableStaticCodeAnalysis',
+    SEQUENTIAL_TEST_RUNS = 'sequentialTestRuns',
+    CUSTOMIZE_BUILD_SCRIPT = 'customizeBuildScript',
+
+    // Problem section
+    PROBLEM_STATEMENT = 'problemStatement',
+    LINKED_COMPETENCIES = 'linkedCompetencies',
+
+    // Grading section
+    INCLUDE_EXERCISE_IN_COURSE_SCORE_CALCULATION = 'includeExerciseInCourseScoreCalculation',
+    POINTS = 'points',
+    BONUS_POINTS = 'bonusPoints',
+    SUBMISSION_POLICY = 'submissionPolicy',
+    TIMELINE = 'timeline',
+    RELEASE_DATE = 'releaseDate',
+    START_DATE = 'startDate',
+    DUE_DATE = 'dueDate',
+    RUN_TESTS_AFTER_DUE_DATE = 'runTestsAfterDueDate',
+    ASSESSMENT_DUE_DATE = 'assessmentDueDate',
+    EXAMPLE_SOLUTION_PUBLICATION_DATE = 'exampleSolutionPublicationDate',
+    COMPLAINT_ON_AUTOMATIC_ASSESSMENT = 'complaintOnAutomaticAssessment',
+    MANUAL_FEEDBACK_REQUESTS = 'manualFeedbackRequests',
+    SHOW_TEST_NAMES_TO_STUDENTS = 'showTestNamesToStudents',
+    INCLUDE_TESTS_INTO_EXAMPLE_SOLUTION = 'includeTestsIntoExampleSolution',
+    ASSESSMENT_INSTRUCTIONS = 'assessmentInstructions',
+    PRESENTATION_SCORE = 'presentationScore',
+    PLAGIARISM_CONTROL = 'plagiarismControl',
+}
+
+export type InputFieldEditModeMapping = Record<ProgrammingExerciseInputField, boolean>;
+
+export const IS_DISPLAYED_IN_SIMPLE_MODE: InputFieldEditModeMapping = {
+    // General section
+    title: true,
+    channelName: false,
+    shortName: false,
+    editRepositoriesCheckoutPath: false,
+    addAuxiliaryRepository: false,
+    categories: true,
+    // Mode section
+    difficulty: true,
+    participationMode: false,
+    allowOfflineIde: false,
+    allowOnlineCodeEditor: false,
+    allowOnlineIde: false, // refers to theia
+    // Language section
+    programmingLanguage: true,
+    projectType: false,
+    withExemplaryDependency: false,
+    packageName: true,
+    enableStaticCodeAnalysis: false,
+    sequentialTestRuns: false,
+    customizeBuildScript: false,
+    // Problem section
+    problemStatement: true,
+    linkedCompetencies: false,
+    // Grading section
+    includeExerciseInCourseScoreCalculation: true,
+    points: true,
+    bonusPoints: true,
+    submissionPolicy: false,
+    timeline: true,
+    releaseDate: true,
+    startDate: false,
+    dueDate: true,
+    runTestsAfterDueDate: false,
+    assessmentDueDate: true,
+    exampleSolutionPublicationDate: false,
+    complaintOnAutomaticAssessment: false,
+    manualFeedbackRequests: false,
+    showTestNamesToStudents: false,
+    includeTestsIntoExampleSolution: false,
+    assessmentInstructions: true,
+    presentationScore: false,
+    plagiarismControl: false,
+};
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
index 5185968f143f..fb2cd4485455 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
@@ -17,11 +17,11 @@ import { ArtemisTableModule } from 'app/shared/table/table.module';
 import { RemoveAuxiliaryRepositoryButtonComponent } from 'app/exercises/programming/manage/update/remove-auxiliary-repository-button.component';
 import { SubmissionPolicyUpdateModule } from 'app/exercises/shared/submission-policy/submission-policy-update.module';
 import { ArtemisModePickerModule } from 'app/exercises/shared/mode-picker/mode-picker.module';
-import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
-import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component';
-import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component';
-import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component';
-import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component';
+import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component';
+import { ProgrammingExerciseModeComponent } from 'app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component';
+import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component';
+import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component';
+import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component';
 import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.module';
 import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module';
 import { ExerciseUpdatePlagiarismModule } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module';
@@ -34,6 +34,10 @@ import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/e
 import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
 import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component';
+import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component';
+import { SwitchEditModeButtonComponent } from 'app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component';
+import { TitleChannelNameModule } from 'app/shared/form/title-channel-name/title-channel-name.module';
+import { CustomNotIncludedInValidatorDirective } from 'app/shared/validators/custom-not-included-in-validator.directive';
 
 @NgModule({
     imports: [
@@ -61,11 +65,15 @@ import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercis
         MonacoEditorComponent,
         ProgrammingExerciseTheiaComponent,
         ProgrammingExerciseEditCheckoutDirectoriesComponent,
+        ProgrammingExerciseDifficultyComponent,
+        SwitchEditModeButtonComponent,
+        TitleChannelNameModule,
+        CustomNotIncludedInValidatorDirective,
     ],
     declarations: [
         ProgrammingExerciseUpdateComponent,
         ProgrammingExerciseInformationComponent,
-        ProgrammingExerciseDifficultyComponent,
+        ProgrammingExerciseModeComponent,
         ProgrammingExerciseCustomAeolusBuildPlanComponent,
         ProgrammingExerciseCustomBuildPlanComponent,
         ProgrammingExerciseBuildConfigurationComponent,
diff --git a/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.html b/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.html
new file mode 100644
index 000000000000..516e01e1c5b5
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.html
@@ -0,0 +1,9 @@
+<jhi-button
+    id="switch-edit-mode-button"
+    [btnType]="ButtonType.PRIMARY"
+    [btnSize]="buttonSize()"
+    [icon]="faHandShakeAngle"
+    [title]="isSimpleMode() ? 'artemisApp.programmingExercise.home.switchToAdvancedMode' : 'artemisApp.programmingExercise.home.switchToSimpleMode'"
+    (onClick)="toggleEditMode()"
+    [disabled]="disabled()"
+/>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.ts
new file mode 100644
index 000000000000..2487314232f4
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component.ts
@@ -0,0 +1,25 @@
+import { Component, input, output } from '@angular/core';
+import { faHandshakeAngle } from '@fortawesome/free-solid-svg-icons';
+import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
+import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+
+@Component({
+    selector: 'jhi-switch-edit-mode-button',
+    standalone: true,
+    templateUrl: './switch-edit-mode-button.component.html',
+    imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule],
+})
+export class SwitchEditModeButtonComponent {
+    protected readonly faHandShakeAngle = faHandshakeAngle;
+    protected readonly ButtonType = ButtonType;
+
+    switchEditMode = output<void>();
+    isSimpleMode = input.required<boolean>();
+    buttonSize = input<ButtonSize>(ButtonSize.MEDIUM);
+    disabled = input<boolean>(true);
+
+    protected toggleEditMode(): void {
+        this.switchEditMode.emit();
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.html
new file mode 100644
index 000000000000..44060a2565ed
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.html
@@ -0,0 +1,6 @@
+<div class="form-group">
+    <label class="label-narrow" jhiTranslate="artemisApp.exercise.difficulty"></label>
+    <div>
+        <jhi-difficulty-picker [exercise]="programmingExercise()" />
+    </div>
+</div>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.ts
new file mode 100644
index 000000000000..1fb82744ccf8
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component.ts
@@ -0,0 +1,15 @@
+import { Component, input } from '@angular/core';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ArtemisDifficultyPickerModule } from 'app/exercises/shared/difficulty-picker/difficulty-picker.module';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+
+@Component({
+    selector: 'jhi-programming-exercise-difficulty',
+    standalone: true,
+    templateUrl: './programming-exercise-difficulty.component.html',
+    styleUrls: ['../../../programming-exercise-form.scss'],
+    imports: [ArtemisDifficultyPickerModule, TranslateDirective],
+})
+export class ProgrammingExerciseDifficultyComponent {
+    programmingExercise = input.required<ProgrammingExercise>();
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.html
new file mode 100644
index 000000000000..815ed56c435c
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.html
@@ -0,0 +1,139 @@
+<section class="mb-5">
+    <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle" id="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle"></h3>
+    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepMessage"></p>
+    @if (isEditFieldDisplayedRecord().includeExerciseInCourseScoreCalculation) {
+        <div class="form-group">
+            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ programmingExercise.course ? 'Course' : 'Exam' }}Label"></label>
+            <div>
+                <jhi-included-in-overall-score-picker [(includedInOverallScore)]="programmingExercise.includedInOverallScore" [allowNotIncluded]="true" />
+            </div>
+        </div>
+    }
+    <div class="row">
+        @if (isEditFieldDisplayedRecord().points) {
+            <div class="col">
+                <div class="form-group">
+                    <label class="label-narrow" jhiTranslate="artemisApp.exercise.points" for="field_points"></label>
+                    <input
+                        required
+                        type="number"
+                        class="form-control"
+                        [customMin]="1"
+                        [customMax]="9999"
+                        name="points"
+                        id="field_points"
+                        [(ngModel)]="programmingExercise.maxPoints"
+                        #maxScore="ngModel"
+                    />
+                    @if (maxScore?.invalid && (maxScore?.dirty || maxScore?.touched) && maxScore?.errors) {
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
+                    }
+                </div>
+            </div>
+        }
+        @if (isEditFieldDisplayedRecord().bonusPoints) {
+            <div class="col">
+                <div class="form-group" [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
+                    <label class="label-narrow" jhiTranslate="artemisApp.exercise.bonusPoints" for="field_bonusPoints"></label>
+                    <input
+                        type="number"
+                        [required]="programmingExercise.includedInOverallScore === IncludedInOverallScore.INCLUDED_COMPLETELY"
+                        class="form-control"
+                        [customMin]="0"
+                        [customMax]="9999"
+                        name="bonusPoints"
+                        id="field_bonusPoints"
+                        [(ngModel)]="programmingExercise.bonusPoints"
+                        #bonusPoints="ngModel"
+                    />
+                    @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
+                        <div
+                            class="alert alert-danger"
+                            [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
+                            jhiTranslate="artemisApp.exercise.bonusPointsError"
+                        ></div>
+                    }
+                </div>
+            </div>
+        }
+    </div>
+    @if (programmingExercise.staticCodeAnalysisEnabled) {
+        <div class="mt-2 mb-4">
+            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.maxStaticCodeAnalysisPenalty.title" for="field_maxPenalty"
+                >Max Static Code Analysis Penalty</label
+            >
+            <fa-icon
+                [icon]="faQuestionCircle"
+                class="text-secondary"
+                placement="auto"
+                ngbTooltip="{{ 'artemisApp.programmingExercise.maxStaticCodeAnalysisPenalty.description' | artemisTranslate }}"
+            />
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">%</span>
+                </div>
+                <input
+                    type="number"
+                    [pattern]="programmingExerciseCreationConfig.maxPenaltyPattern"
+                    class="form-control"
+                    name="maxPenalty"
+                    id="field_maxPenalty"
+                    [(ngModel)]="programmingExercise.maxStaticCodeAnalysisPenalty"
+                    #maxPenalty="ngModel"
+                />
+            </div>
+            @for (error of maxPenalty.errors! | keyvalue; track error) {
+                @if (maxPenalty.invalid && (maxPenalty.dirty || maxPenalty.touched)) {
+                    <div class="alert alert-danger">
+                        <div [jhiTranslate]="'artemisApp.exercise.form.maxPenalty' + '.' + error.key"></div>
+                    </div>
+                }
+            }
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().submissionPolicy) {
+        <div class="form-group">
+            <jhi-submission-policy-update
+                [editable]="!programmingExerciseCreationConfig.isEdit"
+                [programmingExercise]="programmingExercise"
+                (submissionPolicyTypeChange)="calculateFormStatus()"
+            />
+            @if (programmingExerciseCreationConfig.isEdit) {
+                <ngb-alert [dismissible]="false" [type]="'info'">
+                    <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.editInGradingInformation"></span>
+                    <a [href]="editPolicyUrl">
+                        <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.goToGradingToEditInformation"></span>
+                    </a>
+                </ngb-alert>
+            }
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().timeline) {
+        <div class="form-group">
+            <div>
+                <label jhiTranslate="artemisApp.programmingExercise.timeline.timelineLabel" for="timeline"></label>
+                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.timeline.timelineTooltip" />
+            </div>
+            <jhi-programming-exercise-lifecycle
+                id="timeline"
+                [exercise]="programmingExercise"
+                [isExamMode]="programmingExerciseCreationConfig.isExamMode"
+                [readOnly]="false"
+                [importOptions]="importOptions"
+                [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
+            />
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().assessmentInstructions && programmingExercise.assessmentType === AssessmentType.SEMI_AUTOMATIC) {
+        <div class="form-group">
+            <label class="form-control-label" jhiTranslate="artemisApp.exercise.assessmentInstructions" for="gradingInstructions"></label>
+            <jhi-grading-instructions-details id="gradingInstructions" [exercise]="programmingExercise" />
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().presentationScore) {
+        <jhi-presentation-score-checkbox [exercise]="programmingExercise" />
+    }
+    @if (programmingExerciseCreationConfig.showSummary) {
+        <h6>{{ getGradingSummary() }}</h6>
+    }
+</section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.ts
similarity index 91%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.ts
index 5a5c6a17c6d3..09c4b8a3ef60 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, Input, OnDestroy, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, Input, OnDestroy, ViewChild, input, signal } from '@angular/core';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
@@ -11,22 +11,24 @@ import { NgModel } from '@angular/forms';
 import { SubmissionPolicyUpdateComponent } from 'app/exercises/shared/submission-policy/submission-policy-update.component';
 import { ProgrammingExerciseLifecycleComponent } from 'app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component';
 import { ImportOptions } from 'app/types/programming-exercises';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
     selector: 'jhi-programming-exercise-grading',
     templateUrl: './programming-exercise-grading.component.html',
-    styleUrls: ['../../programming-exercise-form.scss'],
+    styleUrls: ['../../../programming-exercise-form.scss'],
 })
 export class ProgrammingExerciseGradingComponent implements AfterViewInit, OnDestroy {
-    readonly IncludedInOverallScore = IncludedInOverallScore;
-    readonly AssessmentType = AssessmentType;
-    readonly faQuestionCircle = faQuestionCircle;
+    protected readonly IncludedInOverallScore = IncludedInOverallScore;
+    protected readonly AssessmentType = AssessmentType;
+    protected readonly faQuestionCircle = faQuestionCircle;
 
     private translationBasePath = 'artemisApp.programmingExercise.wizardMode.gradingLabels.';
 
     @Input() programmingExercise: ProgrammingExercise;
     @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
     @Input() importOptions: ImportOptions;
+    isEditFieldDisplayedRecord = input.required<Record<ProgrammingExerciseInputField, boolean>>();
 
     @ViewChild(SubmissionPolicyUpdateComponent) submissionPolicyUpdateComponent?: SubmissionPolicyUpdateComponent;
     @ViewChild(ProgrammingExerciseLifecycleComponent) lifecycleComponent?: ProgrammingExerciseLifecycleComponent;
@@ -34,6 +36,8 @@ export class ProgrammingExerciseGradingComponent implements AfterViewInit, OnDes
     @ViewChild('bonusPoints') bonusPointsField?: NgModel;
     @ViewChild('maxPenalty') maxPenaltyField?: NgModel;
 
+    formValidSignal = signal<boolean>(false);
+
     formValid: boolean;
     formEmpty: boolean;
     formValidChanges = new Subject<boolean>();
@@ -60,13 +64,16 @@ export class ProgrammingExerciseGradingComponent implements AfterViewInit, OnDes
     }
 
     calculateFormStatus() {
-        this.formValid = Boolean(
+        const newFormValidValue = Boolean(
             this.maxScoreField?.valid &&
                 this.bonusPointsField?.valid &&
                 (this.maxPenaltyField?.valid || !this.programmingExercise.staticCodeAnalysisEnabled) &&
                 !this.submissionPolicyUpdateComponent?.invalid &&
                 this.lifecycleComponent?.formValid,
         );
+
+        this.formValidSignal.set(newFormValidValue);
+        this.formValid = newFormValidValue;
         this.formEmpty = this.lifecycleComponent?.formEmpty ?? false;
         this.formValidChanges.next(this.formValid);
     }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.html
similarity index 71%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.html
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.html
index acdc4cf0b5e0..79658f67ec1d 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.html
@@ -10,60 +10,67 @@
             <jhi-help-icon text="artemisApp.programmingExercise.titleTooltip" />
         </div>
         <jhi-exercise-title-channel-name
-            [exercise]="programmingExercise"
-            [course]="programmingExercise.course"
+            #titleChannelNameComponent
+            [exercise]="programmingExercise()"
+            [course]="programmingExercise().course"
             [minTitleLength]="3"
             [titlePattern]="programmingExerciseCreationConfig.titleNamePattern"
             [hideTitleLabel]="true"
-            [isExamMode]="isExamMode"
-            [isImport]="isImport"
+            [isExamMode]="isExamMode()"
+            [isImport]="isImport()"
+            [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
+            [courseId]="courseId()"
         />
     </div>
-    <div class="form-group">
-        <div>
-            <label class="label-narrow" jhiTranslate="artemisApp.exercise.shortName" for="field_shortName"></label>
-            <jhi-help-icon text="artemisApp.programmingExercise.shortNameTooltip" />
-        </div>
-        <input
-            required
-            type="text"
-            class="form-control"
-            name="shortName"
-            id="field_shortName"
-            minlength="3"
-            [pattern]="programmingExerciseCreationConfig.shortNamePattern"
-            [(ngModel)]="programmingExercise.shortName"
-            [readOnly]="!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise.id"
-            [disabled]="!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise.id"
-            #shortName="ngModel"
-        />
-        @for (error of shortName.errors! | keyvalue | removekeys: ['required']; track error) {
-            @if (shortName.invalid && (shortName.dirty || shortName.touched)) {
-                <div class="alert alert-danger">
-                    <div [jhiTranslate]="'artemisApp.exercise.form.shortName' + '.' + error.key"></div>
-                </div>
+    @if (isEditFieldDisplayedRecord().shortName) {
+        <div class="form-group">
+            <div>
+                <label class="label-narrow" jhiTranslate="artemisApp.exercise.shortName" for="field_shortName"></label>
+                <jhi-help-icon text="artemisApp.programmingExercise.shortNameTooltip" />
+            </div>
+            <input
+                required
+                type="text"
+                class="form-control"
+                name="shortName"
+                id="field_shortName"
+                minlength="3"
+                [pattern]="programmingExerciseCreationConfig.shortNamePattern"
+                [(ngModel)]="programmingExercise().shortName"
+                [readOnly]="!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise().id"
+                [disabled]="!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise().id"
+                notIncludedIn
+                [disallowedValues]="alreadyUsedShortNames()"
+                #shortName="ngModel"
+            />
+            @for (error of shortName.errors! | keyvalue | removekeys: ['required']; track error.key) {
+                @if (shortName.invalid && (shortName.dirty || shortName.touched)) {
+                    <div class="alert alert-danger">
+                        <div [jhiTranslate]="'artemisApp.exercise.form.shortName' + '.' + error.key"></div>
+                    </div>
+                }
             }
-        }
-    </div>
-    @if (programmingExercise.shortName && !shortName.invalid) {
+        </div>
+    }
+    @if (programmingExercise().shortName && isShortNameFieldValid()) {
         <div class="form-group">
             <div>
                 <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.preview.label"></label>
-                <jhi-help-icon [text]="isLocal ? 'artemisApp.programmingExercise.preview.tooltipLocalVC' : 'artemisApp.programmingExercise.preview.tooltip'" />
+                <jhi-help-icon [text]="isLocal() ? 'artemisApp.programmingExercise.preview.tooltipLocalVC' : 'artemisApp.programmingExercise.preview.tooltip'" />
             </div>
             <jhi-programming-exercise-repository-and-build-plan-details
-                [programmingExercise]="programmingExercise"
+                [programmingExercise]="programmingExercise()"
                 [programmingLanguage]="programmingExerciseCreationConfig.selectedProgrammingLanguage"
-                [isLocal]="isLocal"
-                [checkoutSolutionRepository]="programmingExercise.buildConfig?.checkoutSolutionRepository"
+                [isLocal]="isLocal()"
+                [checkoutSolutionRepository]="programmingExercise().buildConfig?.checkoutSolutionRepository"
                 (submissionBuildPlanEvent)="updateSubmissionBuildPlanCheckoutDirectories($event)"
                 [isCreateOrEdit]="true"
                 [isEditMode]="programmingExerciseCreationConfig.isEdit"
-                [programmingExerciseBuildConfig]="programmingExercise.buildConfig"
+                [programmingExerciseBuildConfig]="programmingExercise().buildConfig"
             />
-            @if (editRepositoryCheckoutPath && isLocal && !isImport && !programmingExerciseCreationConfig.isEdit) {
+            @if (editRepositoryCheckoutPath && isLocal() && !isImport() && !programmingExerciseCreationConfig.isEdit && isEditFieldDisplayedRecord().editRepositoriesCheckoutPath) {
                 <jhi-programming-exercise-edit-checkout-directories
-                    [programmingExercise]="programmingExercise"
+                    [programmingExercise]="programmingExercise()"
                     [submissionBuildPlanCheckoutRepositories]="submissionBuildPlanCheckoutRepositories"
                     (assignmentCheckoutPathEvent)="onAssigmentRepositoryCheckoutPathChange($event)"
                     (testCheckoutPathEvent)="onTestRepositoryCheckoutPathChange($event)"
@@ -73,7 +80,11 @@
             }
             @if (!programmingExerciseCreationConfig.isImportFromExistingExercise && programmingExerciseCreationConfig.auxiliaryRepositoriesSupported) {
                 <div class="form-group">
-                    @if (programmingExercise.auxiliaryRepositories && programmingExercise.auxiliaryRepositories.length > 0) {
+                    @if (
+                        programmingExercise().auxiliaryRepositories &&
+                        programmingExercise().auxiliaryRepositories!.length > 0 &&
+                        isEditFieldDisplayedRecord().addAuxiliaryRepository
+                    ) {
                         <ngx-datatable
                             id="auxiliaryRepositoryTable"
                             class="bootstrap"
@@ -82,7 +93,7 @@
                             [limit]="20"
                             [columnMode]="'force'"
                             [rowHeight]="'auto'"
-                            [rows]="programmingExercise.auxiliaryRepositories"
+                            [rows]="programmingExercise().auxiliaryRepositories"
                         >
                             <ngx-datatable-column [name]="'artemisApp.programmingExercise.auxiliaryRepository.repositoryName' | artemisTranslate" prop="repositoryName">
                                 <ng-template ngx-datatable-cell-template let-row="row">
@@ -117,7 +128,7 @@
                                 <ng-template ngx-datatable-cell-template let-row="row">
                                     <jhi-remove-auxiliary-repository-button
                                         placement="right auto"
-                                        [programmingExercise]="programmingExercise"
+                                        [programmingExercise]="programmingExercise()"
                                         (onRefresh)="programmingExerciseCreationConfig.refreshAuxiliaryRepositoryChecks()"
                                         [row]="row"
                                         class="ml-2"
@@ -136,12 +147,12 @@
                             }
                         </ngb-alert>
                     }
-                    @if (programmingExerciseCreationConfig && !isLocal) {
+                    @if (programmingExerciseCreationConfig && !isLocal()) {
                         <ngb-alert [dismissible]="false" [type]="'info'">
                             <span jhiTranslate="artemisApp.programmingExercise.auxiliaryRepository.warning"></span>
                         </ngb-alert>
                     }
-                    @if (isLocal && !isImport && !programmingExerciseCreationConfig.isEdit) {
+                    @if (isLocal() && !isImport() && !programmingExerciseCreationConfig.isEdit && isEditFieldDisplayedRecord().editRepositoriesCheckoutPath) {
                         <jhi-button
                             [btnType]="ButtonType.WARNING"
                             [btnSize]="ButtonSize.SMALL"
@@ -150,12 +161,14 @@
                             (onClick)="toggleEditRepositoryCheckoutPath()"
                         />
                     }
-                    <jhi-add-auxiliary-repository-button
-                        [programmingExercise]="programmingExercise"
-                        (onRefresh)="programmingExerciseCreationConfig.refreshAuxiliaryRepositoryChecks()"
-                        class="ml-2"
-                    />
-                    <jhi-help-icon text="artemisApp.programmingExercise.auxiliaryRepository.usageDescription" />
+                    @if (isEditFieldDisplayedRecord().addAuxiliaryRepository) {
+                        <jhi-add-auxiliary-repository-button
+                            [programmingExercise]="programmingExercise()"
+                            (onRefresh)="programmingExerciseCreationConfig.refreshAuxiliaryRepositoryChecks()"
+                            class="ml-2"
+                        />
+                        <jhi-help-icon text="artemisApp.programmingExercise.auxiliaryRepository.usageDescription" />
+                    }
                 </div>
             }
         </div>
@@ -170,7 +183,7 @@
                         type="checkbox"
                         name="recreateBuildPlans"
                         id="field_recreateBuildPlans"
-                        [(ngModel)]="importOptions.recreateBuildPlans"
+                        [(ngModel)]="importOptions().recreateBuildPlans"
                         (change)="programmingExerciseCreationConfig.recreateBuildPlanOrUpdateTemplateChange()"
                     />
                     <span jhiTranslate="artemisApp.programmingExercise.recreateBuildPlans.title"></span>
@@ -180,8 +193,8 @@
         }
         @if (
             programmingExerciseCreationConfig.isImportFromExistingExercise &&
-            programmingExercise.projectType !== ProjectType.PLAIN_GRADLE &&
-            programmingExercise.projectType !== ProjectType.GRADLE_GRADLE
+            programmingExercise().projectType !== ProjectType.PLAIN_GRADLE &&
+            programmingExercise().projectType !== ProjectType.GRADLE_GRADLE
         ) {
             <div class="form-check">
                 <label class="form-check-label" for="field_updateTemplateFiles">
@@ -191,7 +204,7 @@
                         type="checkbox"
                         name="updateTemplateFiles"
                         id="field_updateTemplateFiles"
-                        [(ngModel)]="importOptions.updateTemplate"
+                        [(ngModel)]="importOptions().updateTemplate"
                         (change)="programmingExerciseCreationConfig.recreateBuildPlanOrUpdateTemplateChange()"
                     />
                     <span jhiTranslate="artemisApp.programmingExercise.updateTemplate.title"></span>
@@ -200,7 +213,7 @@
             </div>
         }
     </div>
-    @if (!programmingExerciseCreationConfig.isExamMode) {
+    @if (!programmingExerciseCreationConfig.isExamMode && isEditFieldDisplayedRecord().categories) {
         <div id="creation-config-selector">
             <div>
                 <label class="label-narrow" jhiTranslate="artemisApp.exercise.categories"></label>
@@ -213,4 +226,7 @@
             />
         </div>
     }
+    @if (isSimpleMode()) {
+        <jhi-programming-exercise-difficulty [programmingExercise]="programmingExercise()" />
+    }
 </section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.scss b/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.scss
similarity index 100%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.scss
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.scss
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.ts
new file mode 100644
index 000000000000..78158c26e1ce
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component.ts
@@ -0,0 +1,318 @@
+import {
+    AfterViewInit,
+    Component,
+    Input,
+    OnChanges,
+    OnDestroy,
+    QueryList,
+    SimpleChanges,
+    ViewChild,
+    ViewChildren,
+    effect,
+    inject,
+    input,
+    model,
+    signal,
+    viewChild,
+} from '@angular/core';
+import { NgModel } from '@angular/forms';
+import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
+import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
+import { Subject, Subscription } from 'rxjs';
+import { TableEditableFieldComponent } from 'app/shared/table/table-editable-field.component';
+import { every } from 'lodash-es';
+import { ImportOptions } from 'app/types/programming-exercises';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
+import { removeSpecialCharacters } from 'app/shared/util/utils';
+import { CourseExistingExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
+import { AlertService } from 'app/core/util/alert.service';
+import { ExerciseType } from 'app/entities/exercise.model';
+import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
+import { faPlus } from '@fortawesome/free-solid-svg-icons';
+import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component';
+import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto';
+
+const MAXIMUM_TRIES_TO_GENERATE_UNIQUE_SHORT_NAME = 200;
+
+@Component({
+    selector: 'jhi-programming-exercise-info',
+    templateUrl: './programming-exercise-information.component.html',
+    styleUrls: ['../../../programming-exercise-form.scss', 'programming-exercise-information.component.scss'],
+})
+export class ProgrammingExerciseInformationComponent implements AfterViewInit, OnChanges, OnDestroy {
+    protected readonly ProjectType = ProjectType;
+    protected readonly ButtonType = ButtonType;
+    protected readonly ButtonSize = ButtonSize;
+    protected readonly faPlus = faPlus;
+
+    @Input({ required: true }) programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+    isImport = input.required<boolean>();
+    isExamMode = input.required<boolean>();
+    programmingExercise = input.required<ProgrammingExercise>();
+    isLocal = input.required<boolean>();
+    importOptions = input.required<ImportOptions>();
+    isSimpleMode = input.required<boolean>();
+    isEditFieldDisplayedRecord = input.required<Record<ProgrammingExerciseInputField, boolean>>();
+    courseId = input<number>();
+    isAuxiliaryRepositoryInputValid = model.required<boolean>();
+
+    exerciseTitleChannelComponent = viewChild<ExerciseTitleChannelNameComponent>('titleChannelNameComponent');
+    @ViewChildren(TableEditableFieldComponent) tableEditableFields?: QueryList<TableEditableFieldComponent>;
+
+    shortNameField = viewChild<NgModel>('shortName');
+    @ViewChild('checkoutSolutionRepository') checkoutSolutionRepositoryField?: NgModel;
+    @ViewChild('recreateBuildPlans') recreateBuildPlansField?: NgModel;
+    @ViewChild('updateTemplateFiles') updateTemplateFilesField?: NgModel;
+    @ViewChild('titleChannelNameComponent') titleComponent?: ExerciseTitleChannelNameComponent;
+    @ViewChild(ProgrammingExerciseEditCheckoutDirectoriesComponent) programmingExerciseEditCheckoutDirectories?: ProgrammingExerciseEditCheckoutDirectoriesComponent;
+
+    private readonly exerciseService: ExerciseService = inject(ExerciseService);
+    private readonly alertService: AlertService = inject(AlertService);
+
+    isShortNameFieldValid = signal<boolean>(false);
+    isShortNameFromAdvancedMode = signal<boolean>(false);
+
+    formValid: boolean;
+    formValidChanges = new Subject<boolean>();
+
+    inputFieldSubscriptions: (Subscription | undefined)[] = [];
+
+    alreadyUsedExerciseNames = signal<Set<string>>(new Set());
+    alreadyUsedShortNames = signal<Set<string>>(new Set());
+
+    exerciseTitle = signal<string | undefined>(undefined);
+
+    editRepositoryCheckoutPath: boolean = false;
+    submissionBuildPlanCheckoutRepositories: BuildPlanCheckoutDirectoriesDTO;
+
+    constructor() {
+        effect(
+            () => {
+                this.defineShortNameOnEditModeChangeIfNotDefinedInAdvancedMode();
+            },
+            { allowSignalWrites: true },
+        );
+
+        effect(
+            () => {
+                this.generateShortNameWhenInSimpleMode();
+            },
+            { allowSignalWrites: true },
+        );
+
+        effect(() => {
+            this.registerInputFieldsWhenChildComponentsAreReady();
+        });
+
+        effect(() => {
+            this.fetchAndInitializeTakenTitlesAndShortNames();
+        });
+    }
+
+    ngAfterViewInit() {
+        this.registerInputFields();
+    }
+
+    ngOnChanges(changes: SimpleChanges) {
+        if (changes.programmingExercise) {
+            this.exerciseTitle.set(this.programmingExercise().title);
+        }
+    }
+
+    ngOnDestroy(): void {
+        for (const subscription of this.inputFieldSubscriptions) {
+            subscription?.unsubscribe();
+        }
+    }
+
+    registerInputFields() {
+        this.inputFieldSubscriptions.forEach((subscription) => subscription?.unsubscribe());
+
+        this.inputFieldSubscriptions.push(this.exerciseTitleChannelComponent()?.titleChannelNameComponent?.formValidChanges.subscribe(() => this.calculateFormValid()));
+        this.inputFieldSubscriptions.push(this.shortNameField()?.valueChanges?.subscribe(() => this.calculateFormValid()));
+        this.inputFieldSubscriptions.push(this.checkoutSolutionRepositoryField?.valueChanges?.subscribe(() => this.calculateFormValid()));
+        this.inputFieldSubscriptions.push(this.recreateBuildPlansField?.valueChanges?.subscribe(() => this.calculateFormValid()));
+        this.inputFieldSubscriptions.push(this.updateTemplateFilesField?.valueChanges?.subscribe(() => this.calculateFormValid()));
+        this.inputFieldSubscriptions.push(this.programmingExerciseEditCheckoutDirectories?.formValidChanges.subscribe(() => this.calculateFormValid()));
+        this.tableEditableFields?.changes.subscribe((fields: QueryList<TableEditableFieldComponent>) => {
+            fields.toArray().forEach((field) => this.inputFieldSubscriptions.push(field.editingInput.valueChanges?.subscribe(() => this.calculateFormValid())));
+        });
+
+        this.titleComponent?.titleChannelNameComponent?.field_title?.valueChanges?.subscribe((newTitle: string) => {
+            if (this.isSimpleMode()) {
+                this.updateShortName(newTitle);
+            }
+        });
+
+        this.shortNameField()?.valueChanges?.subscribe(() => {
+            this.updateIsShortNameValid();
+        });
+    }
+
+    updateShortName(newTitle: string) {
+        this.exerciseTitle.set(newTitle);
+    }
+
+    calculateFormValid() {
+        const isCheckoutSolutionRepositoryValid = this.isCheckoutSolutionRepositoryValid();
+        const isRecreateBuildPlansValid = this.isRecreateBuildPlansValid();
+        const isUpdateTemplateFilesValid = this.isUpdateTemplateFilesValid();
+        const areAuxiliaryRepositoriesValid = this.areAuxiliaryRepositoriesValid();
+        const areCheckoutPathsValid = this.areCheckoutPathsValid();
+        this.formValid = Boolean(
+            this.exerciseTitleChannelComponent()?.titleChannelNameComponent?.formValidSignal() &&
+                this.getIsShortNameFieldValid() &&
+                isCheckoutSolutionRepositoryValid &&
+                isRecreateBuildPlansValid &&
+                isUpdateTemplateFilesValid &&
+                areAuxiliaryRepositoriesValid &&
+                areCheckoutPathsValid,
+        );
+        this.formValidChanges.next(this.formValid);
+    }
+
+    areAuxiliaryRepositoriesValid(): boolean {
+        const areAuxiliaryRepositoriesValid =
+            (every(
+                this.tableEditableFields?.map((field) => field.editingInput.valid),
+                Boolean,
+            ) &&
+                !this.programmingExerciseCreationConfig.auxiliaryRepositoryDuplicateDirectories &&
+                !this.programmingExerciseCreationConfig.auxiliaryRepositoryDuplicateNames) ||
+            !this.programmingExercise().auxiliaryRepositories?.length;
+
+        const isAuxRepoEditingPossibleInCurrentEditMode = !this.isSimpleMode() || this.isEditFieldDisplayedRecord().addAuxiliaryRepository;
+        if (isAuxRepoEditingPossibleInCurrentEditMode) {
+            // if editing is not possible the field will not be displayed and validity checks will evaluate to true,
+            // even if the actual current setting is invalid
+            this.isAuxiliaryRepositoryInputValid.set(areAuxiliaryRepositoriesValid);
+        }
+        return areAuxiliaryRepositoriesValid;
+    }
+
+    isUpdateTemplateFilesValid(): boolean {
+        return (
+            this.updateTemplateFilesField?.valid ||
+            !this.programmingExerciseCreationConfig.isImportFromExistingExercise ||
+            this.programmingExercise().projectType === ProjectType.PLAIN_GRADLE ||
+            this.programmingExercise().projectType === ProjectType.GRADLE_GRADLE
+        );
+    }
+
+    isRecreateBuildPlansValid(): boolean {
+        return this.recreateBuildPlansField?.valid || !this.programmingExerciseCreationConfig.isImportFromExistingExercise;
+    }
+
+    isCheckoutSolutionRepositoryValid(): boolean {
+        return Boolean(
+            this.checkoutSolutionRepositoryField?.valid ||
+                this.programmingExercise().id ||
+                !this.programmingExercise().programmingLanguage ||
+                !this.programmingExerciseCreationConfig.checkoutSolutionRepositoryAllowed,
+        );
+    }
+
+    areCheckoutPathsValid(): boolean {
+        return Boolean(
+            !this.programmingExerciseEditCheckoutDirectories ||
+                (this.programmingExerciseEditCheckoutDirectories.formValid &&
+                    this.programmingExerciseEditCheckoutDirectories.areValuesUnique([
+                        this.programmingExercise().buildConfig?.assignmentCheckoutPath,
+                        this.programmingExercise().buildConfig?.testCheckoutPath,
+                        this.programmingExercise().buildConfig?.solutionCheckoutPath,
+                    ])),
+        );
+    }
+
+    toggleEditRepositoryCheckoutPath() {
+        this.editRepositoryCheckoutPath = !this.editRepositoryCheckoutPath;
+    }
+
+    updateSubmissionBuildPlanCheckoutDirectories(buildPlanCheckoutDirectoriesDTO: BuildPlanCheckoutDirectoriesDTO) {
+        this.submissionBuildPlanCheckoutRepositories = buildPlanCheckoutDirectoriesDTO;
+    }
+
+    onAssigmentRepositoryCheckoutPathChange(event: string) {
+        this.programmingExercise().buildConfig!.assignmentCheckoutPath = event;
+        // We need to create a new object to trigger the change detection
+        this.programmingExercise().buildConfig = { ...this.programmingExercise().buildConfig };
+    }
+
+    onTestRepositoryCheckoutPathChange(event: string) {
+        this.programmingExercise().buildConfig!.testCheckoutPath = event;
+        // We need to create a new object to trigger the change detection
+        this.programmingExercise().buildConfig = { ...this.programmingExercise().buildConfig };
+    }
+
+    onSolutionRepositoryCheckoutPathChange(event: string) {
+        this.programmingExercise().buildConfig!.solutionCheckoutPath = event;
+        // We need to create a new object to trigger the change detection
+        this.programmingExercise().buildConfig = { ...this.programmingExercise().buildConfig };
+    }
+
+    private registerInputFieldsWhenChildComponentsAreReady() {
+        this.shortNameField(); // triggers effect
+        this.registerInputFields();
+    }
+
+    private fetchAndInitializeTakenTitlesAndShortNames() {
+        const courseId = this.courseId() ?? this.programmingExercise().course?.id;
+        if (courseId) {
+            this.exerciseService.getExistingExerciseDetailsInCourse(courseId, ExerciseType.PROGRAMMING).subscribe((exerciseDetails: CourseExistingExerciseDetailsType) => {
+                this.alreadyUsedExerciseNames.set(exerciseDetails.exerciseTitles ?? new Set());
+                this.alreadyUsedShortNames.set(exerciseDetails.shortNames ?? new Set());
+            });
+        }
+    }
+
+    private generateShortNameWhenInSimpleMode() {
+        const shouldNotGenerateShortName = !this.isSimpleMode() || this.programmingExerciseCreationConfig.isEdit;
+        if (shouldNotGenerateShortName) {
+            this.isShortNameFromAdvancedMode.set(this.isShortNameFieldValid());
+            return;
+        }
+        let newShortName = this.exerciseTitle() ?? this.programmingExercise().title;
+        if (this.isImport() || this.isShortNameFromAdvancedMode()) {
+            newShortName = this.programmingExercise().shortName;
+        }
+
+        if (newShortName && newShortName.length > 3) {
+            const sanitizedShortName = removeSpecialCharacters(newShortName ?? '');
+            // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability
+            const uniqueShortName = this.ensureShortNameIsUnique(sanitizedShortName);
+            this.programmingExercise().shortName = uniqueShortName;
+        }
+
+        this.updateIsShortNameValid();
+    }
+
+    private defineShortNameOnEditModeChangeIfNotDefinedInAdvancedMode() {
+        if (this.isSimpleMode()) {
+            this.updateIsShortNameValid();
+            this.calculateFormValid();
+        }
+    }
+
+    private updateIsShortNameValid() {
+        this.isShortNameFieldValid.set(this.getIsShortNameFieldValid());
+    }
+
+    private getIsShortNameFieldValid() {
+        return this.shortNameField() === undefined || this.shortNameField()?.control?.status === 'VALID' || this.shortNameField()?.control?.status === 'DISABLED';
+    }
+
+    private ensureShortNameIsUnique(shortName: string): string {
+        let newShortName = shortName;
+        let counter = 1;
+        while (this.alreadyUsedShortNames().has(newShortName)) {
+            if (counter > MAXIMUM_TRIES_TO_GENERATE_UNIQUE_SHORT_NAME) {
+                this.alertService.error('artemisApp.error.shortNameGenerationFailed');
+                break;
+            }
+            newShortName = `${shortName}${counter}`;
+            counter++;
+        }
+        return newShortName;
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.html
new file mode 100644
index 000000000000..7b60308b7091
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.html
@@ -0,0 +1,240 @@
+<section>
+    <h3
+        jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle"
+        id="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle"
+    ></h3>
+    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepMessage"></p>
+    @if (isEditFieldDisplayedRecord().programmingLanguage) {
+        <div class="form-group">
+            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.programmingLanguage" for="field_programmingLanguage"></label>
+            <select
+                #select="ngModel"
+                required
+                class="form-select"
+                [ngModel]="programmingExerciseCreationConfig.selectedProgrammingLanguage"
+                (ngModelChange)="select.model = programmingExerciseCreationConfig.onProgrammingLanguageChange($event)"
+                name="programmingLanguage"
+                id="field_programmingLanguage"
+                [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
+            >
+                @for (supportedLanguage of programmingExerciseCreationConfig.supportedLanguages; track supportedLanguage) {
+                    <option [value]="supportedLanguage" [jhiTranslate]="'artemisApp.ProgrammingLanguage.' + supportedLanguage"></option>
+                }
+            </select>
+        </div>
+    }
+    @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.projectTypes?.length && programmingExerciseCreationConfig.modePickerOptions) {
+        <div class="form-group mt-2">
+            @if (isEditFieldDisplayedRecord().projectType) {
+                <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.projectType" for="field_projectType"> </label>
+                <jhi-mode-picker
+                    required
+                    [options]="programmingExerciseCreationConfig.modePickerOptions"
+                    [value]="programmingExerciseCreationConfig.selectedProjectType"
+                    (valueChange)="programmingExerciseCreationConfig.onProjectTypeChange($event!)"
+                    [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || programmingExerciseCreationConfig.isImportFromFile || !!programmingExercise.id"
+                    name="projectType"
+                    id="field_projectType"
+                />
+            }
+            @if (
+                isEditFieldDisplayedRecord().withExemplaryDependency &&
+                !programmingExerciseCreationConfig.isImportFromExistingExercise &&
+                !programmingExerciseCreationConfig.isImportFromFile &&
+                !programmingExercise.id &&
+                programmingExercise.programmingLanguage === ProgrammingLanguage.JAVA &&
+                programmingExercise.projectType !== ProjectType.MAVEN_BLACKBOX
+            ) {
+                <div class="form-check mt-2">
+                    <input
+                        class="form-check-input"
+                        type="checkbox"
+                        name="withDependencies"
+                        id="field_with_dependencies"
+                        [(ngModel)]="programmingExerciseCreationConfig.withDependencies"
+                        (ngModelChange)="programmingExerciseCreationConfig.onWithDependenciesChanged($event)"
+                        checked
+                    />
+                    <span jhiTranslate="artemisApp.programmingExercise.withDependencies"></span>
+                    <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.withDependenciesTooltip" />
+                </div>
+            }
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().packageName) {
+        @if (programmingExercise.programmingLanguage === ProgrammingLanguage.EMPTY) {
+            <div>
+                <p>
+                    <fa-icon [icon]="faExclamationTriangle" size="xl" class="text-warning"></fa-icon>
+                    <span jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.title" [translateValues]="{ documentationLink: DOCUMENTATION_LINK }"></span>
+                </p>
+                <ol>
+                    <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.setImage" [translateValues]="DOCKER_REGISTRY_LINKS"></li>
+                    <li>
+                        <p jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.title" class="mb-0"></p>
+                        <ol>
+                            <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.dependencies"></li>
+                            <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.runTests"></li>
+                            <li
+                                jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.moveResults"
+                                [translateValues]="{ resultsDirectory: './results/' }"
+                            ></li>
+                        </ol>
+                    </li>
+                    <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushExercise" [translateValues]="{ checkoutDirectory: './assignment/' }"></li>
+                    <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushSolution"></li>
+                    <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushTest" [translateValues]="{ checkoutDirectory: './' }"></li>
+                </ol>
+            </div>
+        }
+        @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.packageNameRequired && programmingExercise.projectType !== ProjectType.XCODE) {
+            <div class="form-group">
+                <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.packageName" for="field_packageName"></label>
+                <input
+                    required
+                    type="text"
+                    [pattern]="programmingExerciseCreationConfig.packageNamePattern"
+                    class="form-control"
+                    name="packageName"
+                    id="field_packageName"
+                    [(ngModel)]="programmingExercise.packageName"
+                    [readonly]="programmingExercise.id"
+                    #packageName="ngModel"
+                    [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
+                />
+                @for (e of packageName.errors! | keyvalue | removekeys: ['required']; track e) {
+                    @if (packageName.invalid && (packageName.dirty || packageName.touched)) {
+                        <div class="alert alert-danger">
+                            @if (programmingExercise.projectType === ProjectType.MAVEN_BLACKBOX) {
+                                <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage + '_BLACKBOX'"></div>
+                            }
+                            @if (programmingExercise.projectType !== ProjectType.MAVEN_BLACKBOX) {
+                                <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage"></div>
+                            }
+                        </div>
+                    }
+                }
+            </div>
+        }
+        @if (programmingExercise.programmingLanguage === ProgrammingLanguage.SWIFT && programmingExercise.projectType === ProjectType.XCODE) {
+            <div class="form-group">
+                <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.appName" for="field_packageName"></label>
+                <input
+                    required
+                    type="text"
+                    [pattern]="programmingExerciseCreationConfig.appNamePatternForSwift"
+                    class="form-control"
+                    name="packageName"
+                    id="field_appName"
+                    [(ngModel)]="programmingExercise.packageName"
+                    [readonly]="programmingExercise.id"
+                    #packageName="ngModel"
+                    [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
+                />
+                @for (e of packageName.errors! | keyvalue | removekeys: ['required']; track e) {
+                    @if (packageName.invalid && (packageName.dirty || packageName.touched)) {
+                        <div class="alert alert-danger">
+                            <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage"></div>
+                        </div>
+                    }
+                }
+            </div>
+        }
+    }
+
+    <!-- Theia Image Selection -->
+    @if (programmingExercise.allowOnlineIde && programmingExercise.programmingLanguage) {
+        <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.theiaImage.title"></label>
+        <jhi-programming-exercise-theia [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="programmingExerciseCreationConfig" />
+    }
+
+    <!-- Static code analysis checkbox -->
+    @if (isEditFieldDisplayedRecord().enableStaticCodeAnalysis && programmingExercise.programmingLanguage && programmingExerciseCreationConfig.staticCodeAnalysisAllowed) {
+        <div>
+            <div class="form-check custom-control custom-checkbox">
+                <input
+                    type="checkbox"
+                    class="form-check-input custom-control-input"
+                    id="field_staticCodeAnalysisEnabled"
+                    name="staticCodeAnalysisEnabled"
+                    [disabled]="
+                        !!programmingExercise.buildConfig?.sequentialTestRuns || (!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise.id)
+                    "
+                    [(ngModel)]="programmingExercise.staticCodeAnalysisEnabled"
+                    (change)="programmingExerciseCreationConfig.onStaticCodeAnalysisChanged()"
+                />
+                <label
+                    class="form-check-label custom-control-label"
+                    for="field_staticCodeAnalysisEnabled"
+                    jhiTranslate="artemisApp.programmingExercise.enableStaticCodeAnalysis.title"
+                >
+                    Enable Static Code Analysis</label
+                >
+                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.enableStaticCodeAnalysis.description" />
+            </div>
+        </div>
+    }
+    <!-- Sequential Test Runs checkbox
+    It would be very complicated to change the sequential test run feature after an exercise is created, which is why it can only be activated if the exercise was not yet created.-->
+    @if (isEditFieldDisplayedRecord().sequentialTestRuns && programmingExerciseCreationConfig.sequentialTestRunsAllowed) {
+        <div>
+            <div class="form-check custom-control custom-checkbox">
+                <input
+                    class="form-check-input"
+                    type="checkbox"
+                    name="sequentialTestRuns"
+                    id="field_sequentialTestRuns"
+                    [disabled]="!!programmingExercise.id || !!programmingExercise.staticCodeAnalysisEnabled || !!programmingExercise.buildConfig!.testwiseCoverageEnabled"
+                    [(ngModel)]="programmingExercise.buildConfig!.sequentialTestRuns"
+                    checked
+                />
+                <label class="form-check-label custom-control-label" for="field_sequentialTestRuns" jhiTranslate="artemisApp.programmingExercise.sequentialTestRuns.title">
+                    >Sequential Test Runs</label
+                >
+                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.sequentialTestRuns.description" />
+            </div>
+        </div>
+    }
+    <!-- Testwise Coverage checkbox-->
+    @if (programmingExerciseCreationConfig.testwiseCoverageAnalysisSupported) {
+        <div class="form-check custom-control custom-checkbox">
+            <input
+                class="form-check-input"
+                type="checkbox"
+                name="testwiseCoverageEnabled"
+                id="field_testwiseCoverageEnabled"
+                [disabled]="!!programmingExercise.buildConfig!.sequentialTestRuns || !!programmingExercise.id"
+                [(ngModel)]="programmingExercise.buildConfig!.testwiseCoverageEnabled"
+                checked
+            />
+            <label class="form-check-label custom-control-label" for="field_testwiseCoverageEnabled" jhiTranslate="artemisApp.programmingExercise.recordTestwiseCoverage"></label>
+            <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.recordTestwiseCoverageTooltip" />
+        </div>
+    }
+    @if (!programmingExercise.id && programmingExercise.programmingLanguage && programmingExerciseCreationConfig.checkoutSolutionRepositoryAllowed) {
+        <div class="form-check">
+            <label class="form-check-label" for="field_checkoutSolutionRepository">
+                <input
+                    #checkoutSolutionRepository="ngModel"
+                    class="form-check-input"
+                    type="checkbox"
+                    name="checkoutSolutionRepository"
+                    id="field_checkoutSolutionRepository"
+                    [(ngModel)]="programmingExercise.buildConfig!.checkoutSolutionRepository"
+                />
+                <span jhiTranslate="artemisApp.programmingExercise.checkoutSolutionRepository.title"></span>
+                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.checkoutSolutionRepository.description" />
+            </label>
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().customizeBuildScript) {
+        @if (programmingExerciseCreationConfig.customBuildPlansSupported === PROFILE_LOCALCI) {
+            <jhi-programming-exercise-custom-build-plan [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="this.programmingExerciseCreationConfig" />
+        } @else if (programmingExerciseCreationConfig.customBuildPlansSupported === PROFILE_AEOLUS) {
+            <jhi-programming-exercise-custom-aeolus-build-plan
+                [programmingExercise]="programmingExercise"
+                [programmingExerciseCreationConfig]="this.programmingExerciseCreationConfig"
+            />
+        }
+    }
+</section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.ts
similarity index 92%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.ts
index 7514543ec6e9..5f9bae769c84 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewChecked, AfterViewInit, Component, EventEmitter, Input, OnDestroy, ViewChild } from '@angular/core';
+import { AfterViewChecked, AfterViewInit, Component, EventEmitter, Input, OnDestroy, ViewChild, input } from '@angular/core';
 import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
@@ -8,18 +8,20 @@ import { Subject, Subscription } from 'rxjs';
 import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component';
 import { ProgrammingExerciseCustomBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component';
 import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
     selector: 'jhi-programming-exercise-language',
     templateUrl: './programming-exercise-language.component.html',
-    styleUrls: ['../../programming-exercise-form.scss'],
+    styleUrls: ['../../../programming-exercise-form.scss'],
 })
 export class ProgrammingExerciseLanguageComponent implements AfterViewChecked, AfterViewInit, OnDestroy {
     readonly ProgrammingLanguage = ProgrammingLanguage;
     readonly ProjectType = ProjectType;
 
-    @Input() programmingExercise: ProgrammingExercise;
-    @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+    @Input({ required: true }) programmingExercise: ProgrammingExercise;
+    @Input({ required: true }) programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+    isEditFieldDisplayedRecord = input.required<Record<ProgrammingExerciseInputField, boolean>>();
 
     @ViewChild('select') selectLanguageField: NgModel;
     @ViewChild('packageName') packageNameField?: NgModel;
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.html
similarity index 60%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.html
index 59cc94f7c1ba..aa2b6df8bc7d 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.html
@@ -4,50 +4,51 @@
         id="artemisApp.programmingExercise.wizardMode.detailedSteps.difficultyStepTitle"
     ></h3>
     <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.difficultyStepMessage"></p>
-    <div class="form-group">
-        <label class="label-narrow" jhiTranslate="artemisApp.exercise.difficulty"></label>
-        <div>
-            <jhi-difficulty-picker [exercise]="programmingExercise" />
+    @if (isEditFieldDisplayedRecord().difficulty) {
+        <jhi-programming-exercise-difficulty [programmingExercise]="programmingExercise" />
+    }
+    @if (isEditFieldDisplayedRecord().participationMode) {
+        <div class="form-group">
+            <jhi-team-config-form-group class="form-element" [exercise]="programmingExercise" [isImport]="programmingExerciseCreationConfig.isImportFromExistingExercise" />
         </div>
-    </div>
+    }
     <div class="form-group">
-        <jhi-team-config-form-group class="form-element" [exercise]="programmingExercise" [isImport]="programmingExerciseCreationConfig.isImportFromExistingExercise" />
-    </div>
-    <div class="form-group">
-        <div class="form-check">
-            <label [class]="!programmingExerciseCreationConfig.validIdeSelection() ? 'form-check-label text-danger' : 'form-check-label'" for="field_allowOfflineIde">
-                <input
-                    class="form-check-input"
-                    type="checkbox"
-                    name="allowOfflineIde"
-                    id="field_allowOfflineIde"
-                    [(ngModel)]="programmingExercise.allowOfflineIde"
-                    checked
-                    (ngModelChange)="triggerValidation.emit()"
-                />
-                <span jhiTranslate="artemisApp.programmingExercise.allowOfflineIde.title"></span>
-                @if (!programmingExerciseCreationConfig.validIdeSelection()) {
-                    @if (theiaEnabled) {
-                        <fa-icon
-                            [icon]="faQuestionCircle"
-                            class="text-danger"
-                            [placement]="'top'"
-                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alert' | artemisTranslate }}"
-                        />
+        @if (isEditFieldDisplayedRecord().allowOfflineIde) {
+            <div class="form-check">
+                <label [class]="!programmingExerciseCreationConfig.validIdeSelection() ? 'form-check-label text-danger' : 'form-check-label'" for="field_allowOfflineIde">
+                    <input
+                        class="form-check-input"
+                        type="checkbox"
+                        name="allowOfflineIde"
+                        id="field_allowOfflineIde"
+                        [(ngModel)]="programmingExercise.allowOfflineIde"
+                        checked
+                        (ngModelChange)="triggerValidation.emit()"
+                    />
+                    <span jhiTranslate="artemisApp.programmingExercise.allowOfflineIde.title"></span>
+                    @if (!programmingExerciseCreationConfig.validIdeSelection()) {
+                        @if (theiaEnabled) {
+                            <fa-icon
+                                [icon]="faQuestionCircle"
+                                class="text-danger"
+                                [placement]="'top'"
+                                ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alert' | artemisTranslate }}"
+                            />
+                        } @else {
+                            <fa-icon
+                                [icon]="faQuestionCircle"
+                                class="text-danger"
+                                [placement]="'top'"
+                                ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alertNoTheia' | artemisTranslate }}"
+                            />
+                        }
                     } @else {
-                        <fa-icon
-                            [icon]="faQuestionCircle"
-                            class="text-danger"
-                            [placement]="'top'"
-                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alertNoTheia' | artemisTranslate }}"
-                        />
+                        <jhi-help-icon text="artemisApp.programmingExercise.allowOfflineIde.description" />
                     }
-                } @else {
-                    <jhi-help-icon text="artemisApp.programmingExercise.allowOfflineIde.description" />
-                }
-            </label>
-        </div>
-        @if (ProjectType.XCODE !== programmingExerciseCreationConfig.selectedProjectType) {
+                </label>
+            </div>
+        }
+        @if (ProjectType.XCODE !== programmingExerciseCreationConfig.selectedProjectType && isEditFieldDisplayedRecord().allowOnlineCodeEditor) {
             <div class="form-check">
                 <label [class]="!programmingExerciseCreationConfig.validIdeSelection() ? 'form-check-label text-danger' : 'form-check-label'" for="field_allowOnlineEditor">
                     <input
@@ -83,7 +84,7 @@
             </div>
         }
         <!-- only show this for non-exam exercises -->
-        @if (!programmingExercise.exerciseGroup && theiaEnabled) {
+        @if (!programmingExercise.exerciseGroup && theiaEnabled && isEditFieldDisplayedRecord().allowOnlineIde) {
             <div class="form-check">
                 <label [class]="!programmingExerciseCreationConfig.validIdeSelection() ? 'form-check-label text-danger' : 'form-check-label'" for="field_allowOnlineIde">
                     <input
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.ts
similarity index 61%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.ts
index 9b90e235dcec..979bf6652364 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component.ts
@@ -1,25 +1,29 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild, input } from '@angular/core';
 import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { PROFILE_THEIA } from 'app/app.constants';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
-    selector: 'jhi-programming-exercise-difficulty',
-    templateUrl: './programming-exercise-difficulty.component.html',
-    styleUrls: ['../../programming-exercise-form.scss'],
+    selector: 'jhi-programming-exercise-mode',
+    templateUrl: './programming-exercise-mode.component.html',
+    styleUrls: ['../../../programming-exercise-form.scss'],
 })
-export class ProgrammingExerciseDifficultyComponent implements OnInit {
-    @Input() programmingExercise: ProgrammingExercise;
-    @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+export class ProgrammingExerciseModeComponent implements OnInit {
+    protected readonly ProjectType = ProjectType;
+    protected readonly faQuestionCircle = faQuestionCircle;
+
+    @Input({ required: true }) programmingExercise: ProgrammingExercise;
+    @Input({ required: true }) programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+    isEditFieldDisplayedRecord = input.required<Record<ProgrammingExerciseInputField, boolean>>();
+
     @ViewChild(TeamConfigFormGroupComponent) teamConfigComponent: TeamConfigFormGroupComponent;
 
     @Output() triggerValidation = new EventEmitter<void>();
 
-    protected readonly ProjectType = ProjectType;
-
     theiaEnabled: boolean = false;
 
     constructor(private profileService: ProfileService) {}
@@ -29,6 +33,4 @@ export class ProgrammingExerciseDifficultyComponent implements OnInit {
             this.theiaEnabled = profileInfo.activeProfiles?.includes(PROFILE_THEIA);
         });
     }
-
-    faQuestionCircle = faQuestionCircle;
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.html
new file mode 100644
index 000000000000..f6e3f325ed6c
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.html
@@ -0,0 +1,58 @@
+<section>
+    <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle" id="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle"></h3>
+    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepMessage"></p>
+    @if (isEditFieldDisplayedRecord().problemStatement) {
+        <div class="form-group" id="field_problemStatement" name="problemStatement">
+            <label class="form-control-label" for="field_problemStatement" jhiTranslate="artemisApp.programmingExercise.problemStatement.title"></label>
+            @if (programmingExerciseCreationConfig.isImportFromExistingExercise || programmingExerciseCreationConfig.isImportFromFile) {
+                <ngb-alert [dismissible]="false">
+                    <span class="font-weight-bold">
+                        {{ 'artemisApp.exercise.import.attention' | artemisTranslate }}
+                    </span>
+                    <span
+                        jhiTranslate="{{
+                            programmingExerciseCreationConfig.isImportFromExistingExercise
+                                ? 'artemisApp.exercise.import.markdownWarning'
+                                : 'artemisApp.exercise.import.embeddedFilesWarning'
+                        }}"
+                    ></span>
+                </ngb-alert>
+            }
+            @if (programmingExerciseCreationConfig.isImportFromExistingExercise) {
+                <jhi-programming-exercise-instructions
+                    [exercise]="programmingExercise"
+                    [participation]="programmingExercise.templateParticipation!"
+                    [personalParticipation]="false"
+                />
+            }
+            @if (
+                programmingExerciseCreationConfig.problemStatementLoaded &&
+                programmingExerciseCreationConfig.templateParticipationResultLoaded &&
+                !programmingExerciseCreationConfig.isImportFromExistingExercise
+            ) {
+                <jhi-programming-exercise-editable-instructions
+                    [participation]="programmingExercise.templateParticipation!"
+                    [(exercise)]="exercise"
+                    [initialEditorHeight]="MarkdownEditorHeight.MEDIUM"
+                    [showStatus]="!!programmingExercise?.id"
+                    [editMode]="!!programmingExercise?.id"
+                    (hasUnsavedChanges)="programmingExerciseCreationConfig.hasUnsavedChanges = $event"
+                    (instructionChange)="problemStatementChange.emit($event)"
+                    [forceRender]="programmingExerciseCreationConfig.rerenderSubject"
+                    class="form__editable-instructions"
+                />
+            }
+        </div>
+    }
+    @if (isEditFieldDisplayedRecord().linkedCompetencies && !programmingExerciseCreationConfig.isExamMode) {
+        <div class="form-group">
+            <jhi-competency-selection
+                id="competencies"
+                [labelName]="'artemisApp.competency.link.title' | artemisTranslate"
+                [labelTooltip]="'artemisApp.competency.link.exercise' | artemisTranslate"
+                [(ngModel)]="programmingExercise.competencies"
+                name="competencies"
+            />
+        </div>
+    }
+</section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.ts
similarity index 59%
rename from src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts
rename to src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.ts
index 803b06558f72..a11f6b730698 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component.ts
@@ -1,28 +1,31 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, input } from '@angular/core';
 import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
-
 import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
     selector: 'jhi-programming-exercise-problem',
     templateUrl: './programming-exercise-problem.component.html',
-    styleUrls: ['../../programming-exercise-form.scss'],
+    styleUrls: ['../../../programming-exercise-form.scss'],
 })
 export class ProgrammingExerciseProblemComponent {
-    readonly ProgrammingLanguage = ProgrammingLanguage;
-    readonly ProjectType = ProjectType;
-    readonly AssessmentType = AssessmentType;
-    readonly MarkdownEditorHeight = MarkdownEditorHeight;
+    protected readonly ProgrammingLanguage = ProgrammingLanguage;
+    protected readonly ProjectType = ProjectType;
+    protected readonly AssessmentType = AssessmentType;
+    protected readonly MarkdownEditorHeight = MarkdownEditorHeight;
+    protected readonly faQuestionCircle = faQuestionCircle;
 
-    programmingExercise: ProgrammingExercise;
+    @Input({ required: true }) programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+    isEditFieldDisplayedRecord = input.required<Record<ProgrammingExerciseInputField, boolean>>();
 
-    @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
     @Output() exerciseChange = new EventEmitter<ProgrammingExercise>();
     @Output() problemStatementChange = new EventEmitter<string>();
 
+    programmingExercise: ProgrammingExercise;
+
     @Input()
     get exercise() {
         return this.programmingExercise;
@@ -32,6 +35,4 @@ export class ProgrammingExerciseProblemComponent {
         this.programmingExercise = exercise;
         this.exerciseChange.emit(this.programmingExercise);
     }
-
-    faQuestionCircle = faQuestionCircle;
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
deleted file mode 100644
index 596b6d8c38c7..000000000000
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<section class="mb-5">
-    <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle" id="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle"></h3>
-    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepMessage"></p>
-    <div class="form-group">
-        <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ programmingExercise.course ? 'Course' : 'Exam' }}Label"></label>
-        <div>
-            <jhi-included-in-overall-score-picker [(includedInOverallScore)]="programmingExercise.includedInOverallScore" [allowNotIncluded]="true" />
-        </div>
-    </div>
-    <div class="row">
-        <div class="col">
-            <div class="form-group">
-                <label class="label-narrow" jhiTranslate="artemisApp.exercise.points" for="field_points"></label>
-                <input
-                    required
-                    type="number"
-                    class="form-control"
-                    [customMin]="1"
-                    [customMax]="9999"
-                    name="points"
-                    id="field_points"
-                    [(ngModel)]="programmingExercise.maxPoints"
-                    #maxScore="ngModel"
-                />
-                @if (maxScore?.invalid && (maxScore?.dirty || maxScore?.touched) && maxScore?.errors) {
-                    <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
-                }
-            </div>
-        </div>
-        <div class="col">
-            <div class="form-group" [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
-                <label class="label-narrow" jhiTranslate="artemisApp.exercise.bonusPoints" for="field_bonusPoints"></label>
-                <input
-                    type="number"
-                    [required]="programmingExercise.includedInOverallScore === IncludedInOverallScore.INCLUDED_COMPLETELY"
-                    class="form-control"
-                    [customMin]="0"
-                    [customMax]="9999"
-                    name="bonusPoints"
-                    id="field_bonusPoints"
-                    [(ngModel)]="programmingExercise.bonusPoints"
-                    #bonusPoints="ngModel"
-                />
-                @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
-                    <div
-                        class="alert alert-danger"
-                        [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
-                        jhiTranslate="artemisApp.exercise.bonusPointsError"
-                    ></div>
-                }
-            </div>
-        </div>
-    </div>
-    @if (programmingExercise.staticCodeAnalysisEnabled) {
-        <div class="mt-2 mb-4">
-            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.maxStaticCodeAnalysisPenalty.title" for="field_maxPenalty"
-                >Max Static Code Analysis Penalty</label
-            >
-            <fa-icon
-                [icon]="faQuestionCircle"
-                class="text-secondary"
-                placement="auto"
-                ngbTooltip="{{ 'artemisApp.programmingExercise.maxStaticCodeAnalysisPenalty.description' | artemisTranslate }}"
-            />
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text">%</span>
-                </div>
-                <input
-                    type="number"
-                    [pattern]="programmingExerciseCreationConfig.maxPenaltyPattern"
-                    class="form-control"
-                    name="maxPenalty"
-                    id="field_maxPenalty"
-                    [(ngModel)]="programmingExercise.maxStaticCodeAnalysisPenalty"
-                    #maxPenalty="ngModel"
-                />
-            </div>
-            @for (e of maxPenalty.errors! | keyvalue; track e) {
-                @if (maxPenalty.invalid && (maxPenalty.dirty || maxPenalty.touched)) {
-                    <div class="alert alert-danger">
-                        <div [jhiTranslate]="'artemisApp.exercise.form.maxPenalty' + '.' + e.key"></div>
-                    </div>
-                }
-            }
-        </div>
-    }
-    <div class="form-group">
-        <jhi-submission-policy-update
-            #submissionPolicyForm
-            [editable]="!programmingExerciseCreationConfig.isEdit"
-            [programmingExercise]="programmingExercise"
-            (submissionPolicyTypeChange)="calculateFormStatus()"
-        />
-        @if (programmingExerciseCreationConfig.isEdit) {
-            <ngb-alert [dismissible]="false" [type]="'info'">
-                <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.editInGradingInformation"></span>
-                <a [href]="editPolicyUrl">
-                    <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.goToGradingToEditInformation"></span>
-                </a>
-            </ngb-alert>
-        }
-    </div>
-    <div class="form-group">
-        <div>
-            <label jhiTranslate="artemisApp.programmingExercise.timeline.timelineLabel" for="timeline"></label>
-            <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.timeline.timelineTooltip" />
-        </div>
-        <jhi-programming-exercise-lifecycle
-            id="timeline"
-            [exercise]="programmingExercise"
-            [isExamMode]="programmingExerciseCreationConfig.isExamMode"
-            [readOnly]="false"
-            [importOptions]="importOptions"
-        />
-    </div>
-    @if (programmingExercise.assessmentType === AssessmentType.SEMI_AUTOMATIC) {
-        <div class="form-group">
-            <label class="form-control-label" jhiTranslate="artemisApp.exercise.assessmentInstructions" for="gradingInstructions"></label>
-            <jhi-grading-instructions-details id="gradingInstructions" [exercise]="programmingExercise" />
-        </div>
-    }
-    <jhi-presentation-score-checkbox [exercise]="programmingExercise" />
-    @if (programmingExerciseCreationConfig.showSummary) {
-        <h6>{{ getGradingSummary() }}</h6>
-    }
-</section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
index 556b2a9e3e99..e69de29bb2d1 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
@@ -1,157 +0,0 @@
-import { AfterViewInit, Component, Input, OnDestroy, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { NgModel } from '@angular/forms';
-import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model';
-import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
-import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
-import { Subject, Subscription } from 'rxjs';
-import { TableEditableFieldComponent } from 'app/shared/table/table-editable-field.component';
-import { every } from 'lodash-es';
-import { ImportOptions } from 'app/types/programming-exercises';
-import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
-import { faPlus } from '@fortawesome/free-solid-svg-icons';
-import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto';
-import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component';
-
-@Component({
-    selector: 'jhi-programming-exercise-info',
-    templateUrl: './programming-exercise-information.component.html',
-    styleUrls: ['../../programming-exercise-form.scss', 'programming-exercise-information.component.scss'],
-})
-export class ProgrammingExerciseInformationComponent implements AfterViewInit, OnDestroy {
-    @Input() isImport: boolean;
-    @Input() isExamMode: boolean;
-    @Input() programmingExercise: ProgrammingExercise;
-    @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
-    @Input() isLocal: boolean;
-    @Input() importOptions: ImportOptions;
-
-    @ViewChild(ExerciseTitleChannelNameComponent) exerciseTitleChannelComponent: ExerciseTitleChannelNameComponent;
-    @ViewChildren(TableEditableFieldComponent) tableEditableFields?: QueryList<TableEditableFieldComponent>;
-    @ViewChild('shortName') shortNameField: NgModel;
-    @ViewChild('checkoutSolutionRepository') checkoutSolutionRepositoryField?: NgModel;
-    @ViewChild('recreateBuildPlans') recreateBuildPlansField?: NgModel;
-    @ViewChild('updateTemplateFiles') updateTemplateFilesField?: NgModel;
-    @ViewChild(ProgrammingExerciseEditCheckoutDirectoriesComponent) programmingExerciseEditCheckoutDirectories?: ProgrammingExerciseEditCheckoutDirectoriesComponent;
-
-    formValid: boolean;
-    formValidChanges = new Subject<boolean>();
-
-    inputFieldSubscriptions: (Subscription | undefined)[] = [];
-
-    protected readonly ProjectType = ProjectType;
-
-    ButtonType = ButtonType;
-    ButtonSize = ButtonSize;
-    faPlus = faPlus;
-
-    editRepositoryCheckoutPath: boolean = false;
-    submissionBuildPlanCheckoutRepositories: BuildPlanCheckoutDirectoriesDTO;
-
-    ngAfterViewInit() {
-        this.inputFieldSubscriptions.push(this.exerciseTitleChannelComponent.titleChannelNameComponent?.formValidChanges.subscribe(() => this.calculateFormValid()));
-        this.inputFieldSubscriptions.push(this.shortNameField.valueChanges?.subscribe(() => this.calculateFormValid()));
-        this.inputFieldSubscriptions.push(this.checkoutSolutionRepositoryField?.valueChanges?.subscribe(() => this.calculateFormValid()));
-        this.inputFieldSubscriptions.push(this.recreateBuildPlansField?.valueChanges?.subscribe(() => this.calculateFormValid()));
-        this.inputFieldSubscriptions.push(this.updateTemplateFilesField?.valueChanges?.subscribe(() => this.calculateFormValid()));
-        this.inputFieldSubscriptions.push(this.programmingExerciseEditCheckoutDirectories?.formValidChanges.subscribe(() => this.calculateFormValid()));
-        this.tableEditableFields?.changes.subscribe((fields: QueryList<TableEditableFieldComponent>) => {
-            fields.toArray().forEach((field) => this.inputFieldSubscriptions.push(field.editingInput.valueChanges?.subscribe(() => this.calculateFormValid())));
-        });
-    }
-
-    ngOnDestroy(): void {
-        for (const subscription of this.inputFieldSubscriptions) {
-            subscription?.unsubscribe();
-        }
-    }
-
-    calculateFormValid() {
-        const isCheckoutSolutionRepositoryValid = this.isCheckoutSolutionRepositoryValid();
-        const isRecreateBuildPlansValid = this.isRecreateBuildPlansValid();
-        const isUpdateTemplateFilesValid = this.isUpdateTemplateFilesValid();
-        const areAuxiliaryRepositoriesValid = this.areAuxiliaryRepositoriesValid();
-        const areCheckoutPathsValid = this.areCheckoutPathsValid();
-        this.formValid = Boolean(
-            this.exerciseTitleChannelComponent.titleChannelNameComponent?.formValid &&
-                !this.shortNameField.invalid &&
-                isCheckoutSolutionRepositoryValid &&
-                isRecreateBuildPlansValid &&
-                isUpdateTemplateFilesValid &&
-                areAuxiliaryRepositoriesValid &&
-                areCheckoutPathsValid,
-        );
-        this.formValidChanges.next(this.formValid);
-    }
-
-    areAuxiliaryRepositoriesValid(): boolean {
-        return (
-            (every(
-                this.tableEditableFields?.map((field) => field.editingInput.valid),
-                Boolean,
-            ) &&
-                !this.programmingExerciseCreationConfig.auxiliaryRepositoryDuplicateDirectories &&
-                !this.programmingExerciseCreationConfig.auxiliaryRepositoryDuplicateNames) ||
-            !this.programmingExercise.auxiliaryRepositories?.length
-        );
-    }
-
-    isUpdateTemplateFilesValid(): boolean {
-        return (
-            this.updateTemplateFilesField?.valid ||
-            !this.programmingExerciseCreationConfig.isImportFromExistingExercise ||
-            this.programmingExercise.projectType === ProjectType.PLAIN_GRADLE ||
-            this.programmingExercise.projectType === ProjectType.GRADLE_GRADLE
-        );
-    }
-
-    isRecreateBuildPlansValid(): boolean {
-        return this.recreateBuildPlansField?.valid || !this.programmingExerciseCreationConfig.isImportFromExistingExercise;
-    }
-
-    isCheckoutSolutionRepositoryValid(): boolean {
-        return Boolean(
-            this.checkoutSolutionRepositoryField?.valid ||
-                this.programmingExercise.id ||
-                !this.programmingExercise.programmingLanguage ||
-                !this.programmingExerciseCreationConfig.checkoutSolutionRepositoryAllowed,
-        );
-    }
-
-    areCheckoutPathsValid(): boolean {
-        return Boolean(
-            !this.programmingExerciseEditCheckoutDirectories ||
-                (this.programmingExerciseEditCheckoutDirectories.formValid &&
-                    this.programmingExerciseEditCheckoutDirectories.areValuesUnique([
-                        this.programmingExercise.buildConfig?.assignmentCheckoutPath,
-                        this.programmingExercise.buildConfig?.testCheckoutPath,
-                        this.programmingExercise.buildConfig?.solutionCheckoutPath,
-                    ])),
-        );
-    }
-
-    toggleEditRepositoryCheckoutPath() {
-        this.editRepositoryCheckoutPath = !this.editRepositoryCheckoutPath;
-    }
-
-    updateSubmissionBuildPlanCheckoutDirectories(buildPlanCheckoutDirectoriesDTO: BuildPlanCheckoutDirectoriesDTO) {
-        this.submissionBuildPlanCheckoutRepositories = buildPlanCheckoutDirectoriesDTO;
-    }
-
-    onAssigmentRepositoryCheckoutPathChange(event: string) {
-        this.programmingExercise.buildConfig!.assignmentCheckoutPath = event;
-        // We need to create a new object to trigger the change detection
-        this.programmingExercise.buildConfig = { ...this.programmingExercise.buildConfig };
-    }
-
-    onTestRepositoryCheckoutPathChange(event: string) {
-        this.programmingExercise.buildConfig!.testCheckoutPath = event;
-        // We need to create a new object to trigger the change detection
-        this.programmingExercise.buildConfig = { ...this.programmingExercise.buildConfig };
-    }
-
-    onSolutionRepositoryCheckoutPathChange(event: string) {
-        this.programmingExercise.buildConfig!.solutionCheckoutPath = event;
-        // We need to create a new object to trigger the change detection
-        this.programmingExercise.buildConfig = { ...this.programmingExercise.buildConfig };
-    }
-}
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
deleted file mode 100644
index bdabddb25dc8..000000000000
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<section>
-    <h3
-        jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle"
-        id="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle"
-    ></h3>
-    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepMessage"></p>
-    <div class="form-group">
-        <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.programmingLanguage" for="field_programmingLanguage"></label>
-        <select
-            #select="ngModel"
-            required
-            class="form-select"
-            [ngModel]="programmingExerciseCreationConfig.selectedProgrammingLanguage"
-            (ngModelChange)="select.model = programmingExerciseCreationConfig.onProgrammingLanguageChange($event)"
-            name="programmingLanguage"
-            id="field_programmingLanguage"
-            [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
-        >
-            @for (supportedLanguage of programmingExerciseCreationConfig.supportedLanguages; track supportedLanguage) {
-                <option [value]="supportedLanguage" [jhiTranslate]="'artemisApp.ProgrammingLanguage.' + supportedLanguage"></option>
-            }
-        </select>
-    </div>
-    @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.projectTypes?.length && programmingExerciseCreationConfig.modePickerOptions) {
-        <div class="form-group mt-2">
-            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.projectType" for="field_projectType"></label>
-            <jhi-mode-picker
-                required
-                [options]="programmingExerciseCreationConfig.modePickerOptions"
-                [value]="programmingExerciseCreationConfig.selectedProjectType"
-                (valueChange)="programmingExerciseCreationConfig.onProjectTypeChange($event!)"
-                [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || programmingExerciseCreationConfig.isImportFromFile || !!programmingExercise.id"
-                name="projectType"
-                id="field_projectType"
-            />
-            @if (
-                !programmingExerciseCreationConfig.isImportFromExistingExercise &&
-                !programmingExerciseCreationConfig.isImportFromFile &&
-                !programmingExercise.id &&
-                programmingExercise.programmingLanguage === ProgrammingLanguage.JAVA &&
-                programmingExercise.projectType !== ProjectType.MAVEN_BLACKBOX
-            ) {
-                <div class="form-check mt-2">
-                    <input
-                        class="form-check-input"
-                        type="checkbox"
-                        name="withDependencies"
-                        id="field_with_dependencies"
-                        [(ngModel)]="programmingExerciseCreationConfig.withDependencies"
-                        (ngModelChange)="programmingExerciseCreationConfig.onWithDependenciesChanged($event)"
-                        checked
-                    />
-                    <span jhiTranslate="artemisApp.programmingExercise.withDependencies"></span>
-                    <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.withDependenciesTooltip" />
-                </div>
-            }
-        </div>
-    }
-    @if (programmingExercise.programmingLanguage === ProgrammingLanguage.EMPTY) {
-        <div>
-            <p>
-                <fa-icon [icon]="faExclamationTriangle" size="xl" class="text-warning"></fa-icon>
-                <span jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.title" [translateValues]="{ documentationLink: DOCUMENTATION_LINK }"></span>
-            </p>
-            <ol>
-                <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.setImage" [translateValues]="DOCKER_REGISTRY_LINKS"></li>
-                <li>
-                    <p jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.title" class="mb-0"></p>
-                    <ol>
-                        <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.dependencies"></li>
-                        <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.runTests"></li>
-                        <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.buildScript.moveResults" [translateValues]="{ resultsDirectory: './results/' }"></li>
-                    </ol>
-                </li>
-                <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushExercise" [translateValues]="{ checkoutDirectory: './assignment/' }"></li>
-                <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushSolution"></li>
-                <li jhiTranslate="artemisApp.programmingExercise.otherLanguageHints.pushTest" [translateValues]="{ checkoutDirectory: './' }"></li>
-            </ol>
-        </div>
-    }
-    @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.packageNameRequired && programmingExercise.projectType !== ProjectType.XCODE) {
-        <div class="form-group">
-            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.packageName" for="field_packageName"></label>
-            <input
-                required
-                type="text"
-                [pattern]="programmingExerciseCreationConfig.packageNamePattern"
-                class="form-control"
-                name="packageName"
-                id="field_packageName"
-                [(ngModel)]="programmingExercise.packageName"
-                [readonly]="programmingExercise.id"
-                #packageName="ngModel"
-                [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
-            />
-            @for (e of packageName.errors! | keyvalue | removekeys: ['required']; track e) {
-                @if (packageName.invalid && (packageName.dirty || packageName.touched)) {
-                    <div class="alert alert-danger">
-                        @if (programmingExercise.projectType === ProjectType.MAVEN_BLACKBOX) {
-                            <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage + '_BLACKBOX'"></div>
-                        }
-                        @if (programmingExercise.projectType !== ProjectType.MAVEN_BLACKBOX) {
-                            <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage"></div>
-                        }
-                    </div>
-                }
-            }
-        </div>
-    }
-    @if (programmingExercise.programmingLanguage === ProgrammingLanguage.SWIFT && programmingExercise.projectType === ProjectType.XCODE) {
-        <div class="form-group">
-            <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.appName" for="field_packageName"></label>
-            <input
-                required
-                type="text"
-                [pattern]="programmingExerciseCreationConfig.appNamePatternForSwift"
-                class="form-control"
-                name="packageName"
-                id="field_appName"
-                [(ngModel)]="programmingExercise.packageName"
-                [readonly]="programmingExercise.id"
-                #packageName="ngModel"
-                [disabled]="programmingExerciseCreationConfig.isImportFromExistingExercise || !!programmingExercise.id || programmingExerciseCreationConfig.isImportFromFile"
-            />
-            @for (e of packageName.errors! | keyvalue | removekeys: ['required']; track e) {
-                @if (packageName.invalid && (packageName.dirty || packageName.touched)) {
-                    <div class="alert alert-danger">
-                        <div [jhiTranslate]="'artemisApp.exercise.form.packageName' + '.' + e.key + '.' + programmingExercise.programmingLanguage"></div>
-                    </div>
-                }
-            }
-        </div>
-    }
-
-    <!-- Theia Image Selection -->
-    @if (programmingExercise.allowOnlineIde && programmingExercise.programmingLanguage) {
-        <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.theiaImage.title"></label>
-        <jhi-programming-exercise-theia [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="programmingExerciseCreationConfig" />
-    }
-
-    <!-- Static code analysis checkbox -->
-    @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.staticCodeAnalysisAllowed) {
-        <div>
-            <div class="form-check custom-control custom-checkbox">
-                <input
-                    type="checkbox"
-                    class="form-check-input custom-control-input"
-                    id="field_staticCodeAnalysisEnabled"
-                    name="staticCodeAnalysisEnabled"
-                    [disabled]="
-                        !!programmingExercise.buildConfig?.sequentialTestRuns || (!programmingExerciseCreationConfig.isImportFromExistingExercise && !!programmingExercise.id)
-                    "
-                    [(ngModel)]="programmingExercise.staticCodeAnalysisEnabled"
-                    (change)="programmingExerciseCreationConfig.onStaticCodeAnalysisChanged()"
-                />
-                <label
-                    class="form-check-label custom-control-label"
-                    for="field_staticCodeAnalysisEnabled"
-                    jhiTranslate="artemisApp.programmingExercise.enableStaticCodeAnalysis.title"
-                >
-                    Enable Static Code Analysis</label
-                >
-                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.enableStaticCodeAnalysis.description" />
-            </div>
-        </div>
-    }
-    <!-- Sequential Test Runs checkbox
-    It would be very complicated to change the sequential test run feature after an exercise is created, which is why it can only be activated if the exercise was not yet created.-->
-    @if (programmingExerciseCreationConfig.sequentialTestRunsAllowed) {
-        <div>
-            <div class="form-check custom-control custom-checkbox">
-                <input
-                    class="form-check-input"
-                    type="checkbox"
-                    name="sequentialTestRuns"
-                    id="field_sequentialTestRuns"
-                    [disabled]="!!programmingExercise.id || !!programmingExercise.staticCodeAnalysisEnabled || !!programmingExercise.buildConfig!.testwiseCoverageEnabled"
-                    [(ngModel)]="programmingExercise.buildConfig!.sequentialTestRuns"
-                    checked
-                />
-                <label class="form-check-label custom-control-label" for="field_sequentialTestRuns" jhiTranslate="artemisApp.programmingExercise.sequentialTestRuns.title">
-                    >Sequential Test Runs</label
-                >
-                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.sequentialTestRuns.description" />
-            </div>
-        </div>
-    }
-    <!-- Testwise Coverage checkbox-->
-    @if (programmingExerciseCreationConfig.testwiseCoverageAnalysisSupported) {
-        <div class="form-check custom-control custom-checkbox">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                name="testwiseCoverageEnabled"
-                id="field_testwiseCoverageEnabled"
-                [disabled]="!!programmingExercise.buildConfig!.sequentialTestRuns || !!programmingExercise.id"
-                [(ngModel)]="programmingExercise.buildConfig!.testwiseCoverageEnabled"
-                checked
-            />
-            <label class="form-check-label custom-control-label" for="field_testwiseCoverageEnabled" jhiTranslate="artemisApp.programmingExercise.recordTestwiseCoverage"></label>
-            <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.recordTestwiseCoverageTooltip" />
-        </div>
-    }
-    @if (!programmingExercise.id && programmingExercise.programmingLanguage && programmingExerciseCreationConfig.checkoutSolutionRepositoryAllowed) {
-        <div class="form-check">
-            <label class="form-check-label" for="field_checkoutSolutionRepository">
-                <input
-                    #checkoutSolutionRepository="ngModel"
-                    class="form-check-input"
-                    type="checkbox"
-                    name="checkoutSolutionRepository"
-                    id="field_checkoutSolutionRepository"
-                    [(ngModel)]="programmingExercise.buildConfig!.checkoutSolutionRepository"
-                />
-                <span jhiTranslate="artemisApp.programmingExercise.checkoutSolutionRepository.title"></span>
-                <jhi-help-icon placement="auto" text="artemisApp.programmingExercise.checkoutSolutionRepository.description" />
-            </label>
-        </div>
-    }
-    @if (programmingExerciseCreationConfig.customBuildPlansSupported === PROFILE_LOCALCI) {
-        <jhi-programming-exercise-custom-build-plan [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="this.programmingExerciseCreationConfig" />
-    } @else if (programmingExerciseCreationConfig.customBuildPlansSupported === PROFILE_AEOLUS) {
-        <jhi-programming-exercise-custom-aeolus-build-plan
-            [programmingExercise]="programmingExercise"
-            [programmingExerciseCreationConfig]="this.programmingExerciseCreationConfig"
-        />
-    }
-</section>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
deleted file mode 100644
index 61cd41a42924..000000000000
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<section>
-    <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle" id="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle"></h3>
-    <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepMessage"></p>
-    <div class="form-group" id="field_problemStatement" name="problemStatement">
-        <label class="form-control-label" for="field_problemStatement" jhiTranslate="artemisApp.programmingExercise.problemStatement.title"></label>
-        @if (programmingExerciseCreationConfig.isImportFromExistingExercise || programmingExerciseCreationConfig.isImportFromFile) {
-            <ngb-alert [dismissible]="false">
-                <span class="font-weight-bold">{{ 'artemisApp.exercise.import.attention' | artemisTranslate }}</span
-                ><span
-                    jhiTranslate="{{
-                        programmingExerciseCreationConfig.isImportFromExistingExercise
-                            ? 'artemisApp.exercise.import.markdownWarning'
-                            : 'artemisApp.exercise.import.embeddedFilesWarning'
-                    }}"
-                ></span>
-            </ngb-alert>
-        }
-        @if (programmingExerciseCreationConfig.isImportFromExistingExercise) {
-            <jhi-programming-exercise-instructions [exercise]="programmingExercise" [participation]="programmingExercise.templateParticipation!" [personalParticipation]="false" />
-        }
-        @if (
-            programmingExerciseCreationConfig.problemStatementLoaded &&
-            programmingExerciseCreationConfig.templateParticipationResultLoaded &&
-            !programmingExerciseCreationConfig.isImportFromExistingExercise
-        ) {
-            <jhi-programming-exercise-editable-instructions
-                [participation]="programmingExercise.templateParticipation!"
-                [(exercise)]="exercise"
-                [initialEditorHeight]="MarkdownEditorHeight.MEDIUM"
-                [showStatus]="!!programmingExercise?.id"
-                [editMode]="!!programmingExercise?.id"
-                (hasUnsavedChanges)="programmingExerciseCreationConfig.hasUnsavedChanges = $event"
-                (instructionChange)="problemStatementChange.emit($event)"
-                [forceRender]="programmingExerciseCreationConfig.rerenderSubject"
-                class="form__editable-instructions"
-            />
-        }
-    </div>
-    @if (!programmingExerciseCreationConfig.isExamMode) {
-        <div class="form-group">
-            <jhi-competency-selection
-                id="competencies"
-                [labelName]="'artemisApp.competency.link.title' | artemisTranslate"
-                [labelTooltip]="'artemisApp.competency.link.exercise' | artemisTranslate"
-                [(ngModel)]="programmingExercise.competencies"
-                name="competencies"
-            />
-        </div>
-    }
-</section>
diff --git a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html
index 9a32bc2a7b66..0184669719e3 100644
--- a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html
+++ b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html
@@ -1,7 +1,7 @@
 <div class="timeline-box">
     <div class="test-schedule">
         <div class="test-schedule-row d-flex justify-content-around">
-            @if (!isExamMode) {
+            @if ((isEditFieldDisplayedRecord()?.releaseDate || !isEditFieldDisplayedRecord()) && !isExamMode) {
                 <jhi-programming-exercise-test-schedule-date-picker
                     [(ngModel)]="exercise.releaseDate"
                     (ngModelChange)="updateReleaseDate($event)"
@@ -11,7 +11,7 @@
                     tooltipText="artemisApp.programmingExercise.timeline.releaseDateTooltip"
                 />
             }
-            @if (!isExamMode) {
+            @if ((isEditFieldDisplayedRecord()?.startDate || !isEditFieldDisplayedRecord()) && !isExamMode) {
                 <jhi-programming-exercise-test-schedule-date-picker
                     [(ngModel)]="exercise.startDate"
                     (ngModelChange)="updateStartDate($event)"
@@ -33,7 +33,7 @@
                     <fa-icon [icon]="faCogs" size="lg" />
                 </div>
             </div>
-            @if (!isExamMode) {
+            @if ((isEditFieldDisplayedRecord()?.dueDate || !isEditFieldDisplayedRecord()) && !isExamMode) {
                 <jhi-programming-exercise-test-schedule-date-picker
                     [(ngModel)]="exercise.dueDate"
                     (ngModelChange)="updateExampleSolutionPublicationDate($event)"
@@ -47,7 +47,7 @@
                     id="programming-exercise-due-date-picker"
                 />
             }
-            @if (isExamMode || exercise.dueDate) {
+            @if ((isEditFieldDisplayedRecord()?.runTestsAfterDueDate || !isEditFieldDisplayedRecord()) && (isExamMode || exercise.dueDate)) {
                 <jhi-programming-exercise-test-schedule-date-picker
                     class="test-schedule-date px-1"
                     [(ngModel)]="exercise.buildAndTestStudentSubmissionsAfterDueDate"
@@ -58,7 +58,7 @@
                     tooltipText="artemisApp.programmingExercise.timeline.afterDueDateTooltip"
                 />
             }
-            @if (isExamMode || exercise.dueDate) {
+            @if ((isEditFieldDisplayedRecord()?.assessmentDueDate || !isEditFieldDisplayedRecord()) && (isExamMode || exercise.dueDate)) {
                 <div>
                     <div class="test-schedule-date px-1">
                         <div class="test-schedule-date-title test-schedule-date-title-small-button">
@@ -99,7 +99,7 @@
                     }
                 </div>
             }
-            @if (!isExamMode) {
+            @if ((isEditFieldDisplayedRecord()?.exampleSolutionPublicationDate || !isEditFieldDisplayedRecord()) && !isExamMode) {
                 <div>
                     <jhi-programming-exercise-test-schedule-date-picker
                         [(ngModel)]="exercise.exampleSolutionPublicationDate"
@@ -116,9 +116,16 @@
             }
         </div>
     </div>
-    @if (!readOnly) {
+    @if (
+        !readOnly &&
+        (!isEditFieldDisplayedRecord() ||
+            isEditFieldDisplayedRecord()?.complaintOnAutomaticAssessment ||
+            isEditFieldDisplayedRecord()?.manualFeedbackRequests ||
+            isEditFieldDisplayedRecord()?.showTestNamesToStudents ||
+            isEditFieldDisplayedRecord()?.includeTestsIntoExampleSolution)
+    ) {
         <h6 jhiTranslate="artemisApp.assessment.assessment"></h6>
-        @if (isExamMode || exercise.course?.complaintsEnabled) {
+        @if ((isEditFieldDisplayedRecord()?.complaintOnAutomaticAssessment || !isEditFieldDisplayedRecord()) && (isExamMode || exercise.course?.complaintsEnabled)) {
             <div class="form-check">
                 <input
                     type="checkbox"
@@ -156,7 +163,7 @@ <h6 jhiTranslate="artemisApp.assessment.assessment"></h6>
                 <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.setTestCaseVisibilityToAfterReleaseDateOfResultsTooltip'" />
             </div>
         }
-        @if (!isExamMode) {
+        @if ((isEditFieldDisplayedRecord()?.manualFeedbackRequests || !isEditFieldDisplayedRecord()) && !isExamMode) {
             <div class="form-check">
                 <input
                     type="checkbox"
@@ -186,37 +193,41 @@ <h6 jhiTranslate="artemisApp.assessment.assessment"></h6>
                 }
             </div>
         }
-        <div class="form-check">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                name="showTestNamesToStudents"
-                id="field_showTestNamesToStudents"
-                [disabled]="readOnly"
-                [(ngModel)]="exercise.showTestNamesToStudents"
-                checked
-            />
-            <label class="form-control-label" for="field_showTestNamesToStudents" jhiTranslate="artemisApp.programmingExercise.showTestNamesToStudents"></label>
-            <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.showTestNamesToStudentsTooltip'" />
-        </div>
-        <div class="form-check">
-            <input
-                type="checkbox"
-                class="form-check-input"
-                name="releaseTestsWithExampleSolution"
-                [checked]="exercise.releaseTestsWithExampleSolution"
-                [disabled]="!exercise.exampleSolutionPublicationDate && !exercise.exerciseGroup?.exam?.exampleSolutionPublicationDate"
-                id="releaseTestsWithExampleSolution"
-                (change)="toggleReleaseTests()"
-            />
-            <label
-                [ngStyle]="!exercise.exampleSolutionPublicationDate && !exercise.exerciseGroup?.exam?.exampleSolutionPublicationDate ? { color: 'grey' } : {}"
-                class="form-control-label"
-                for="releaseTestsWithExampleSolution"
-                jhiTranslate="artemisApp.programmingExercise.timeline.releaseTestsWithExampleSolution"
-            ></label>
-            <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.releaseTestsWithExampleSolutionTooltip'" />
-        </div>
+        @if (isEditFieldDisplayedRecord()?.showTestNamesToStudents || !isEditFieldDisplayedRecord()) {
+            <div class="form-check">
+                <input
+                    class="form-check-input"
+                    type="checkbox"
+                    name="showTestNamesToStudents"
+                    id="field_showTestNamesToStudents"
+                    [disabled]="readOnly"
+                    [(ngModel)]="exercise.showTestNamesToStudents"
+                    checked
+                />
+                <label class="form-control-label" for="field_showTestNamesToStudents" jhiTranslate="artemisApp.programmingExercise.showTestNamesToStudents"></label>
+                <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.showTestNamesToStudentsTooltip'" />
+            </div>
+        }
+        @if (isEditFieldDisplayedRecord()?.includeTestsIntoExampleSolution || !isEditFieldDisplayedRecord()) {
+            <div class="form-check">
+                <input
+                    type="checkbox"
+                    class="form-check-input"
+                    name="releaseTestsWithExampleSolution"
+                    [checked]="exercise.releaseTestsWithExampleSolution"
+                    [disabled]="!exercise.exampleSolutionPublicationDate && !exercise.exerciseGroup?.exam?.exampleSolutionPublicationDate"
+                    id="releaseTestsWithExampleSolution"
+                    (change)="toggleReleaseTests()"
+                />
+                <label
+                    [ngStyle]="!exercise.exampleSolutionPublicationDate && !exercise.exerciseGroup?.exam?.exampleSolutionPublicationDate ? { color: 'grey' } : {}"
+                    class="form-control-label"
+                    for="releaseTestsWithExampleSolution"
+                    jhiTranslate="artemisApp.programmingExercise.timeline.releaseTestsWithExampleSolution"
+                ></label>
+                <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.releaseTestsWithExampleSolutionTooltip'" />
+            </div>
+        }
         @if (!isExamMode) {
             <jhi-exercise-feedback-suggestion-options [exercise]="exercise" [dueDate]="exercise.dueDate" [readOnly]="readOnly" />
         }
diff --git a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
index aa2e0e951699..d1506497f4d6 100644
--- a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
+import { AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges, ViewChildren, input } from '@angular/core';
 import dayjs from 'dayjs/esm';
 import { TranslateService } from '@ngx-translate/core';
 import { AssessmentType } from 'app/entities/assessment-type.model';
@@ -13,6 +13,7 @@ import { every } from 'lodash-es';
 import { ActivatedRoute } from '@angular/router';
 import { tap } from 'rxjs/operators';
 import { ImportOptions } from 'app/types/programming-exercises';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
     selector: 'jhi-programming-exercise-lifecycle',
@@ -20,16 +21,20 @@ import { ImportOptions } from 'app/types/programming-exercises';
     styleUrls: ['./programming-exercise-test-schedule-picker.scss'],
 })
 export class ProgrammingExerciseLifecycleComponent implements AfterViewInit, OnDestroy, OnInit, OnChanges {
+    protected readonly assessmentType = AssessmentType;
+    protected readonly IncludedInOverallScore = IncludedInOverallScore;
+    protected readonly faCogs = faCogs;
+    protected readonly faUserCheck = faUserCheck;
+    protected readonly faUserSlash = faUserSlash;
+
     @Input() exercise: ProgrammingExercise;
     @Input() isExamMode: boolean;
     @Input() readOnly: boolean;
     @Input() importOptions?: ImportOptions;
+    isEditFieldDisplayedRecord = input<Record<ProgrammingExerciseInputField, boolean>>();
 
     @ViewChildren(ProgrammingExerciseTestScheduleDatePickerComponent) datePickerComponents: QueryList<ProgrammingExerciseTestScheduleDatePickerComponent>;
 
-    readonly assessmentType = AssessmentType;
-    readonly IncludedInOverallScore = IncludedInOverallScore;
-
     formValid: boolean;
     formEmpty: boolean;
     formValidChanges = new Subject<boolean>();
@@ -37,11 +42,6 @@ export class ProgrammingExerciseLifecycleComponent implements AfterViewInit, OnD
     inputfieldSubscriptions: (Subscription | undefined)[] = [];
     datePickerChildrenSubscription?: Subscription;
 
-    // Icons
-    faCogs = faCogs;
-    faUserCheck = faUserCheck;
-    faUserSlash = faUserSlash;
-
     isAthenaEnabled$: Observable<boolean> | undefined;
 
     isImport: boolean = false;
@@ -108,8 +108,13 @@ export class ProgrammingExerciseLifecycleComponent implements AfterViewInit, OnD
 
     calculateFormStatus() {
         const datePickers = this.datePickerComponents.toArray();
-        this.formValid = every(datePickers, (picker) => picker.dateInput.valid);
-        this.formEmpty = !every(datePickers, (picker) => picker.selectedDate);
+        this.formValid = every(datePickers, (picker) => picker?.dateInput?.valid ?? true);
+        this.formEmpty = !every(datePickers, (picker) => {
+            if (picker instanceof ProgrammingExerciseTestScheduleDatePickerComponent) {
+                return picker.selectedDate;
+            }
+            return false;
+        });
         this.formValidChanges.next(this.formValid);
     }
 
diff --git a/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.html b/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.html
index 64963ad0bbca..5aa5afd850ca 100644
--- a/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.html
@@ -10,4 +10,6 @@
     [hideChannelName]="hideChannelNameInput"
     [minTitleLength]="minTitleLength"
     [initChannelName]="isImport || exercise.id === undefined"
+    [isEditFieldDisplayedRecord]="isEditFieldDisplayedRecord()"
+    [alreadyUsedTitles]="alreadyUsedExerciseNames()"
 />
diff --git a/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts b/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts
index 6f13e110c42f..5ad7384d3d17 100644
--- a/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component.ts
@@ -1,7 +1,9 @@
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild, effect, inject, input, signal } from '@angular/core';
 import { Course, isCommunicationEnabled } from 'app/entities/course.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
+import { CourseExistingExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 
 @Component({
     selector: 'jhi-exercise-title-channel-name',
@@ -9,22 +11,43 @@ import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/ti
 })
 export class ExerciseTitleChannelNameComponent implements OnChanges {
     @Input() exercise: Exercise;
-    @Input() course?: Course;
+    course = input<Course>();
     @Input() titlePattern: string;
     @Input() minTitleLength: number;
     @Input() isExamMode: boolean;
     @Input() isImport: boolean;
     @Input() hideTitleLabel: boolean;
+    isEditFieldDisplayedRecord = input<Record<ProgrammingExerciseInputField, boolean>>();
+    courseId = input<number>();
 
     @ViewChild(TitleChannelNameComponent) titleChannelNameComponent: TitleChannelNameComponent;
 
     @Output() onTitleChange = new EventEmitter<string>();
     @Output() onChannelNameChange = new EventEmitter<string>();
 
+    private readonly exerciseService: ExerciseService = inject(ExerciseService);
+
+    alreadyUsedExerciseNames = signal<Set<string>>(new Set());
+
     hideChannelNameInput = false;
+
+    constructor() {
+        effect(
+            function fetchExistingExerciseNamesOnInit() {
+                const courseId = this.courseId() ?? this.course()?.id;
+                if (courseId && this.exercise.type) {
+                    this.exerciseService.getExistingExerciseDetailsInCourse(courseId, this.exercise.type).subscribe((exerciseDetails: CourseExistingExerciseDetailsType) => {
+                        this.alreadyUsedExerciseNames.set(exerciseDetails.exerciseTitles ?? new Set());
+                    });
+                }
+            }.bind(this),
+            { allowSignalWrites: true },
+        );
+    }
+
     ngOnChanges(changes: SimpleChanges) {
         if (changes.exercise || changes.course || changes.isExamMode || this.isImport) {
-            this.hideChannelNameInput = !this.requiresChannelName(this.exercise, this.course, this.isExamMode, this.isImport);
+            this.hideChannelNameInput = !this.requiresChannelName(this.exercise, this.course(), this.isExamMode, this.isImport);
         }
     }
 
diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
index 909aa30aa592..f3247bc26267 100644
--- a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
+++ b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
@@ -42,6 +42,11 @@ export type ExerciseDetailsType = {
     activatedExerciseHints?: ExerciseHint[];
 };
 
+export type CourseExistingExerciseDetailsType = {
+    exerciseTitles?: Set<string>;
+    shortNames?: Set<string>;
+};
+
 export interface ExerciseServicable<T extends Exercise> {
     create(exercise: T): Observable<HttpResponse<T>>;
 
@@ -56,6 +61,7 @@ export interface ExerciseServicable<T extends Exercise> {
 export class ExerciseService {
     public resourceUrl = 'api/exercises';
     public adminResourceUrl = 'api/admin/exercises';
+    public courseResourceUrl = 'api/courses';
 
     constructor(
         private http: HttpClient,
@@ -246,6 +252,22 @@ export class ExerciseService {
             });
     }
 
+    getExistingExerciseDetailsInCourse(courseId: number, exerciseType: ExerciseType): Observable<CourseExistingExerciseDetailsType> {
+        return this.http
+            .get<CourseExistingExerciseDetailsType>(`${this.courseResourceUrl}/${courseId}/existing-exercise-details?exerciseType=${exerciseType}`, {
+                observe: 'response',
+            })
+            .pipe(
+                map((response) => {
+                    const details = response.body!;
+                    return {
+                        exerciseTitles: new Set(details.exerciseTitles ?? []),
+                        shortNames: new Set(details.shortNames ?? []),
+                    } as CourseExistingExerciseDetailsType;
+                }),
+            );
+    }
+
     isActiveQuiz(exercise: QuizExercise) {
         return (
             exercise?.quizBatches?.some((batch) => batch.started) ||
diff --git a/src/main/webapp/app/forms/form-footer/form-footer.component.html b/src/main/webapp/app/forms/form-footer/form-footer.component.html
index fcf270ec0efc..baa890eef6a2 100644
--- a/src/main/webapp/app/forms/form-footer/form-footer.component.html
+++ b/src/main/webapp/app/forms/form-footer/form-footer.component.html
@@ -1,8 +1,27 @@
 <div class="update-footer gap-4">
+    <div class="text-start">
+        @if (isSimpleMode() !== undefined && switchEditMode !== undefined && !isImport()) {
+            <div class="d-flex align-items-center">
+                <div
+                    ngbTooltip="{{ 'artemisApp.programmingExercise.auxiliaryRepository.invalidConfigurationPreventsSwitchingEditMode' | artemisTranslate }}"
+                    [disableTooltip]="areAuxiliaryRepositoriesValid()"
+                >
+                    <jhi-switch-edit-mode-button
+                        class="me-1"
+                        [isSimpleMode]="isSimpleMode()!"
+                        (switchEditMode)="switchEditMode()"
+                        [buttonSize]="ButtonSize.SMALL"
+                        [disabled]="!areAuxiliaryRepositoriesValid()"
+                    />
+                </div>
+                <jhi-help-icon [text]="isSimpleMode() ? 'artemisApp.programmingExercise.home.advancedModeTooltip' : 'artemisApp.programmingExercise.home.simpleModeTooltip'" />
+            </div>
+        }
+    </div>
     @if (!isCreation() && !isImport()) {
-        <jhi-exercise-update-notification class="flex-grow-1" [notificationText]="notificationText" (notificationTextChange)="notificationTextChange.next($event)" />
+        <jhi-exercise-update-notification class="flex-grow-1 w-100" [notificationText]="notificationText" (notificationTextChange)="notificationTextChange.next($event)" />
     }
-    <div class="update-footer-content d-flex gap-2">
+    <div class="d-flex gap-2 text-end">
         @if (isSaving) {
             <span jhiTranslate="entity.action.saving" class="badge bg-secondary align-content-center"></span>
         }
diff --git a/src/main/webapp/app/forms/form-footer/form-footer.component.scss b/src/main/webapp/app/forms/form-footer/form-footer.component.scss
index e4035ba4b9b0..37c48be20471 100644
--- a/src/main/webapp/app/forms/form-footer/form-footer.component.scss
+++ b/src/main/webapp/app/forms/form-footer/form-footer.component.scss
@@ -9,7 +9,7 @@
     z-index: 10;
     background: var(--update-footer-background);
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
     align-items: center;
     border-top: 1px solid var(--border-color);
 }
diff --git a/src/main/webapp/app/forms/form-footer/form-footer.component.ts b/src/main/webapp/app/forms/form-footer/form-footer.component.ts
index bb2192728381..2cdd61d773fe 100644
--- a/src/main/webapp/app/forms/form-footer/form-footer.component.ts
+++ b/src/main/webapp/app/forms/form-footer/form-footer.component.ts
@@ -9,26 +9,24 @@ import { ButtonSize } from 'app/shared/components/button.component';
     styleUrls: ['form-footer.component.scss'],
 })
 export class FormFooterComponent {
-    @Output() save = new EventEmitter<void>();
-
-    @Output() onCancel = new EventEmitter<void>();
+    protected readonly ButtonSize = ButtonSize;
+    protected readonly faSave = faSave;
+    protected readonly faBan = faBan;
+    protected readonly faExclamationCircle = faExclamationCircle;
 
     @Input() isSaving: boolean = false;
     @Input() isDisabled: boolean = false;
-
     @Input() invalidReasons: ValidationReason[] = [];
-
     @Input() notificationText?: string;
-    @Output() notificationTextChange = new EventEmitter<string>();
-
-    ButtonSize = ButtonSize;
-
+    @Input() switchEditMode?: () => void;
     isImport = input<boolean>();
     isCreation = input<boolean>();
+    isSimpleMode = input<boolean>();
+    areAuxiliaryRepositoriesValid = input<boolean>(true);
 
-    saveTitle = computed<string>(() => (this.isImport() ? 'entity.action.import' : this.isCreation() ? 'entity.action.generate' : 'entity.action.save'));
+    @Output() notificationTextChange = new EventEmitter<string>();
+    @Output() save = new EventEmitter<void>();
+    @Output() onCancel = new EventEmitter<void>();
 
-    faSave = faSave;
-    faBan = faBan;
-    faExclamationCircle = faExclamationCircle;
+    saveTitle = computed<string>(() => (this.isImport() ? 'entity.action.import' : this.isCreation() ? 'entity.action.generate' : 'entity.action.save'));
 }
diff --git a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
index edd4cffc59e1..94f8919d5ba5 100644
--- a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
+++ b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
@@ -1,8 +1,8 @@
-@if (formStatusSections) {
+@if (formStatusSections()) {
     <div #statusBar class="form-status-bar-container pt-2 pb-1">
         <hr class="form-status-line" />
         <div class="d-flex justify-content-between">
-            @for (formStatusSection of formStatusSections; track formStatusSection.title; let index = $index) {
+            @for (formStatusSection of formStatusSections(); track formStatusSection.title; let index = $index) {
                 <div class="d-flex flex-column align-items-center" id="status-bar-section-item-{{ index }}">
                     <div class="form-status-circle border rounded-circle" (click)="scrollToHeadline(formStatusSection.title)">
                         <jhi-checklist-check
@@ -11,7 +11,9 @@
                             class="fa-sm position-absolute top-50 start-50 translate-middle"
                         />
                     </div>
-                    <a (click)="scrollToHeadline(formStatusSection.title)" class="d-none d-sm-inline link-primary">{{ formStatusSection.title | artemisTranslate }}</a>
+                    <a (click)="scrollToHeadline(formStatusSection.title)" class="d-none d-sm-inline link-primary">
+                        {{ formStatusSection.title | artemisTranslate }}
+                    </a>
                 </div>
             }
         </div>
diff --git a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
index ff512756dd83..dbf821a83201 100644
--- a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
+++ b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, HostListener, ViewChild, input } from '@angular/core';
 import { updateHeaderHeight } from 'app/shared/util/navbar.util';
 
 export type FormSectionStatus = {
@@ -13,8 +13,7 @@ export type FormSectionStatus = {
     styleUrl: './form-status-bar.component.scss',
 })
 export class FormStatusBarComponent implements AfterViewInit {
-    @Input()
-    formStatusSections: FormSectionStatus[];
+    formStatusSections = input.required<FormSectionStatus[]>();
 
     @ViewChild('statusBar', { static: false }) statusBar?: ElementRef;
 
diff --git a/src/main/webapp/app/forms/forms.module.ts b/src/main/webapp/app/forms/forms.module.ts
index f5c3c018a29e..639a4cf8b10c 100644
--- a/src/main/webapp/app/forms/forms.module.ts
+++ b/src/main/webapp/app/forms/forms.module.ts
@@ -4,9 +4,10 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { FormFooterComponent } from 'app/forms/form-footer/form-footer.component';
 import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module';
+import { SwitchEditModeButtonComponent } from 'app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component';
 
 @NgModule({
-    imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule, ExerciseUpdateNotificationModule],
+    imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule, ExerciseUpdateNotificationModule, SwitchEditModeButtonComponent],
     declarations: [FormStatusBarComponent, FormFooterComponent],
     exports: [FormStatusBarComponent, FormFooterComponent],
 })
diff --git a/src/main/webapp/app/shared/category-selector/category-selector.component.ts b/src/main/webapp/app/shared/category-selector/category-selector.component.ts
index 4214f340ffca..2c3e31b1e67f 100644
--- a/src/main/webapp/app/shared/category-selector/category-selector.component.ts
+++ b/src/main/webapp/app/shared/category-selector/category-selector.component.ts
@@ -18,34 +18,27 @@ const DEFAULT_COLORS = ['#6ae8ac', '#9dca53', '#94a11c', '#691b0b', '#ad5658', '
     encapsulation: ViewEncapsulation.None,
 })
 export class CategorySelectorComponent implements OnChanges {
-    @ViewChild(ColorSelectorComponent, { static: false }) colorSelector: ColorSelectorComponent;
+    protected readonly faTimes = faTimes;
+    protected readonly separatorKeysCodes = [ENTER, COMMA, TAB];
+    private readonly COLOR_SELECTOR_HEIGHT = 150;
 
-    /**
-     * the selected categories, which can be manipulated by the user in the UI
-     */
+    /** the selected categories, which can be manipulated by the user in the UI */
     @Input() categories: ExerciseCategory[] | FaqCategory[];
-
-    /**
-     * the existing categories used for auto-completion, might include duplicates
-     */
+    /** the existing categories used for auto-completion, might include duplicates */
     @Input() existingCategories: ExerciseCategory[] | FaqCategory[];
 
-    @Output() selectedCategories = new EventEmitter<ExerciseCategory[]>();
-
+    @ViewChild(ColorSelectorComponent, { static: false }) colorSelector: ColorSelectorComponent;
     @ViewChild('categoryInput') categoryInput: ElementRef<HTMLInputElement>;
-
     @ViewChild(MatAutocompleteTrigger) autocompleteTrigger: MatAutocompleteTrigger;
 
+    @Output() selectedCategories = new EventEmitter<ExerciseCategory[]>();
+
     categoryColors = DEFAULT_COLORS;
     selectedCategory: ExerciseCategory;
     uniqueCategoriesForAutocomplete: Observable<string[]>;
-    private readonly COLOR_SELECTOR_HEIGHT = 150;
 
-    separatorKeysCodes = [ENTER, COMMA, TAB];
     categoryCtrl = new FormControl<string | undefined>(undefined);
 
-    readonly faTimes = faTimes;
-
     ngOnChanges() {
         this.uniqueCategoriesForAutocomplete = this.categoryCtrl.valueChanges.pipe(
             startWith(undefined),
@@ -61,14 +54,14 @@ export class CategorySelectorComponent implements OnChanges {
         if (!this.categories) {
             return [];
         }
-        return this.categories.map((exerciseCategory) => exerciseCategory.category!.toLowerCase());
+        return this.categories.map((exerciseCategory) => exerciseCategory.category?.toLowerCase() ?? '');
     }
 
     private existingCategoriesAsStringArray(): string[] {
         if (!this.existingCategories) {
             return [];
         }
-        return this.existingCategories.map((exerciseCategory) => exerciseCategory.category!.toLowerCase());
+        return this.existingCategories.map((exerciseCategory) => exerciseCategory.category?.toLowerCase() ?? '');
     }
 
     // if the user types in something, we need to filter for the matching categories
diff --git a/src/main/webapp/app/shared/components/help-icon.component.ts b/src/main/webapp/app/shared/components/help-icon.component.ts
index 469e69cb1c91..b478c5f093aa 100644
--- a/src/main/webapp/app/shared/components/help-icon.component.ts
+++ b/src/main/webapp/app/shared/components/help-icon.component.ts
@@ -1,14 +1,13 @@
-import { Component, Input } from '@angular/core';
+import { Component, input } from '@angular/core';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
     selector: 'jhi-help-icon',
-    template: ` <fa-icon [icon]="faQuestionCircle" class="text-secondary" [placement]="placement" ngbTooltip="{{ text | artemisTranslate }}" /> `,
+    template: ` <fa-icon [icon]="faQuestionCircle" class="text-secondary" [placement]="placement()" ngbTooltip="{{ text() | artemisTranslate }}" /> `,
 })
 export class HelpIconComponent {
-    @Input() placement = 'auto';
-    @Input() text: string;
+    protected readonly faQuestionCircle = faQuestionCircle;
 
-    // Icons
-    faQuestionCircle = faQuestionCircle;
+    placement = input<string>('auto');
+    text = input.required<string>();
 }
diff --git a/src/main/webapp/app/shared/constants/input.constants.ts b/src/main/webapp/app/shared/constants/input.constants.ts
index e3702ba29751..6748c2507b07 100644
--- a/src/main/webapp/app/shared/constants/input.constants.ts
+++ b/src/main/webapp/app/shared/constants/input.constants.ts
@@ -26,3 +26,24 @@ export const MAX_QUIZ_QUESTION_EXPLANATION_LENGTH_THRESHOLD = 500;
 export const MAX_QUIZ_QUESTION_HINT_LENGTH_THRESHOLD = 255;
 export const ASSIGNMENT_REPO_NAME = 'assignment';
 export const TEST_REPO_NAME = 'tests';
+
+export const MAX_PENALTY_PATTERN = '^([0-9]|([1-9][0-9])|100)$';
+// No dots allowed for the blackbox project type, because the folder naming works slightly different here.
+export const PACKAGE_NAME_PATTERN_FOR_JAVA_BLACKBOX =
+    '^(?!.*(?:\\.|^)(?:abstract|continue|for|new|switch|assert|default|if|package|synchronized|boolean|do|goto|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|_|true|false|null)(?:\\.|$))[A-Z_a-z][0-9A-Z_a-z]*$';
+// Auxiliary Repository names must only include words or '-' characters.
+export const INVALID_REPOSITORY_NAME_PATTERN = RegExp('^(?!(solution|exercise|tests|auxiliary)\\b)\\b(\\w|-)+$');
+// Auxiliary Repository checkout directories must be valid directory paths. Those must only include words,
+// '-' or '/' characters.
+export const INVALID_DIRECTORY_NAME_PATTERN = RegExp('^[\\w-]+(/[\\w-]+)*$');
+// length of < 3 is also accepted in order to provide more accurate validation error messages
+export const PROGRAMMING_EXERCISE_SHORT_NAME_PATTERN = RegExp('(^(?![\\s\\S]))|^[a-zA-Z][a-zA-Z0-9]*$|' + SHORT_NAME_PATTERN); // must start with a letter and cannot contain special characters
+
+// Java package name Regex according to Java 14 JLS (https://docs.oracle.com/javase/specs/jls/se14/html/jls-7.html#jls-7.4.1),
+// with the restriction to a-z,A-Z,_ as "Java letter" and 0-9 as digits due to JavaScript/Browser Unicode character class limitations
+export const PACKAGE_NAME_PATTERN_FOR_JAVA_KOTLIN =
+    '^(?!.*(?:\\.|^)(?:abstract|continue|for|new|switch|assert|default|if|package|synchronized|boolean|do|goto|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while|_|true|false|null)(?:\\.|$))[A-Z_a-z][0-9A-Z_a-z]*(?:\\.[A-Z_a-z][0-9A-Z_a-z]*)*$';
+// Swift package name Regex derived from (https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID412),
+// with the restriction to a-z,A-Z as "Swift letter" and 0-9 as digits where no separators are allowed
+export const APP_NAME_PATTERN_FOR_SWIFT =
+    '^(?!(?:associatedtype|class|deinit|enum|extension|fileprivate|func|import|init|inout|internal|let|open|operator|private|protocol|public|rethrows|static|struct|subscript|typealias|var|break|case|continue|default|defer|do|else|fallthrough|for|guard|if|in|repeat|return|switch|where|while|as|Any|catch|false|is|nil|super|self|Self|throw|throws|true|try|_|[sS]wift)$)[A-Za-z][0-9A-Za-z]*$';
diff --git a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.html b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.html
index e9d8c99f7374..cbc0f4a49425 100644
--- a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.html
+++ b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.html
@@ -1,22 +1,29 @@
 <div>
-    <div class="form-group">
-        @if (!hideTitleLabel) {
-            <label [class]="'form-control-label' + (emphasizeLabels ? ' emphasized-label' : '')" jhiTranslate="artemisApp.lecture.title" for="field_title"></label>
-        }
-        <input
-            #field_title="ngModel"
-            required
-            [minlength]="minTitleLength"
-            [pattern]="titlePattern"
-            type="text"
-            class="form-control"
-            name="title"
-            id="field_title"
-            [ngModel]="title"
-            (ngModelChange)="updateTitle($event)"
-        />
-    </div>
-    @if (!hideChannelName) {
+    @if (!this.isEditFieldDisplayedRecord() || this.isEditFieldDisplayedRecord()?.title) {
+        <div class="form-group">
+            @if (!hideTitleLabel) {
+                <label [class]="'form-control-label' + (emphasizeLabels ? ' emphasized-label' : '')" jhiTranslate="artemisApp.lecture.title" for="field_title"></label>
+            }
+            <input
+                #field_title="ngModel"
+                required
+                [minlength]="minTitleLength"
+                [pattern]="titlePattern"
+                type="text"
+                class="form-control"
+                name="title"
+                id="field_title"
+                [ngModel]="title"
+                (ngModelChange)="updateTitle($event)"
+                notIncludedIn
+                [disallowedValues]="alreadyUsedTitles()"
+            />
+            @if (field_title?.control?.errors?.disallowedValue) {
+                <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.form.title.disallowedValue"></div>
+            }
+        </div>
+    }
+    @if (isChannelFieldDisplayed()) {
         <div class="form-group">
             <div>
                 <label [class]="'form-control-label' + (emphasizeLabels ? ' emphasized-label' : '')" jhiTranslate="artemisApp.lecture.channelName" for="field_channel_name"
diff --git a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.ts b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.ts
index ccdc2c2a061e..6fbbfdca412f 100644
--- a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.ts
+++ b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.component.ts
@@ -1,6 +1,7 @@
-import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild, computed, effect, input, signal, viewChild } from '@angular/core';
 import { ControlContainer, NgForm, NgModel } from '@angular/forms';
 import { Subject, Subscription } from 'rxjs';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 @Component({
     selector: 'jhi-title-channel-name',
@@ -14,23 +15,50 @@ export class TitleChannelNameComponent implements AfterViewInit, OnDestroy, OnIn
     @Input() titlePattern: string;
     @Input() hideTitleLabel: boolean;
     @Input() emphasizeLabels = false;
-    @Input() hideChannelName?: boolean;
     @Input() minTitleLength: number;
     @Input() initChannelName = true;
+    hideChannelName = input<boolean>();
+    isEditFieldDisplayedRecord = input<Record<ProgrammingExerciseInputField, boolean>>();
+    alreadyUsedTitles = input<Set<string>>(new Set());
+
+    titleOnPageLoad = signal<string | undefined>(undefined);
 
     @ViewChild('field_title') field_title: NgModel;
-    @ViewChild('field_channel_name') field_channel_name?: NgModel;
+    field_channel_name = viewChild<NgModel>('field_channel_name');
 
     @Output() titleChange = new EventEmitter<string>();
     @Output() channelNameChange = new EventEmitter<string>();
 
+    formValidSignal = signal<boolean>(false);
     formValid: boolean;
     formValidChanges = new Subject();
 
-    // subscriptions
     fieldTitleSubscription?: Subscription;
     fieldChannelNameSubscription?: Subscription;
 
+    isChannelFieldDisplayed = computed(() => {
+        return !this.hideChannelName() && (!this.isEditFieldDisplayedRecord() || this.isEditFieldDisplayedRecord()?.channelName);
+    });
+
+    constructor() {
+        effect(() => {
+            this.isEditFieldDisplayedRecord(); // triggers effect
+            this.registerChangeListeners();
+        });
+
+        effect(
+            function removeInitialTitleInEditFromForbiddenTitles() {
+                if (this.titleOnPageLoad()) {
+                    this.alreadyUsedTitles().delete(this.titleOnPageLoad());
+                }
+            }.bind(this),
+        );
+    }
+
+    ngAfterViewInit() {
+        this.registerChangeListeners();
+    }
+
     ngOnInit(): void {
         if (!this.channelNamePrefix) {
             this.channelNamePrefix = '';
@@ -44,11 +72,13 @@ export class TitleChannelNameComponent implements AfterViewInit, OnDestroy, OnIn
                 this.formatChannelName(this.channelNamePrefix + (this.title ?? ''), false, !!this.title);
             });
         }
+
+        this.titleOnPageLoad.set(this.title);
     }
 
-    ngAfterViewInit() {
-        this.fieldTitleSubscription = this.field_title.valueChanges?.subscribe(() => this.calculateFormValid());
-        this.fieldChannelNameSubscription = this.field_channel_name?.valueChanges?.subscribe(() => this.calculateFormValid());
+    private registerChangeListeners() {
+        this.fieldTitleSubscription = this.field_title?.valueChanges?.subscribe(() => this.calculateFormValid());
+        this.fieldChannelNameSubscription = this.field_channel_name()?.valueChanges?.subscribe(() => this.calculateFormValid());
     }
 
     ngOnDestroy() {
@@ -57,7 +87,9 @@ export class TitleChannelNameComponent implements AfterViewInit, OnDestroy, OnIn
     }
 
     calculateFormValid(): void {
-        this.formValid = Boolean(this.field_title.valid && (this.hideChannelName || this.field_channel_name?.valid));
+        const updatedFormValidValue = Boolean(this.field_title.valid && (!this.isChannelFieldDisplayed() || this.field_channel_name()?.valid));
+        this.formValidSignal.set(updatedFormValidValue);
+        this.formValid = updatedFormValidValue;
         this.formValidChanges.next(this.formValid);
     }
 
diff --git a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.module.ts b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.module.ts
index 80885b0ea5b8..70849d7bf364 100644
--- a/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.module.ts
+++ b/src/main/webapp/app/shared/form/title-channel-name/title-channel-name.module.ts
@@ -3,9 +3,11 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { CustomNotIncludedInValidatorDirective } from 'app/shared/validators/custom-not-included-in-validator.directive';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 @NgModule({
-    imports: [FormsModule, CommonModule, ArtemisSharedComponentModule],
+    imports: [FormsModule, CommonModule, ArtemisSharedComponentModule, CustomNotIncludedInValidatorDirective, TranslateDirective],
     declarations: [TitleChannelNameComponent],
     exports: [TitleChannelNameComponent],
 })
diff --git a/src/main/webapp/app/shared/util/utils.ts b/src/main/webapp/app/shared/util/utils.ts
index ed3df211540a..b6169c9ccfac 100644
--- a/src/main/webapp/app/shared/util/utils.ts
+++ b/src/main/webapp/app/shared/util/utils.ts
@@ -171,3 +171,7 @@ export function roundToNextMultiple(value: number, multiple: number, roundUp: bo
 
     return Math.floor(value / multiple) * multiple;
 }
+
+export function removeSpecialCharacters(input: string): string {
+    return input.replace(/[^a-zA-Z0-9]/g, '');
+}
diff --git a/src/main/webapp/app/shared/validators/custom-not-included-in-validator.directive.ts b/src/main/webapp/app/shared/validators/custom-not-included-in-validator.directive.ts
new file mode 100644
index 000000000000..ad713998e883
--- /dev/null
+++ b/src/main/webapp/app/shared/validators/custom-not-included-in-validator.directive.ts
@@ -0,0 +1,30 @@
+import { Directive, input } from '@angular/core';
+import { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms';
+
+/**
+ * Custom validator for an array of excluded values for an input element
+ *
+ * Adds the 'disallowedValue' error key (= true) to the control if the value is in the disallowedValues array
+ */
+@Directive({
+    // eslint-disable-next-line @angular-eslint/directive-selector
+    selector: '[notIncludedIn][ngModel],[notIncludedIn][formControl]',
+    providers: [{ provide: NG_VALIDATORS, useExisting: CustomNotIncludedInValidatorDirective, multi: true }],
+    standalone: true,
+})
+export class CustomNotIncludedInValidatorDirective implements Validator {
+    disallowedValues = input.required<Set<unknown>>();
+
+    validate(control: AbstractControl): { [key: string]: any } | null {
+        if (control == undefined) {
+            return null;
+        }
+
+        const isValueAlreadyTaken = this.disallowedValues().has(control.value);
+        if (isValueAlreadyTaken) {
+            return { disallowedValue: true };
+        }
+
+        return null;
+    }
+}
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index 856f5ffe2252..00cc0421b9db 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -215,12 +215,14 @@
                 "description": "Wenn das Präsentationsergebnis aktiviert ist, dann können Tutor:innen auf der Seite \"Teilnahmen\" dieser Übung einen Punkt für Präsentation von Studierenden eintragen."
             },
             "errors": {
-                "exerciseNotFound": "Diese Übung konnte nicht gefunden werden"
+                "exerciseNotFound": "Diese Übung konnte nicht gefunden werden",
+                "projectTypeCouldNotBeDetermined": "Der Projekttyp konnte nicht bestimmt werden, bitte wechsle zum erweiterten Modus und wähle den Projekttyp manuell aus."
             },
             "form": {
                 "title": {
                     "undefined": "Der Titel wurde nicht ausgefüllt!",
-                    "pattern": "Der Titel darf nur aus Buchstaben, Zahlen und '_', '-' oder Leerzeichen bestehen!"
+                    "pattern": "Der Titel darf nur aus Buchstaben, Zahlen und '_', '-' oder Leerzeichen bestehen!",
+                    "disallowedValue": "Der Titel wird bereits für eine andere Aufgabe genutzt!"
                 },
                 "channelName": {
                     "empty": "Der Kanalname wurde nicht ausgefüllt!"
@@ -228,7 +230,8 @@
                 "shortName": {
                     "undefined": "Der Kurzname wurde nicht ausgefüllt!",
                     "pattern": "Der Kurzname muss mit einem Buchstaben beginnen und darf keine speziellen Zeichen enthalten!",
-                    "minlength": "Der Kurzname muss mindestens 3 Zeichen lang sein!"
+                    "minlength": "Der Kurzname muss mindestens 3 Zeichen lang sein!",
+                    "disallowedValue": "Der Kurzname wird bereits für eine andere Aufgabe genutzt!"
                 },
                 "packageName": {
                     "undefined": "Der Package-Name wurde nicht ausgefüllt!",
diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json
index 605a5e4d0df3..ceae33b2a043 100644
--- a/src/main/webapp/i18n/de/programmingExercise.json
+++ b/src/main/webapp/i18n/de/programmingExercise.json
@@ -7,9 +7,10 @@
                 "editLabel": "Programmieraufgabe bearbeiten",
                 "importLabel": "Programmieraufgabe importieren",
                 "linkLabel": "Neue Programmieraufgabe verlinken",
-                "switchToGuidedModeLabel": "Zum geführten Modus wechseln",
-                "switchToTraditionalModeLabel": "Zum normalen Modus wechseln",
-                "nextStepLabel": "Weiter"
+                "switchToSimpleMode": "Zum einfachen Modus wechseln",
+                "simpleModeTooltip": "Der einfache Modus reduziert die Ansicht auf Konfigurationsoptionen die für eine grundlegende Programmieraufgabe benötigt werden. Änderungen aus dem erweiterten Modus werden beim Speichern übernommen.",
+                "switchToAdvancedMode": "Zum erweiterten Modus wechseln",
+                "advancedModeTooltip": "Der erweiterte Modus bietet erweiterte Konfigurationsmöglichkeiten."
             },
             "created": "Programmieraufgabe erstellt mit Titel {{ param }}",
             "updated": "Programmieraufgabe aktualisiert mit Titel {{ param }}",
@@ -550,7 +551,8 @@
                 },
                 "invalidDirectoryName": {
                     "pattern": "Checkout-Verzeichnisse dürfen nur Wörter, '_', '-', und '/' Zeichen beinhalten, aber nicht mit '/' beginnen oder enden."
-                }
+                },
+                "invalidConfigurationPreventsSwitchingEditMode": "Bitte ändere die Hilfs-Repository-Konfiguration zu einer validen Konfiguration um zum Simple Mode zu wechseln."
             },
             "submissionPolicy": {
                 "title": "Abgaberichtlinie",
@@ -713,7 +715,8 @@
             }
         },
         "error": {
-            "noparticipations": "Nutzer:in existiert nicht oder es gibt keine Abgaben."
+            "noparticipations": "Nutzer:in existiert nicht oder es gibt keine Abgaben.",
+            "shortNameGenerationFailed": "Der Kurzname konnte nicht generiert werden, bitte wechsle zum erweiterten Modus und setze den Kurznamen manuell."
         }
     }
 }
diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
index 37793486a52c..82144be9ffe5 100644
--- a/src/main/webapp/i18n/en/exercise.json
+++ b/src/main/webapp/i18n/en/exercise.json
@@ -215,12 +215,14 @@
                 "description": "If the presentation score is enabled, tutors can enter points for students on the \"Participation\" page of the exercise."
             },
             "errors": {
-                "exerciseNotFound": "This exercise was not found"
+                "exerciseNotFound": "This exercise was not found",
+                "projectTypeCouldNotBeDetermined": "The project type could not be determined, please switch to the advanced mode to manually define it!"
             },
             "form": {
                 "title": {
                     "undefined": "There has to be a title set!",
-                    "pattern": "The title must only consist of alphanumeric characters and '_', '-' or whitespaces!"
+                    "pattern": "The title must only consist of alphanumeric characters and '_', '-' or whitespaces!",
+                    "disallowedValue": "The title is already used for another exercise!"
                 },
                 "channelName": {
                     "empty": "There has to be a channel name set!"
@@ -228,7 +230,8 @@
                 "shortName": {
                     "undefined": "There has to be a short name set!",
                     "pattern": "The short name must begin with a letter and must not contain any special characters!",
-                    "minlength": "The short name must be at least 3 characters long!"
+                    "minlength": "The short name must be at least 3 characters long!",
+                    "disallowedValue": "The short name is already used for another exercise!"
                 },
                 "packageName": {
                     "undefined": "There has to be a package name set!",
diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json
index ff251a44ef57..df85bd7c0911 100644
--- a/src/main/webapp/i18n/en/programmingExercise.json
+++ b/src/main/webapp/i18n/en/programmingExercise.json
@@ -7,9 +7,10 @@
                 "editLabel": "Edit Programming Exercise",
                 "importLabel": "Import Programming Exercise",
                 "linkLabel": "Link new Programming Exercise",
-                "switchToGuidedModeLabel": "Switch to guided mode",
-                "switchToTraditionalModeLabel": "Switch to normal mode",
-                "nextStepLabel": "Next"
+                "switchToSimpleMode": "Switch to simple mode",
+                "simpleModeTooltip": "The simple mode reduces the view to configuration options that are needed for a basic programming exercise. Changes made in the advanced mode will be saved.",
+                "switchToAdvancedMode": "Switch to advanced mode",
+                "advancedModeTooltip": "The advanced mode offers extended configuration options."
             },
             "created": "Created new Programming Exercise with title {{ param }}",
             "updated": "Updated Programming Exercise with title {{ param }}",
@@ -550,7 +551,8 @@
                 },
                 "invalidDirectoryName": {
                     "pattern": "Checkout directory paths must only contain words, '_', '-', and '/' characters, but must not start nor end with a '/' character."
-                }
+                },
+                "invalidConfigurationPreventsSwitchingEditMode": "Adjust the auxiliary repository configuration to a valid configuration to switch to the simple mode."
             },
             "submissionPolicy": {
                 "title": "Submission Policy",
@@ -712,7 +714,8 @@
             }
         },
         "error": {
-            "noparticipations": "No existing user was specified or no submission exists."
+            "noparticipations": "No existing user was specified or no submission exists.",
+            "shortNameGenerationFailed": "The short name could not be generated, please switch to the advanced mode and set the short name manually."
         }
     }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java
index 9dab62af4261..690a781a5848 100644
--- a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java
@@ -90,6 +90,7 @@
 import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration;
 import de.tum.cit.aet.artemis.core.domain.Organization;
 import de.tum.cit.aet.artemis.core.domain.User;
+import de.tum.cit.aet.artemis.core.dto.CourseExistingExerciseDetailsDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForArchiveDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO;
 import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO;
@@ -3436,4 +3437,15 @@ public void testGetAllCoursesForCourseArchiveForUnenrolledStudent() throws Excep
         assertThat(actualCoursesForStudent).as("Course archive does not show any courses to the user removed from these courses").hasSize(0);
     }
 
+    // Test
+    public void testGetExistingExerciseDetails_asTutor() throws Exception {
+        Course course = courseUtilService.createCourseWith2ProgrammingExercisesTextExerciseTutorAndEditor();
+        request.getList("/api/courses/" + course.getId() + "/existing-exercise-details?exerciseType=programming", HttpStatus.FORBIDDEN, CourseExistingExerciseDetailsDTO.class);
+    }
+
+    // Test
+    public void testGetExistingExerciseDetails_asEditor(String username) throws Exception {
+        Course course = courseUtilService.createCourseWith2ProgrammingExercisesTextExerciseTutorAndEditor();
+        request.get("/api/courses/" + course.getId() + "/existing-exercise-details?exerciseType=programming", HttpStatus.OK, CourseExistingExerciseDetailsDTO.class);
+    }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java
index 93e7856af38e..3df4bce1cfea 100644
--- a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java
@@ -1246,6 +1246,19 @@ public Course createCourseWithTextExerciseAndTutor(String tutorLogin) {
         return course;
     }
 
+    public Course createCourseWith2ProgrammingExercisesTextExerciseTutorAndEditor() {
+        Course course = this.createCourse();
+        TextExercise textExercise = textExerciseUtilService.createIndividualTextExercise(course, PAST_TIMESTAMP, PAST_TIMESTAMP, PAST_TIMESTAMP);
+        ProgrammingExercise programmingExercise1 = programmingExerciseUtilService.createSampleProgrammingExercise();
+        ProgrammingExercise programmingExercise2 = programmingExerciseUtilService.createSampleProgrammingExercise("Title1", "shortnameone");
+
+        course.addExercises(textExercise);
+        course.addExercises(programmingExercise1);
+        course.addExercises(programmingExercise2);
+
+        return course;
+    }
+
     /**
      * Updates the max complaint text limit of the course.
      *
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java
index f804a66196e8..433d1a3e2deb 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java
@@ -1053,4 +1053,17 @@ void testGetAllCoursesForCourseArchiveWithNonNullSemesters() throws Exception {
     void testGetAllCoursesForCourseArchiveForUnenrolledStudent() throws Exception {
         courseTestService.testGetAllCoursesForCourseArchiveForUnenrolledStudent();
     }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "TA")
+    void testGetExistingExerciseDetails_asTutor() throws Exception {
+        courseTestService.testGetExistingExerciseDetails_asTutor();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR")
+    void testGetExistingExerciseDetails_asEditor() throws Exception {
+        String username = TEST_PREFIX + "tutor1";
+        courseTestService.testGetExistingExerciseDetails_asEditor(username);
+    }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java
index 7aa1d99e1c8f..e27ce95ac8ca 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java
@@ -171,15 +171,19 @@ public class ProgrammingExerciseUtilService {
     @Autowired
     private GitService gitService;
 
+    public ProgrammingExercise createSampleProgrammingExercise() {
+        return createSampleProgrammingExercise("Title", "Shortname");
+    }
+
     /**
      * Create an example programming exercise
      *
      * @return the created programming exercise
      */
-    public ProgrammingExercise createSampleProgrammingExercise() {
+    public ProgrammingExercise createSampleProgrammingExercise(String title, String shortName) {
         var programmingExercise = new ProgrammingExercise();
-        programmingExercise.setTitle("Title");
-        programmingExercise.setShortName("Shortname");
+        programmingExercise.setTitle(title);
+        programmingExercise.setShortName(shortName);
         programmingExercise.setProgrammingLanguage(ProgrammingLanguage.JAVA);
         programmingExercise.setMaxPoints(10.0);
         programmingExercise.setBonusPoints(0.0);
diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
index 88fad0011056..6388db51ed30 100644
--- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
@@ -42,6 +42,7 @@ import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/ti
 import { UMLDiagramType } from '@ls1intum/apollon';
 import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { CustomNotIncludedInValidatorDirective } from '../../../../../main/webapp/app/shared/validators/custom-not-included-in-validator.directive';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 @Component({
@@ -73,7 +74,7 @@ describe('ExamUpdateComponent', () => {
     describe('create and edit exams', () => {
         beforeEach(() => {
             TestBed.configureTestingModule({
-                imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule],
+                imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule, TitleChannelNameComponent],
                 declarations: [
                     ExamUpdateComponent,
                     MockComponent(FormDateTimePickerComponent),
@@ -86,7 +87,7 @@ describe('ExamUpdateComponent', () => {
                     MockDirective(CustomMinDirective),
                     MockDirective(CustomMaxDirective),
                     MockDirective(FeatureToggleDirective),
-                    MockComponent(TitleChannelNameComponent),
+                    MockDirective(CustomNotIncludedInValidatorDirective),
                 ],
                 providers: [
                     provideHttpClient(),
@@ -604,7 +605,7 @@ describe('ExamUpdateComponent', () => {
 
         beforeEach(() => {
             TestBed.configureTestingModule({
-                imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule],
+                imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule, TitleChannelNameComponent],
                 declarations: [
                     ExamUpdateComponent,
                     ExamExerciseImportComponent,
@@ -621,7 +622,7 @@ describe('ExamUpdateComponent', () => {
                     MockComponent(DifficultyBadgeComponent),
                     MockComponent(DocumentationButtonComponent),
                     MockDirective(FeatureToggleDirective),
-                    MockComponent(TitleChannelNameComponent),
+                    MockDirective(CustomNotIncludedInValidatorDirective),
                 ],
                 providers: [
                     provideHttpClient(),
diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
index 37b91a62f115..445c345069ed 100644
--- a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
@@ -5,22 +5,55 @@ import { Course, CourseInformationSharingConfiguration } from 'app/entities/cour
 import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
 import { TitleChannelNameModule } from 'app/shared/form/title-channel-name/title-channel-name.module';
+import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
+import { TranslateService } from '@ngx-translate/core';
+import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storage.service';
+import { SessionStorageService } from 'ngx-webstorage';
+import { MockHttpService } from '../../../helpers/mocks/service/mock-http.service';
+import { HttpClient } from '@angular/common/http';
+import { ExerciseService } from '../../../../../../main/webapp/app/exercises/shared/exercise/exercise.service';
+import { ExerciseType } from '../../../../../../main/webapp/app/entities/exercise.model';
 
 describe('ExerciseTitleChannelNameComponent', () => {
     let component: ExerciseTitleChannelNameComponent;
     let fixture: ComponentFixture<ExerciseTitleChannelNameComponent>;
+    let exerciseService: ExerciseService;
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             declarations: [ExerciseTitleChannelNameComponent],
             imports: [TitleChannelNameModule],
-            providers: [NgForm],
+            providers: [
+                NgForm,
+                { provide: HttpClient, useClass: MockHttpService },
+                { provide: TranslateService, useClass: MockTranslateService },
+                { provide: SessionStorageService, useClass: MockSyncStorage },
+            ],
         }).compileComponents();
     });
 
     beforeEach(() => {
         fixture = TestBed.createComponent(ExerciseTitleChannelNameComponent);
+
+        fixture.componentRef.setInput('course', new Course());
+        fixture.componentRef.setInput('isEditFieldDisplayedRecord', true);
         component = fixture.componentInstance;
+
+        exerciseService = TestBed.inject(ExerciseService);
+    });
+
+    it('should call getExistingExerciseDetailsInCourse on init', () => {
+        const courseId = 123;
+        const exerciseType = ExerciseType.PROGRAMMING;
+        component.exercise = new TextExercise(new Course(), undefined);
+        component.exercise.type = exerciseType;
+        component.exercise.course!.id = courseId;
+
+        fixture.componentRef.setInput('courseId', courseId);
+        const exerciseServiceSpy = jest.spyOn(exerciseService, 'getExistingExerciseDetailsInCourse');
+        fixture.detectChanges();
+
+        expect(exerciseServiceSpy).toHaveBeenCalledExactlyOnceWith(courseId, exerciseType);
     });
 
     it('should hide channel name input if messaging and communication disabled', () => {
@@ -30,7 +63,7 @@ describe('ExerciseTitleChannelNameComponent', () => {
         textExercise.course = course;
 
         component.exercise = textExercise;
-        component.course = textExercise.course;
+        fixture.componentRef.setInput('course', textExercise.course);
         component.isExamMode = false;
         component.isImport = true;
         component.ngOnChanges({ course: new SimpleChange(undefined, course, true) });
@@ -45,7 +78,7 @@ describe('ExerciseTitleChannelNameComponent', () => {
         textExercise.course = course;
 
         component.exercise = textExercise;
-        component.course = textExercise.course;
+        fixture.componentRef.setInput('course', textExercise.course);
         component.isExamMode = false;
         component.isImport = true;
         component.ngOnChanges({ course: new SimpleChange(undefined, course, true) });
@@ -58,21 +91,27 @@ describe('ExerciseTitleChannelNameComponent', () => {
         course.courseInformationSharingConfiguration = CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING;
 
         component.exercise = new TextExercise(course, undefined);
-        component.course = course;
+        fixture.componentRef.setInput('course', course);
 
         // Simulate different scenarios
 
         // create new course exercise
         component.isExamMode = false;
         component.isImport = false;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, false, true), isImport: new SimpleChange(undefined, false, true) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, false, true),
+            isImport: new SimpleChange(undefined, false, true),
+        });
 
         expect(component.hideChannelNameInput).toBeFalse();
 
         // create new exam exercise
         component.isExamMode = true;
         component.isImport = false;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, true, false), isImport: new SimpleChange(undefined, false, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, true, false),
+            isImport: new SimpleChange(undefined, false, false),
+        });
 
         expect(component.hideChannelNameInput).toBeTrue();
 
@@ -82,28 +121,40 @@ describe('ExerciseTitleChannelNameComponent', () => {
         // import course exercise
         component.isExamMode = false;
         component.isImport = true;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, false, false), isImport: new SimpleChange(undefined, true, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, false, false),
+            isImport: new SimpleChange(undefined, true, false),
+        });
 
         expect(component.hideChannelNameInput).toBeFalse();
 
         // import exam exercise
         component.isExamMode = true;
         component.isImport = true;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, true, false), isImport: new SimpleChange(undefined, true, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, true, false),
+            isImport: new SimpleChange(undefined, true, false),
+        });
 
         expect(component.hideChannelNameInput).toBeTrue();
 
         // edit exam exercise
         component.isExamMode = true;
         component.isImport = false;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, true, false), isImport: new SimpleChange(undefined, true, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, true, false),
+            isImport: new SimpleChange(undefined, true, false),
+        });
 
         expect(component.hideChannelNameInput).toBeTrue();
 
         // edit course exercise without existing channel name
         component.isExamMode = false;
         component.isImport = false;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, false, false), isImport: new SimpleChange(undefined, false, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, false, false),
+            isImport: new SimpleChange(undefined, false, false),
+        });
 
         expect(component.hideChannelNameInput).toBeTrue();
 
@@ -111,7 +162,10 @@ describe('ExerciseTitleChannelNameComponent', () => {
         component.exercise.channelName = 'test';
         component.isExamMode = false;
         component.isImport = false;
-        component.ngOnChanges({ isExamMode: new SimpleChange(undefined, true, false), isImport: new SimpleChange(undefined, false, false) });
+        component.ngOnChanges({
+            isExamMode: new SimpleChange(undefined, true, false),
+            isImport: new SimpleChange(undefined, false, false),
+        });
 
         expect(component.hideChannelNameInput).toBeFalse();
     });
diff --git a/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts b/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
index 7c7e5dbbdac3..22ce37099b98 100644
--- a/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
@@ -20,10 +20,10 @@ describe('FormStatusBarComponent', () => {
     });
 
     beforeEach(() => {
-        comp.formStatusSections = [
+        fixture.componentRef.setInput('formStatusSections', [
             { title: 'some-translation-key', valid: true },
             { title: 'another-translation-key', valid: false },
-        ];
+        ]);
     });
 
     afterEach(() => {
@@ -34,8 +34,8 @@ describe('FormStatusBarComponent', () => {
         const mockDOMElement = { scrollIntoView: jest.fn(), style: {} };
         const getElementSpy = jest.spyOn(document, 'getElementById').mockReturnValue(mockDOMElement as any as HTMLElement);
         const scrollToSpy = jest.spyOn(mockDOMElement, 'scrollIntoView');
-        comp.scrollToHeadline(comp.formStatusSections[0].title);
-        expect(getElementSpy).toHaveBeenCalledWith(comp.formStatusSections[0].title);
+        comp.scrollToHeadline(comp.formStatusSections()[0].title);
+        expect(getElementSpy).toHaveBeenCalledWith(comp.formStatusSections()[0].title);
         expect(scrollToSpy).toHaveBeenCalledOnce();
     });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
index 32c41626803d..1ebfcb091aaf 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
@@ -59,6 +59,19 @@ describe('ProgrammingExerciseLifecycleComponent', () => {
                     buildAndTestStudentSubmissionsAfterDueDate: afterDueDate,
                     exampleSolutionPublicationDate,
                 } as ProgrammingExercise;
+
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    releaseDate: true,
+                    startDate: true,
+                    dueDate: true,
+                    runTestsAfterDueDate: true,
+                    assessmentDueDate: true,
+                    exampleSolutionPublicationDate: true,
+                    complaintOnAutomaticAssessment: true,
+                    manualFeedbackRequests: true,
+                    showTestNamesToStudents: true,
+                    includeTestsIntoExampleSolution: true,
+                });
             });
     });
 
@@ -331,8 +344,17 @@ describe('ProgrammingExerciseLifecycleComponent', () => {
     });
 
     it('should calculate form validation status', fakeAsync(() => {
-        const datePicker = { dateInput: { valueChanges: new Subject(), valid: true, value: new Date() } } as any as ProgrammingExerciseTestScheduleDatePickerComponent;
-        comp.datePickerComponents = { changes: new Subject(), toArray: () => [datePicker] } as any as QueryList<ProgrammingExerciseTestScheduleDatePickerComponent>;
+        const datePicker = {
+            dateInput: {
+                valueChanges: new Subject(),
+                valid: true,
+                value: new Date(),
+            },
+        } as any as ProgrammingExerciseTestScheduleDatePickerComponent;
+        comp.datePickerComponents = {
+            changes: new Subject(),
+            toArray: () => [datePicker],
+        } as any as QueryList<ProgrammingExerciseTestScheduleDatePickerComponent>;
         comp.ngAfterViewInit();
         (comp.datePickerComponents.changes as Subject<any>).next({ toArray: () => [datePicker] });
         (datePicker.dateInput.valueChanges as Subject<boolean>).next(true);
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
index 561469eb9381..3e49d0bd49ff 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
@@ -7,7 +7,7 @@ import { Subject, of, throwError } from 'rxjs';
 import dayjs from 'dayjs/esm';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component';
+import { LOCAL_STORAGE_KEY_IS_SIMPLE_MODE, ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
@@ -23,7 +23,7 @@ import {
     ProgrammingLanguageFeature,
     ProgrammingLanguageFeatureService,
 } from 'app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service';
-import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks';
 import { NgxDatatableModule } from '@siemens/ngx-datatable';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { CustomMinDirective } from 'app/shared/validators/custom-min-validator.directive';
@@ -53,11 +53,11 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module';
 import { NgbAlertsMocksModule } from '../../helpers/mocks/directive/ngbAlertsMocks.module';
 import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component';
-import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
-import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component';
-import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component';
-import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component';
-import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component';
+import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component';
+import { ProgrammingExerciseModeComponent } from 'app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component';
+import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component';
+import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component';
+import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component';
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { ExerciseUpdateNotificationComponent } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.component';
@@ -71,6 +71,11 @@ import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/e
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { PROFILE_THEIA } from 'app/app.constants';
+import { SwitchEditModeButtonComponent } from 'app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component';
+import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
+import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.module';
+import { CustomNotIncludedInValidatorDirective } from '../../../../../main/webapp/app/shared/validators/custom-not-included-in-validator.directive';
+import { ProgrammingExerciseDifficultyComponent } from '../../../../../main/webapp/app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component';
 
 describe('ProgrammingExerciseUpdateComponent', () => {
     const courseId = 1;
@@ -90,7 +95,15 @@ describe('ProgrammingExerciseUpdateComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, NgxDatatableModule, OwlDateTimeModule, NgbTooltipMocksModule, NgbAlertsMocksModule],
+            imports: [
+                ArtemisTestModule,
+                NgxDatatableModule,
+                OwlDateTimeModule,
+                NgbTooltipMocksModule,
+                NgbAlertsMocksModule,
+                ProgrammingExerciseInformationComponent,
+                TitleChannelNameComponent,
+            ],
             declarations: [
                 ProgrammingExerciseUpdateComponent,
                 // The following directives need to be imported raw because the SCA tests heavily rely on the UI interaction with the native inputs.
@@ -118,8 +131,7 @@ describe('ProgrammingExerciseUpdateComponent', () => {
                 MockComponent(GradingInstructionsDetailsComponent),
                 MockComponent(ButtonComponent),
                 MockComponent(CompetencySelectionComponent),
-                MockComponent(ProgrammingExerciseInformationComponent),
-                MockComponent(ProgrammingExerciseDifficultyComponent),
+                MockComponent(ProgrammingExerciseModeComponent),
                 MockComponent(ProgrammingExerciseLanguageComponent),
                 MockComponent(ProgrammingExerciseGradingComponent),
                 MockComponent(ProgrammingExerciseProblemComponent),
@@ -134,6 +146,10 @@ describe('ProgrammingExerciseUpdateComponent', () => {
                 MockComponent(ModePickerComponent),
                 MockComponent(ExerciseUpdateNotificationComponent),
                 MockComponent(ExerciseUpdatePlagiarismComponent),
+                MockComponent(SwitchEditModeButtonComponent),
+                MockModule(ExerciseTitleChannelNameModule),
+                MockDirective(CustomNotIncludedInValidatorDirective),
+                MockComponent(ProgrammingExerciseDifficultyComponent),
             ],
             providers: [
                 { provide: LocalStorageService, useClass: MockSyncStorage },
@@ -141,7 +157,12 @@ describe('ProgrammingExerciseUpdateComponent', () => {
                 { provide: TranslateService, useClass: MockTranslateService },
                 { provide: ActivatedRoute, useValue: new MockActivatedRoute({}) },
                 { provide: NgbModal, useClass: MockNgbModalService },
-                { provide: AlertService, useValue: { addAlert: () => {} } },
+                {
+                    provide: AlertService,
+                    useValue: {
+                        addAlert: () => {},
+                    },
+                },
             ],
         })
             .compileComponents()
@@ -160,9 +181,66 @@ describe('ProgrammingExerciseUpdateComponent', () => {
                 const newProfileInfo = new ProfileInfo();
                 newProfileInfo.activeProfiles = [];
                 getProfileInfoSub.mockReturnValue(of(newProfileInfo));
+
+                comp.isSimpleMode.set(false);
+
+                const route = TestBed.inject(ActivatedRoute);
+                const programmingExercise = new ProgrammingExercise(undefined, undefined);
+                programmingExercise.programmingLanguage = ProgrammingLanguage.JAVA;
+                route.data = of({ programmingExercise });
+                jest.spyOn(programmingExerciseFeatureService, 'getProgrammingLanguageFeature').mockReturnValue({
+                    programmingLanguage: ProgrammingLanguage.JAVA,
+                    sequentialTestRuns: true,
+                    staticCodeAnalysis: true,
+                    plagiarismCheckSupported: true,
+                    packageNameRequired: true,
+                    checkoutSolutionRepositoryAllowed: true,
+                    projectTypes: [ProjectType.PLAIN_MAVEN, ProjectType.MAVEN_MAVEN],
+                    testwiseCoverageAnalysisSupported: true,
+                    auxiliaryRepositoriesSupported: true,
+                } as ProgrammingLanguageFeature);
             });
     });
 
+    describe('initializeEditMode', () => {
+        it('should set isSimpleMode to true if localStorage has value "true"', () => {
+            localStorage.setItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE, 'true');
+
+            fixture.detectChanges();
+
+            expect(comp.isSimpleMode()).toBeTruthy();
+            expect(localStorage.getItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE)).toBe('true');
+        });
+
+        it('should set isSimpleMode to false if localStorage has value "false"', () => {
+            localStorage.setItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE, 'false');
+
+            fixture.detectChanges();
+
+            expect(comp.isSimpleMode()).toBeFalsy();
+            expect(localStorage.getItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE)).toBe('false');
+        });
+
+        it('should set isSimpleMode to true if not present in local storage', () => {
+            localStorage.removeItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE);
+
+            fixture.detectChanges();
+
+            expect(comp.isSimpleMode()).toBeTruthy();
+        });
+    });
+
+    it('switchEditMode should toggle isSimpleMode and update local storage', () => {
+        localStorage.setItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE, JSON.stringify(true));
+        fixture.detectChanges();
+        expect(comp.isSimpleMode()).toBeTruthy(); // ensure the assumed initial state isSimpleMode = true holds
+
+        comp.switchEditMode();
+
+        expect(comp.isSimpleMode()).toBeFalsy();
+        expect(localStorage.getItem(LOCAL_STORAGE_KEY_IS_SIMPLE_MODE)).toBe(JSON.stringify(false));
+    });
+
     describe('save', () => {
         it('should call update service on save for existing entity', fakeAsync(() => {
             // GIVEN
@@ -256,7 +334,59 @@ describe('ProgrammingExerciseUpdateComponent', () => {
 
             // THEN
             expect(comp.isSaving).toBeFalse();
-            expect(alertSpy).toHaveBeenCalledWith({ type: AlertType.DANGER, message: 'error-message', disableTranslation: true });
+            expect(alertSpy).toHaveBeenCalledWith({
+                type: AlertType.DANGER,
+                message: 'error-message',
+                disableTranslation: true,
+            });
+        });
+
+        describe('should set project type in invalid default value is selected', () => {
+            beforeEach(() => {
+                const programmingExercise = new ProgrammingExercise(undefined, undefined);
+                programmingExercise.releaseDate = dayjs(); // We will get a warning if we do not set a release date
+                programmingExercise.projectType = ProjectType.PLAIN_GRADLE;
+                programmingExercise.course = course;
+
+                comp.programmingExercise = programmingExercise;
+                comp.backupExercise = {} as ProgrammingExercise;
+                comp.isCreate = true;
+                fixture.detectChanges();
+            });
+
+            it('should set valid project type in simple mode if default project type (gradle) is not supported', () => {
+                comp.isSimpleMode.set(true);
+                comp.projectTypes = [ProjectType.PLAIN_MAVEN];
+                fixture.detectChanges();
+
+                comp.save();
+
+                fixture.detectChanges();
+                expect(comp.programmingExercise.projectType).toBe(ProjectType.PLAIN_MAVEN);
+            });
+
+            it('should keep gradle if gradle is supported', fakeAsync(() => {
+                comp.isSimpleMode.set(true);
+                comp.projectTypes = [ProjectType.PLAIN_MAVEN, ProjectType.PLAIN_GRADLE];
+                fixture.detectChanges();
+
+                comp.save();
+
+                fixture.detectChanges();
+                expect(comp.programmingExercise.projectType).toBe(ProjectType.PLAIN_GRADLE);
+            }));
+
+            it('should keep gradle not in creation modal', fakeAsync(() => {
+                comp.isSimpleMode.set(true);
+                comp.isCreate = false;
+                comp.projectTypes = [ProjectType.PLAIN_MAVEN];
+                fixture.detectChanges();
+
+                comp.save();
+
+                fixture.detectChanges();
+                expect(comp.programmingExercise.projectType).toBe(ProjectType.PLAIN_GRADLE);
+            }));
         });
     });
 
@@ -749,6 +879,38 @@ describe('ProgrammingExerciseUpdateComponent', () => {
             });
         });
 
+        it('validateExerciseChannelName', () => {
+            comp.programmingExercise.channelName = '';
+            expect(comp.getInvalidReasons()).toContainEqual({
+                translateKey: 'artemisApp.exercise.form.channelName.empty',
+                translateValues: {},
+            });
+        });
+
+        it('validateExerciseShortName', () => {
+            comp.programmingExercise.shortName = 'ab';
+            expect(comp.getInvalidReasons()).toContainEqual({
+                translateKey: 'artemisApp.exercise.form.shortName.minlength',
+                translateValues: {},
+            });
+        });
+
+        it('validateExercisePoints', () => {
+            comp.programmingExercise.maxPoints = 10_000;
+            expect(comp.getInvalidReasons()).toContainEqual({
+                translateKey: 'artemisApp.exercise.form.points.customMax',
+                translateValues: {},
+            });
+        });
+
+        it('validateExerciseBonusPoints', () => {
+            comp.programmingExercise.maxPoints = 10_000;
+            expect(comp.getInvalidReasons()).toContainEqual({
+                translateKey: 'artemisApp.exercise.form.points.customMax',
+                translateValues: {},
+            });
+        });
+
         it('Check that no package name related validation error occurs for language C', () => {
             comp.programmingExercise.programmingLanguage = ProgrammingLanguage.C;
             expect(comp.getInvalidReasons()).not.toContainEqual({
@@ -798,7 +960,7 @@ describe('ProgrammingExerciseUpdateComponent', () => {
         });
 
         it('find validation errors for invalid auxiliary repositories', () => {
-            comp.auxiliaryRepositoriesValid = false;
+            comp.auxiliaryRepositoriesValid.set(false);
             expect(comp.getInvalidReasons()).toContainEqual({
                 translateKey: 'artemisApp.programmingExercise.auxiliaryRepository.error',
                 translateValues: {},
@@ -1000,6 +1162,30 @@ describe('ProgrammingExerciseUpdateComponent', () => {
             route.data = of({ programmingExercise: comp.programmingExercise });
         });
 
+        describe('should initialize isEdit variable based on url', () => {
+            it('should be false if edit is in url', fakeAsync(() => {
+                jest.spyOn(comp, 'selectedProgrammingLanguage', 'set').mockImplementation(() => {});
+
+                fixture.detectChanges();
+                tick();
+
+                expect(comp.isEdit).toBeTrue();
+            }));
+
+            it('should be true if edit is in url', fakeAsync(() => {
+                jest.spyOn(comp, 'selectedProgrammingLanguage', 'set').mockImplementation(() => {});
+                const route = TestBed.inject(ActivatedRoute);
+                route.params = of({ courseId });
+                route.url = of([{ path: 'notEdit' } as UrlSegment]);
+                route.data = of({ programmingExercise: comp.programmingExercise });
+
+                fixture.detectChanges();
+                tick();
+
+                expect(comp.isEdit).toBeFalse();
+            }));
+        });
+
         it('should disable checkboxes for certain options of existing exercise', fakeAsync(() => {
             const getFeaturesStub = jest.spyOn(programmingExerciseFeatureService, 'getProgrammingLanguageFeature');
             getFeaturesStub.mockImplementation((language: ProgrammingLanguage) => getProgrammingLanguageFeature(language));
@@ -1086,29 +1272,41 @@ describe('ProgrammingExerciseUpdateComponent', () => {
     it('should validate form sections', () => {
         const calculateFormValidSectionsSpy = jest.spyOn(comp, 'calculateFormStatusSections');
         comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
-        comp.exerciseInfoComponent = { formValidChanges: new Subject(), formValid: true } as ProgrammingExerciseInformationComponent;
+        comp.exerciseInfoComponent = {
+            formValidChanges: new Subject(),
+            formValid: true,
+        } as ProgrammingExerciseInformationComponent;
         comp.exerciseDifficultyComponent = {
             teamConfigComponent: {
                 formValidChanges: new Subject(),
                 formValid: true,
             },
-        } as ProgrammingExerciseDifficultyComponent;
-        comp.exerciseLanguageComponent = { formValidChanges: new Subject(), formValid: true } as ProgrammingExerciseLanguageComponent;
-        comp.exerciseGradingComponent = { formValidChanges: new Subject(), formValid: true } as ProgrammingExerciseGradingComponent;
-        comp.exercisePlagiarismComponent = { formValidChanges: new Subject(), formValid: true } as ExerciseUpdatePlagiarismComponent;
+        } as ProgrammingExerciseModeComponent;
+        comp.exerciseLanguageComponent = {
+            formValidChanges: new Subject(),
+            formValid: true,
+        } as ProgrammingExerciseLanguageComponent;
+        comp.exerciseGradingComponent = {
+            formValidChanges: new Subject(),
+            formValid: true,
+        } as ProgrammingExerciseGradingComponent;
+        comp.exercisePlagiarismComponent = {
+            formValidChanges: new Subject(),
+            formValid: true,
+        } as ExerciseUpdatePlagiarismComponent;
 
         comp.ngAfterViewInit();
         expect(comp.inputFieldSubscriptions).toHaveLength(5);
         comp.calculateFormStatusSections();
 
-        for (const section of comp.formStatusSections) {
+        for (const section of comp.formStatusSections()) {
             expect(section.valid).toBeTrue();
         }
 
         comp.exerciseInfoComponent.formValid = false;
         comp.exerciseInfoComponent.formValidChanges.next(false);
 
-        expect(comp.formStatusSections[0].valid).toBeFalse();
+        expect(comp.formStatusSections()[0].valid).toBeFalse();
 
         comp.exerciseLanguageComponent.formValidChanges.next(false);
         comp.exerciseGradingComponent.formValidChanges.next(false);
@@ -1121,10 +1319,10 @@ describe('ProgrammingExerciseUpdateComponent', () => {
         comp.programmingExercise.allowOnlineEditor = false;
         comp.programmingExercise.allowOnlineIde = false;
         comp.calculateFormStatusSections();
-        expect(comp.formStatusSections[1].valid).toBeFalse();
+        expect(comp.formStatusSections()[1].valid).toBeFalse();
         comp.programmingExercise.allowOnlineEditor = true;
         comp.calculateFormStatusSections();
-        expect(comp.formStatusSections[1].valid).toBeTrue();
+        expect(comp.formStatusSections()[1].valid).toBeTrue();
 
         comp.ngOnDestroy();
 
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/add-auxiliary-repository-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/add-auxiliary-repository-button.component.spec.ts
new file mode 100644
index 000000000000..c03583058e4f
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/add-auxiliary-repository-button.component.spec.ts
@@ -0,0 +1,45 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ArtemisTestModule } from '../../../test.module';
+import { ButtonComponent } from 'app/shared/components/button.component';
+import { MockComponent } from 'ng-mocks';
+import { AddAuxiliaryRepositoryButtonComponent } from '../../../../../../main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component';
+import { ProgrammingExercise } from '../../../../../../main/webapp/app/entities/programming/programming-exercise.model';
+
+describe('AddAuxiliaryRepositoryButtonComponent', () => {
+    let comp: AddAuxiliaryRepositoryButtonComponent;
+    let fixture: ComponentFixture<AddAuxiliaryRepositoryButtonComponent>;
+
+    beforeEach(() => {
+        return TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot(), ArtemisTestModule, MockComponent(ButtonComponent)],
+            providers: [],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(AddAuxiliaryRepositoryButtonComponent);
+                comp = fixture.componentInstance;
+
+                comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should initialize', () => {
+        fixture.detectChanges();
+        expect(comp).toBeDefined();
+    });
+
+    it('should add auxiliary repository', () => {
+        const initialLength = comp.programmingExercise.auxiliaryRepositories?.length || 0;
+        const onRefreshSpy = jest.spyOn(comp.onRefresh, 'emit');
+
+        comp.addAuxiliaryRepositoryRow();
+
+        expect(comp.programmingExercise.auxiliaryRepositories?.length).toBe(initialLength + 1);
+        expect(onRefreshSpy).toHaveBeenCalledOnce();
+    });
+});
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
index 8087a70b7cea..06426db2f4b5 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
@@ -3,7 +3,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { ActivatedRoute } from '@angular/router';
 import { Subject, of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component';
+import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/grading/programming-exercise-grading.component';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { IncludedInOverallScore } from 'app/entities/exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
@@ -23,6 +23,8 @@ import { NgbAlertsMocksModule } from '../../../helpers/mocks/directive/ngbAlerts
 import { NgbCollapse, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { GradingInstructionsDetailsComponent } from 'app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component';
+import { ProgrammingExerciseInputField } from 'app/exercises/programming/manage/update/programming-exercise-update.helper';
 
 describe('ProgrammingExerciseGradingComponent', () => {
     let fixture: ComponentFixture<ProgrammingExerciseGradingComponent>;
@@ -48,6 +50,7 @@ describe('ProgrammingExerciseGradingComponent', () => {
                 MockComponent(PresentationScoreComponent),
                 MockComponent(FaIconComponent),
                 MockDirective(TranslateDirective),
+                MockComponent(GradingInstructionsDetailsComponent),
             ],
             providers: [
                 { provide: TranslateService, useClass: MockTranslateService },
@@ -64,6 +67,15 @@ describe('ProgrammingExerciseGradingComponent', () => {
                 comp = fixture.componentInstance;
 
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    includeExerciseInCourseScoreCalculation: true,
+                    points: true,
+                    bonusPoints: true,
+                    submissionPolicy: true,
+                    timeline: true,
+                    assessmentInstructions: true,
+                    presentationScore: true,
+                });
 
                 const exercise = new ProgrammingExercise(undefined, undefined);
                 exercise.maxPoints = 10;
@@ -110,7 +122,11 @@ describe('ProgrammingExerciseGradingComponent', () => {
     it('should create a grading summary with exceeding penalty', fakeAsync(() => {
         fixture.detectChanges();
 
-        comp.programmingExercise.submissionPolicy = { type: SubmissionPolicyType.SUBMISSION_PENALTY, exceedingPenalty: 10, submissionLimit: 5 };
+        comp.programmingExercise.submissionPolicy = {
+            type: SubmissionPolicyType.SUBMISSION_PENALTY,
+            exceedingPenalty: 10,
+            submissionLimit: 5,
+        };
         comp.programmingExercise.maxStaticCodeAnalysisPenalty = 5;
 
         fixture.whenStable().then(() => {
@@ -179,4 +195,82 @@ describe('ProgrammingExerciseGradingComponent', () => {
 
         expect(calculateFormStatusSpy).toHaveBeenCalledTimes(2);
     });
+
+    const generateFieldVisibilityTests = (
+        testCases: {
+            name: string;
+            selector: string;
+            field: ProgrammingExerciseInputField;
+            extraCondition?: () => void;
+        }[],
+    ) => {
+        const checkFieldVisibility = (selector: string, isVisible: boolean) => {
+            fixture.detectChanges();
+            const field = fixture.debugElement.nativeElement.querySelector(selector);
+            if (isVisible) {
+                expect(field).not.toBeNull();
+            } else {
+                expect(field).toBeNull();
+            }
+        };
+
+        testCases.forEach(({ name, selector, field, extraCondition }) => {
+            describe('should handle input field ' + name + ' properly', () => {
+                it('should be displayed', () => {
+                    extraCondition?.();
+                    checkFieldVisibility(selector, true);
+                });
+
+                it('should NOT be displayed', () => {
+                    extraCondition?.();
+                    comp.isEditFieldDisplayedRecord()[field] = false;
+                    checkFieldVisibility(selector, false);
+                });
+            });
+        });
+    };
+
+    describe('should handle field visibility', () => {
+        const testCases: {
+            name: string;
+            selector: string;
+            field: ProgrammingExerciseInputField;
+            extraCondition?: () => void;
+        }[] = [
+            {
+                name: 'jhi-included-in-overall-score-picker',
+                selector: 'jhi-included-in-overall-score-picker',
+                field: ProgrammingExerciseInputField.INCLUDE_EXERCISE_IN_COURSE_SCORE_CALCULATION,
+            },
+            { name: 'points field', selector: '#field_points', field: ProgrammingExerciseInputField.POINTS },
+            {
+                name: 'bonusPoints field',
+                selector: '#field_bonusPoints',
+                field: ProgrammingExerciseInputField.BONUS_POINTS,
+            },
+            {
+                name: 'submission policy field',
+                selector: 'jhi-submission-policy-update',
+                field: ProgrammingExerciseInputField.SUBMISSION_POLICY,
+            },
+            {
+                name: 'timeline',
+                selector: 'jhi-programming-exercise-lifecycle',
+                field: ProgrammingExerciseInputField.TIMELINE,
+            },
+            {
+                name: 'assessment instructions',
+                selector: 'jhi-grading-instructions-details',
+                field: ProgrammingExerciseInputField.ASSESSMENT_INSTRUCTIONS,
+                extraCondition: () => (comp.programmingExercise.assessmentType = AssessmentType.SEMI_AUTOMATIC),
+            },
+            {
+                name: 'presentation score',
+                selector: 'jhi-presentation-score-checkbox',
+                field: ProgrammingExerciseInputField.PRESENTATION_SCORE,
+            },
+        ];
+
+        generateFieldVisibilityTests(testCases);
+    });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
index 5079df73e575..dd2f9feb61e8 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
@@ -1,9 +1,9 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { ActivatedRoute } from '@angular/router';
 import { Subject, of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
+import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/information/programming-exercise-information.component';
 import { DefaultValueAccessor, NgModel } from '@angular/forms';
 import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
@@ -17,6 +17,11 @@ import { TableEditableFieldComponent } from 'app/shared/table/table-editable-fie
 import { QueryList } from '@angular/core';
 import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component';
 import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component';
+import { ArtemisProgrammingExerciseUpdateModule } from 'app/exercises/programming/manage/update/programming-exercise-update.module';
+import { CustomNotIncludedInValidatorDirective } from '../../../../../../main/webapp/app/shared/validators/custom-not-included-in-validator.directive';
+import { ExerciseService } from '../../../../../../main/webapp/app/exercises/shared/exercise/exercise.service';
+import { MockExerciseService } from '../../../helpers/mocks/service/mock-exercise.service';
+import { AlertService } from '../../../../../../main/webapp/app/core/util/alert.service';
 
 describe('ProgrammingExerciseInformationComponent', () => {
     let fixture: ComponentFixture<ProgrammingExerciseInformationComponent>;
@@ -37,12 +42,19 @@ describe('ProgrammingExerciseInformationComponent', () => {
                 MockComponent(AddAuxiliaryRepositoryButtonComponent),
                 MockPipe(ArtemisTranslatePipe),
                 MockPipe(RemoveKeysPipe),
+                MockModule(ArtemisProgrammingExerciseUpdateModule),
+                MockDirective(CustomNotIncludedInValidatorDirective),
             ],
             providers: [
+                MockProvider(AlertService),
                 {
                     provide: ActivatedRoute,
                     useValue: { queryParams: of({}) },
                 },
+                {
+                    provide: ExerciseService,
+                    useValue: MockExerciseService,
+                },
             ],
             schemas: [],
         })
@@ -53,8 +65,16 @@ describe('ProgrammingExerciseInformationComponent', () => {
 
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
 
-                comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
-                comp.programmingExercise.buildConfig = new ProgrammingExerciseBuildConfig();
+                fixture.componentRef.setInput('programmingExercise', new ProgrammingExercise(undefined, undefined));
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    shortName: true,
+                    categories: true,
+                });
+                fixture.componentRef.setInput('isSimpleMode', false);
+                fixture.componentRef.setInput('isExamMode', false);
+                fixture.componentRef.setInput('isImport', false);
+
+                comp.programmingExercise().buildConfig = new ProgrammingExerciseBuildConfig();
             });
     });
 
@@ -69,9 +89,12 @@ describe('ProgrammingExerciseInformationComponent', () => {
 
     it('should should calculate Form Sections correctly', () => {
         const calculateFormValidSpy = jest.spyOn(comp, 'calculateFormValid');
-        const editableField = { editingInput: { valueChanges: new Subject(), valid: true } } as any as TableEditableFieldComponent;
-        comp.exerciseTitleChannelComponent = { titleChannelNameComponent: { formValidChanges: new Subject(), formValid: true } } as ExerciseTitleChannelNameComponent;
-        comp.shortNameField = { valueChanges: new Subject(), valid: true } as any as NgModel;
+        const editableField = {
+            editingInput: {
+                valueChanges: new Subject(),
+                valid: true,
+            },
+        } as unknown as TableEditableFieldComponent;
         comp.checkoutSolutionRepositoryField = { valueChanges: new Subject(), valid: true } as any as NgModel;
         comp.recreateBuildPlansField = { valueChanges: new Subject(), valid: true } as any as NgModel;
         comp.updateTemplateFilesField = { valueChanges: new Subject(), valid: true } as any as NgModel;
@@ -79,22 +102,52 @@ describe('ProgrammingExerciseInformationComponent', () => {
         comp.programmingExerciseEditCheckoutDirectories = { formValidChanges: new Subject() } as ProgrammingExerciseEditCheckoutDirectoriesComponent;
         comp.ngAfterViewInit();
         (comp.tableEditableFields.changes as Subject<any>).next({ toArray: () => [editableField] } as any as QueryList<TableEditableFieldComponent>);
-        comp.exerciseTitleChannelComponent.titleChannelNameComponent.formValidChanges.next(false);
-        (comp.shortNameField.valueChanges as Subject<boolean>).next(false);
         (comp.checkoutSolutionRepositoryField.valueChanges as Subject<boolean>).next(false);
         (comp.recreateBuildPlansField.valueChanges as Subject<boolean>).next(false);
         (comp.updateTemplateFilesField.valueChanges as Subject<boolean>).next(false);
         (editableField.editingInput.valueChanges as Subject<boolean>).next(false);
         comp.programmingExerciseEditCheckoutDirectories.formValidChanges.next(false);
-        expect(calculateFormValidSpy).toHaveBeenCalledTimes(7);
+        expect(calculateFormValidSpy).toHaveBeenCalledTimes(5);
     });
 
     it('should update checkout directories', () => {
         comp.onTestRepositoryCheckoutPathChange('test');
-        expect(comp.programmingExercise.buildConfig?.testCheckoutPath).toBe('test');
+        expect(comp.programmingExercise().buildConfig?.testCheckoutPath).toBe('test');
         comp.onSolutionRepositoryCheckoutPathChange('solution');
-        expect(comp.programmingExercise.buildConfig?.solutionCheckoutPath).toBe('solution');
+        expect(comp.programmingExercise().buildConfig?.solutionCheckoutPath).toBe('solution');
         comp.onAssigmentRepositoryCheckoutPathChange('assignment');
-        expect(comp.programmingExercise.buildConfig?.assignmentCheckoutPath).toBe('assignment');
+        expect(comp.programmingExercise().buildConfig?.assignmentCheckoutPath).toBe('assignment');
+    });
+
+    describe('shortName generation effect', () => {
+        it('should use name from import', () => {
+            comp.programmingExercise().shortName = 'l01e01';
+            fixture.componentRef.setInput('isSimpleMode', false);
+            fixture.componentRef.setInput('isImport', true);
+
+            comp.programmingExercise().title = 'Test Exercise';
+            fixture.detectChanges();
+
+            expect(comp.programmingExercise().shortName).toBe('l01e01');
+        });
+
+        it('should derive shortname from title', () => {
+            fixture.componentRef.setInput('isSimpleMode', true);
+
+            comp.programmingExercise().title = 'Test Exercise';
+            fixture.detectChanges();
+
+            expect(comp.programmingExercise().shortName).toMatch('TestExercise');
+        });
+
+        it('should derive shortname from title when directly derived shortname is already taken', () => {
+            fixture.componentRef.setInput('isSimpleMode', true);
+            comp.alreadyUsedShortNames.set(new Set(['TestExercise']));
+
+            comp.programmingExercise().title = 'Test Exercise';
+            fixture.detectChanges();
+
+            expect(comp.programmingExercise().shortName).toMatch('TestExercise1');
+        });
     });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
index 55eefafd0162..d5baffd9ae0c 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
@@ -6,7 +6,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValueAccessor, SelectControlValueAccessor } from '@angular/forms';
 import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
-import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component';
+import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/language/programming-exercise-language.component';
 import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock';
 import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
 import { provideHttpClient } from '@angular/common/http';
@@ -54,6 +54,16 @@ describe('ProgrammingExerciseLanguageComponent', () => {
                 comp = fixture.componentInstance;
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
                 comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
+
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    programmingLanguage: true,
+                    projectType: true,
+                    withExemplaryDependency: true,
+                    packageName: true,
+                    enableStaticCodeAnalysis: true,
+                    sequentialTestRuns: true,
+                    customizeBuildScript: true,
+                });
             });
     });
 
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-mode.component.spec.ts
similarity index 74%
rename from src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts
rename to src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-mode.component.spec.ts
index 0750ffcdca6a..a5f9221df207 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-mode.component.spec.ts
@@ -4,7 +4,7 @@ import { DebugElement } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component';
+import { ProgrammingExerciseModeComponent } from 'app/exercises/programming/manage/update/update-components/mode/programming-exercise-mode.component';
 import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValueAccessor, SelectControlValueAccessor } from '@angular/forms';
 import { DifficultyPickerComponent } from 'app/exercises/shared/difficulty-picker/difficulty-picker.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
@@ -15,10 +15,11 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { PROFILE_THEIA } from 'app/app.constants';
 import { ArtemisTestModule } from '../../../test.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { ProgrammingExerciseDifficultyComponent } from 'app/exercises/programming/manage/update/update-components/difficulty/programming-exercise-difficulty.component';
 
-describe('ProgrammingExerciseDifficultyComponent', () => {
-    let fixture: ComponentFixture<ProgrammingExerciseDifficultyComponent>;
-    let comp: ProgrammingExerciseDifficultyComponent;
+describe('ProgrammingExerciseModeComponent', () => {
+    let fixture: ComponentFixture<ProgrammingExerciseModeComponent>;
+    let comp: ProgrammingExerciseModeComponent;
     let debugElement: DebugElement;
     let profileService: ProfileService;
     let getProfileInfoSub: jest.SpyInstance;
@@ -32,10 +33,11 @@ describe('ProgrammingExerciseDifficultyComponent', () => {
                 SelectControlValueAccessor,
                 NumberValueAccessor,
                 NgModel,
-                ProgrammingExerciseDifficultyComponent,
+                ProgrammingExerciseModeComponent,
                 MockComponent(DifficultyPickerComponent),
                 MockComponent(TeamConfigFormGroupComponent),
                 MockPipe(ArtemisTranslatePipe),
+                MockComponent(ProgrammingExerciseDifficultyComponent),
             ],
             providers: [
                 {
@@ -47,15 +49,27 @@ describe('ProgrammingExerciseDifficultyComponent', () => {
         })
             .compileComponents()
             .then(() => {
-                fixture = TestBed.createComponent(ProgrammingExerciseDifficultyComponent);
+                fixture = TestBed.createComponent(ProgrammingExerciseModeComponent);
                 comp = fixture.componentInstance;
                 comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
 
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    difficulty: true,
+                    participationMode: true,
+                    allowOfflineIde: true,
+                    allowOnlineIde: true,
+                });
+
                 debugElement = fixture.debugElement;
                 profileService = debugElement.injector.get(ProfileService);
                 getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
-                getProfileInfoSub.mockReturnValue(of({ inProduction: false, sshCloneURLTemplate: 'ssh://git@testserver.com:1234/' } as ProfileInfo));
+                getProfileInfoSub.mockReturnValue(
+                    of({
+                        inProduction: false,
+                        sshCloneURLTemplate: 'ssh://git@testserver.com:1234/',
+                    } as ProfileInfo),
+                );
             });
     });
 
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
index 51ded01756bf..7cfae26ed812 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
@@ -3,7 +3,7 @@ import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component';
+import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/problem/programming-exercise-problem.component';
 import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component';
@@ -38,6 +38,11 @@ describe('ProgrammingExerciseProblemComponent', () => {
                 fixture = TestBed.createComponent(ProgrammingExerciseProblemComponent);
                 comp = fixture.componentInstance;
 
+                fixture.componentRef.setInput('isEditFieldDisplayedRecord', {
+                    problemStatement: true,
+                    linkedCompetencies: true,
+                });
+
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
                 comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
             });
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/switch-edit-mode-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/switch-edit-mode-button.component.spec.ts
new file mode 100644
index 000000000000..99a2b6e41b3a
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/switch-edit-mode-button.component.spec.ts
@@ -0,0 +1,42 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateService } from '@ngx-translate/core';
+import { SwitchEditModeButtonComponent } from '../../../../../../main/webapp/app/exercises/programming/manage/update/switch-edit-mode-button/switch-edit-mode-button.component';
+import { ArtemisSharedCommonModule } from '../../../../../../main/webapp/app/shared/shared-common.module';
+import { ArtemisSharedComponentModule } from '../../../../../../main/webapp/app/shared/components/shared-component.module';
+import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
+import { By } from '@angular/platform-browser';
+import { MockModule } from 'ng-mocks';
+
+describe('SwitchEditModeButtonComponent', () => {
+    let fixture: ComponentFixture<SwitchEditModeButtonComponent>;
+    let comp: SwitchEditModeButtonComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [SwitchEditModeButtonComponent],
+            declarations: [MockModule(ArtemisSharedCommonModule), MockModule(ArtemisSharedComponentModule)],
+            providers: [{ provide: TranslateService, useClass: MockTranslateService }],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(SwitchEditModeButtonComponent);
+                comp = fixture.componentInstance;
+
+                fixture.componentRef.setInput('isSimpleMode', false);
+            });
+    });
+
+    it('should initialize', () => {
+        fixture.detectChanges();
+        expect(comp).not.toBeNull();
+    });
+
+    it('should emit to call passed method when button is clicked', () => {
+        const switchEditModeSpy = jest.spyOn(comp.switchEditMode, 'emit');
+
+        const button = fixture.debugElement.query(By.css('jhi-button'));
+        button.triggerEventHandler('onClick', null);
+
+        expect(switchEditModeSpy).toHaveBeenCalledOnce();
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/form/title-channel-name.component.spec.ts b/src/test/javascript/spec/component/shared/form/title-channel-name.component.spec.ts
index 3fd474ff6865..644827741d92 100644
--- a/src/test/javascript/spec/component/shared/form/title-channel-name.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/form/title-channel-name.component.spec.ts
@@ -1,10 +1,11 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { FormsModule, NgForm } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
 import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
 import { ArtemisTestModule } from '../../../test.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { CustomNotIncludedInValidatorDirective } from '../../../../../../main/webapp/app/shared/validators/custom-not-included-in-validator.directive';
+import { MockDirective } from 'ng-mocks';
 
 describe('TitleChannelNameComponent', () => {
     let component: TitleChannelNameComponent;
@@ -13,7 +14,7 @@ describe('TitleChannelNameComponent', () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             imports: [ArtemisTestModule, FormsModule, ArtemisSharedComponentModule],
-            declarations: [TitleChannelNameComponent],
+            declarations: [TitleChannelNameComponent, MockDirective(CustomNotIncludedInValidatorDirective)],
             providers: [NgForm],
         }).compileComponents();
 
@@ -45,7 +46,7 @@ describe('TitleChannelNameComponent', () => {
     }));
 
     it('should only display title input field if channel name is hidden', () => {
-        component.hideChannelName = true;
+        fixture.componentRef.setInput('hideChannelName', true);
         fixture.detectChanges();
 
         const titleInput = fixture.debugElement.query(By.css('#field_title'));
diff --git a/src/test/javascript/spec/util/shared/utils.spec.ts b/src/test/javascript/spec/util/shared/utils.spec.ts
index b20604e27615..e1c484866eca 100644
--- a/src/test/javascript/spec/util/shared/utils.spec.ts
+++ b/src/test/javascript/spec/util/shared/utils.spec.ts
@@ -2,6 +2,7 @@ import {
     average,
     getAsMutableObject,
     isExamExercise,
+    removeSpecialCharacters,
     round,
     roundScorePercentSpecifiedByCourseSettings,
     roundToNextMultiple,
@@ -142,3 +143,11 @@ describe('roundUpToNextMultiple', () => {
         expect(roundToNextMultiple(8.2, 1, true)).toBe(9);
     });
 });
+
+describe('removeSpecialCharacters', () => {
+    it('should remove special characters', () => {
+        expect(removeSpecialCharacters('Hello, World!')).toBe('HelloWorld');
+        expect(removeSpecialCharacters('Hello, World! 123')).toBe('HelloWorld123');
+        expect(removeSpecialCharacters('Hello, World! 123$%')).toBe('HelloWorld123');
+    });
+});
diff --git a/src/test/playwright/e2e/exam/ExamManagement.spec.ts b/src/test/playwright/e2e/exam/ExamManagement.spec.ts
index a91b64b7f764..d95fed568bbc 100644
--- a/src/test/playwright/e2e/exam/ExamManagement.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamManagement.spec.ts
@@ -80,6 +80,7 @@ test.describe('Exam management', () => {
                 const uid = generateUUID();
                 const programmingExerciseTitle = 'Programming ' + uid;
                 const programmingExerciseShortName = 'programming' + uid;
+                await programmingExerciseCreation.changeEditMode();
                 await programmingExerciseCreation.setTitle(programmingExerciseTitle);
                 await programmingExerciseCreation.setShortName(programmingExerciseShortName);
                 await programmingExerciseCreation.setPackageName('de.test');
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
index 9fc0bdb9cf5e..bfdb05fd831b 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
@@ -90,6 +90,7 @@ test.describe('Test Exam management', () => {
             await examManagement.openExerciseGroups(exam.id!);
             await examExerciseGroups.clickAddProgrammingExercise(exerciseGroup.id!);
             const programmingExerciseTitle = 'programming' + uid;
+            await programmingExerciseCreation.changeEditMode();
             await programmingExerciseCreation.setTitle(programmingExerciseTitle);
             await programmingExerciseCreation.setShortName(programmingExerciseTitle);
             await programmingExerciseCreation.setPackageName('de.test');
diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
index e5d2f60d6e4f..81743451a031 100644
--- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
+++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
@@ -23,6 +23,7 @@ test.describe('Programming Exercise Management', () => {
             await courseManagementExercises.createProgrammingExercise();
             await page.waitForURL('**/programming-exercises/new**');
             const exerciseTitle = 'Programming exercise ' + generateUUID();
+            await programmingExerciseCreation.changeEditMode();
             await programmingExerciseCreation.setTitle(exerciseTitle);
             await programmingExerciseCreation.setShortName('programming' + generateUUID());
             await programmingExerciseCreation.setPackageName('de.test');
@@ -47,6 +48,7 @@ test.describe('Programming Exercise Management', () => {
             await courseManagement.openExercisesOfCourse(course.id!);
             await courseManagementExercises.createProgrammingExercise();
             await page.waitForURL('**/programming-exercises/new**');
+            await programmingExerciseCreation.changeEditMode();
 
             const firstSectionHeadline = 'General';
             const firstSectionStatusBarId = 0;
diff --git a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
index a59342550bbf..69cd9bdf3514 100644
--- a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
@@ -15,6 +15,10 @@ export class ProgrammingExerciseCreationPage {
         await this.page.locator('#field_title').fill(title);
     }
 
+    async changeEditMode() {
+        await this.page.locator('#switch-edit-mode-button').click();
+    }
+
     async setShortName(shortName: string) {
         const shortNameField = this.page.locator('#field_shortName');
         await shortNameField.clear();