diff --git a/Management.Web/Pages/Course.razor b/Management.Web/Pages/Course.razor
index 79647ea..3014d4c 100644
--- a/Management.Web/Pages/Course.razor
+++ b/Management.Web/Pages/Course.razor
@@ -12,6 +12,7 @@
 @inject YamlManager yamlManager
 @inject CanvasService canvas
 @inject CoursePlanner planner
+@inject NavigationManager navigtion
 
 @code {
   [Parameter]
@@ -30,6 +31,12 @@
     loading = false;
   }
 
+  private void selectNewCourse()
+  {
+    planner.Clear();
+    navigtion.NavigateTo("/");
+  }
+
 }
 
 @if(loading)
@@ -42,7 +49,7 @@
   <div class="mb-3 d-flex justify-content-between" style="height: 4em;">
     <div class="my-auto">
       <button
-        @onclick="planner.Clear"
+        @onclick="selectNewCourse"
         class="btn btn-primary"
       >
         Select New Course
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 5dc72f2..6ec4cce 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -175,17 +175,34 @@
   </div>
   <div class="container">
     <RubricEditor />
+    <hr>
+    <div class="mx-5 px-5">
+      <SubmissionTypeSelector />
+    </div>
   </div>
-  <SubmissionTypeSelector />
 }
-<ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
-<button 
-  class="btn btn-primary" 
-  @onclick="@(() => {
-    assignmentContext.Assignment = null;
-    Navigation.NavigateTo("/course/" + planner.LocalCourse?.Name);
-  })"
->
-  Done
-</button>
 
+<div class="d-flex justify-content-end m-3">
+
+  <ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
+
+  <button 
+    class="btn btn-primary mx-2" 
+    @onclick="@(() => {
+      assignmentContext.Assignment = null;
+      Navigation.NavigateTo("/course/" + planner.LocalCourse?.Name);
+    })"
+  >
+    Done
+  </button>
+</div>
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
index 056b616..cc43cea 100644
--- a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
@@ -56,7 +56,7 @@
     var isDiscussion = submissionType == SubmissionType.DISCUSSION_TOPIC;
     var allowedToBeChecked = !discussionIsSelected || isDiscussion;
 
-    <div class="col-4">
+    <div class="col-3">
       <div class="form-check form-switch">
         <input
           class="form-check-input" 
diff --git a/Management.Web/Shared/Semester/Day/AssignmentInDay.razor b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
index 2f5fb6c..90c4a9c 100644
--- a/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
+++ b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
@@ -43,7 +43,7 @@
   }
 }
 
-<div
+<li
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
@@ -51,4 +51,4 @@
   role="button"
 >
   @Assignment.Name
-</div>
+</li>
diff --git a/Management.Web/Shared/Semester/Day/Day.razor b/Management.Web/Shared/Semester/Day/Day.razor
index 287d9e1..8beec7c 100644
--- a/Management.Web/Shared/Semester/Day/Day.razor
+++ b/Management.Web/Shared/Semester/Day/Day.razor
@@ -112,16 +112,16 @@
   ondragover="event.preventDefault();"
 >
   @(isWeekDay ? date?.Day : "")
-  <div class="m-0 ps-3">
-  @foreach (var assignment in TodaysAssignments)
-  {
-      @* Console.WriteLine($"assignment: {assignment.Name}"); *@
-      <AssignmentInDay Assignment="assignment" @key="@assignment" />
-  }
+  <ul class="m-0 ps-3">
+    @foreach (var assignment in TodaysAssignments)
+    {
+        @* Console.WriteLine($"assignment: {assignment.Name}"); *@
+        <AssignmentInDay Assignment="assignment" @key="@assignment" />
+    }
 
-  @foreach(var quiz in todaysQuizzes)
-  {
-    <QuizInDay Quiz="quiz" @key="@quiz" />
-  }
-  </div>
+    @foreach(var quiz in todaysQuizzes)
+    {
+      <QuizInDay Quiz="quiz" @key="@quiz" />
+    }
+  </ul>
 </div>
diff --git a/Management.Web/Shared/Semester/Day/QuizInDay.razor b/Management.Web/Shared/Semester/Day/QuizInDay.razor
index 61c0137..f7dd9d2 100644
--- a/Management.Web/Shared/Semester/Day/QuizInDay.razor
+++ b/Management.Web/Shared/Semester/Day/QuizInDay.razor
@@ -18,7 +18,7 @@
   }
 }
 
-<div
+<li
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
@@ -26,4 +26,4 @@
   role="button"
 >
   @Quiz.Name
-</div>
\ No newline at end of file
+</li>
\ No newline at end of file
diff --git a/Management/Models/Local/LocalAssignment.cs b/Management/Models/Local/LocalAssignment.cs
index ffd2cf7..f54e88c 100644
--- a/Management/Models/Local/LocalAssignment.cs
+++ b/Management/Models/Local/LocalAssignment.cs
@@ -14,24 +14,24 @@ public static class SubmissionType
   public static readonly string ONLINE_TEXT_ENTRY = "online_text_entry";
   public static readonly string ONLINE_UPLOAD = "online_upload";
   public static readonly string ONLINE_QUIZ = "online_quiz";
-  public static readonly string ON_PAPER = "on_paper";
+  // public static readonly string ON_PAPER = "on_paper";
   public static readonly string DISCUSSION_TOPIC = "discussion_topic";
-  public static readonly string EXTERNAL_TOOL = "external_tool";
+  // public static readonly string EXTERNAL_TOOL = "external_tool";
   public static readonly string ONLINE_URL = "online_url";
-  public static readonly string MEDIA_RECORDING = "media_recording";
-  public static readonly string STUDENT_ANNOTATION = "student_annotation";
+  // public static readonly string MEDIA_RECORDING = "media_recording";
+  // public static readonly string STUDENT_ANNOTATION = "student_annotation";
   public static readonly string NONE = "none";
   public static readonly IEnumerable<string> AllTypes = new string[]
   {
     ONLINE_TEXT_ENTRY,
     ONLINE_UPLOAD,
     ONLINE_QUIZ,
-    ON_PAPER,
+    // ON_PAPER,
     DISCUSSION_TOPIC,
-    EXTERNAL_TOOL,
+    // EXTERNAL_TOOL,
     ONLINE_URL,
-    MEDIA_RECORDING,
-    STUDENT_ANNOTATION,
+    // MEDIA_RECORDING,
+    // STUDENT_ANNOTATION,
     NONE,
   };
 }