diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
index dc8add2..e65d916 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
@@ -43,7 +43,6 @@
     }
   }
 
-
   private AssignmentTemplate? selectedTemplate =>
     planner
     .LocalCourse?
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 396e453..2219fbf 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -162,7 +162,7 @@
         assignmentContext.Assignment = null;
       })"
     >
-      Save
+      Done
     </button>
   </Footer>
 </Modal>
diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
index d57c2a9..3770553 100644
--- a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
@@ -10,6 +10,7 @@
   protected override void OnInitialized()
   {
     assignmentContext.StateHasChanged += reload;
+    reload();
   }
   private void reload()
   {
diff --git a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
index faba32b..056b616 100644
--- a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
@@ -6,6 +6,7 @@
   protected override void OnInitialized()
   {
     assignmentContext.StateHasChanged += reload;
+    reload();
   }
   private void reload()
   {
@@ -37,11 +38,11 @@
   {
     if(assignmentContext.Assignment != null)
     {
+      types = newTypes;
       assignmentContext.SaveAssignment(assignmentContext.Assignment with
       {
-        SubmissionTypes = newTypes
-      }
-      );
+        SubmissionTypes = types
+      });
     }
   }
 
@@ -54,6 +55,7 @@
   {
     var isDiscussion = submissionType == SubmissionType.DISCUSSION_TOPIC;
     var allowedToBeChecked = !discussionIsSelected || isDiscussion;
+
     <div class="col-4">
       <div class="form-check form-switch">
         <input
diff --git a/Management.Web/Shared/Course/CourseDetails.razor b/Management.Web/Shared/Course/CourseDetails.razor
index 709477f..0c3ff4f 100644
--- a/Management.Web/Shared/Course/CourseDetails.razor
+++ b/Management.Web/Shared/Course/CourseDetails.razor
@@ -39,6 +39,8 @@
   }
 }
 
+<AssignmentForm />
+
 <div class="row">
   <div class="col overflow-y-auto border rounded " style="max-height: 95vh;">
     @if (planner.LocalCourse != null)
@@ -57,5 +59,3 @@
     <Modules />
   </div>
 </div>
-
-<AssignmentForm />
\ No newline at end of file
diff --git a/Management/Features/Configuration/AssignmentEditorContext.cs b/Management/Features/Configuration/AssignmentEditorContext.cs
index df637fc..b583a64 100644
--- a/Management/Features/Configuration/AssignmentEditorContext.cs
+++ b/Management/Features/Configuration/AssignmentEditorContext.cs
@@ -14,11 +14,12 @@ public class AssignmentEditorContext
   private LocalAssignment? _assignment;
   public LocalAssignment? Assignment
   {
-    get { return _assignment; }
+    get  =>_assignment;
     set
     {
       _assignment = value;
       StateHasChanged?.Invoke();
+      Console.WriteLine("new assignment");
     }
   }