diff --git a/Management.Web/Pages/AssignmentFormPage.razor b/Management.Web/Pages/AssignmentFormPage.razor
index 677a781..34f406f 100644
--- a/Management.Web/Pages/AssignmentFormPage.razor
+++ b/Management.Web/Pages/AssignmentFormPage.razor
@@ -55,14 +55,14 @@
   }
 
 }
-<div style="height: 100vh;" class="m-0 p-1">
-@if (loading)
-{
-  <Spinner />
-}
+<div style="height: 100vh;" class="m-0 p-1 d-flex flex-row">
+  @if (loading)
+  {
+    <Spinner />
+  }
 
-@if (planner.LocalCourse != null && assignmentContext.Assignment != null)
-{
-  <AssignmentForm />
-}
+  @if (planner.LocalCourse != null && assignmentContext.Assignment != null)
+  {
+    <AssignmentForm />
+  }
 </div>
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index a7560ba..8b2d33f 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -143,7 +143,7 @@
   private async Task deleteFromCanvas()
   {
     if (assignmentInCanvas == null 
-      || planner.LocalCourse.Settings.CanvasId == null 
+      || planner?.LocalCourse.Settings.CanvasId == null 
       || assignmentContext.Assignment == null
     )
       return;
@@ -160,30 +160,27 @@
   }
 }
 
-<div class="d-flex flex-column h-100">
+<div class="d-flex flex-column p-2 h-100" style="height: 100%;" >
   <div>
     @assignmentContext.Assignment?.Name
   </div>
-  <div class="flex-grow-1 d-flex flex-column">
+
+  <section class="flex-1 p-1 border rounded-4 bg-dark-subtle" style="min-height: 0;">
     @if (assignmentContext.Assignment != null)
     {
-        @* <ButtonSelect  
-          Label="Assignment Group" 
-          Options="planner.LocalCourse?.Settings.AssignmentGroups" 
-          GetName="(g) => g?.Name"
-          OnSelect="(g) => setAssignmentGroup(g)" 
-          SelectedOption="selectedAssignmentGroup" 
-        /> *@
-      <div class="m-1 flex-grow-1">
-        <AssignmentMarkdownEditor />
-      </div>
+      <AssignmentMarkdownEditor />
     }
-  </div>
+  </section>
 
   <div class="d-flex justify-content-end  p-3">
+    @if (addingAssignmentToCanvas || deletingAssignmentFromCanvas)
+    {
+      <div>
+        <Spinner />
+      </div>
+    }
 
     <ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
-
     <button 
       class="btn btn-outline-secondary mx-3" 
       disabled="@(addingAssignmentToCanvas || deletingAssignmentFromCanvas)"
@@ -223,10 +220,5 @@
     </button>
   </div>
 
-  @if (addingAssignmentToCanvas || deletingAssignmentFromCanvas)
-  {
-    <div>
-      <Spinner />
-    </div>
-  }
+  
 </div>
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor
index bf975ae..9bf3fbf 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor
@@ -67,17 +67,10 @@
 {
   <div class="row h-100">
     <div class="col-6">
-      @* <textarea 
-        id="description" 
-        class="form-control h-100" 
-        rows=12
-        @bind="description"
-        @oninput="handleNewDescription"
-      /> *@
 
-      <MonacoTextArea Value="@rawText" OnChange="@handleChange" />
+      <MonacoTextArea Value=@rawText OnChange=@handleChange />
     </div>
-    <div class="col-6">
+    <div class="col-6 overflow-y-auto h-100" >
       @if (error != null)
       {
         <p class="text-danger text-truncate">Error: @error</p>
@@ -99,7 +92,7 @@
         @(preview)
       </div>
       <hr>
-        <RubricDisplay />
+      <RubricDisplay />
     </div>
   </div>
 }
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/Quiz/Markdown/MarkdownQuizForm.razor b/Management.Web/Shared/Components/Quiz/Markdown/MarkdownQuizForm.razor
index 8f20b36..0d75b92 100644
--- a/Management.Web/Shared/Components/Quiz/Markdown/MarkdownQuizForm.razor
+++ b/Management.Web/Shared/Components/Quiz/Markdown/MarkdownQuizForm.razor
@@ -57,11 +57,6 @@
   <div class="d-flex flex-row h-100 p-2">
     <div class="row flex-grow-1">
       <div class="col-6">
-        @* <textarea 
-          class="form-control h-100" 
-          @bind="quizMarkdownInput" 
-          @bind:event="oninput" 
-        /> *@
         <MonacoTextArea
           Value="@quizMarkdownInput"
           OnChange="@((v) => quizMarkdownInput = v)"