diff --git a/Management.Web/Pages/AssignmentForm.razor b/Management.Web/Pages/AssignmentForm.razor
deleted file mode 100644
index e7c475a..0000000
--- a/Management.Web/Pages/AssignmentForm.razor
+++ /dev/null
@@ -1,33 +0,0 @@
-@page "/course/{CourseName}/assignment/{AssignmentId}"
-@using CanvasModel.EnrollmentTerms
-@using Management.Web.Shared.Course
-@using Management.Web.Shared.Module.Assignment.Templates
-@using Management.Web.Shared.Semester
-@using CanvasModel.Courses
-@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
-@using LocalModels
-@using Management.Web.Shared.Module.Assignment
-@using Management.Web.Shared.Components
-
-@inject YamlManager yamlManager
-@inject CanvasService canvas
-@inject CoursePlanner planner
-
-@code {
-  [Parameter]
-  public string CourseName { get; set; }
-  [Parameter]
-  public string AssignmentId { get; set; }
-  
-  protected override async Task OnInitializedAsync()
-  {
-    if(planner.LocalCourse == null)
-    {
-      var courses = await yamlManager.LoadSavedCourses();
-      planner.LocalCourse = courses.First(c => c.Name == CourseName);
-    }
-    base.OnInitialized();
-    @* loading = false; *@ 
-  }
-
-}
\ No newline at end of file
diff --git a/Management.Web/Pages/AssignmentFormPage.razor b/Management.Web/Pages/AssignmentFormPage.razor
new file mode 100644
index 0000000..57531fb
--- /dev/null
+++ b/Management.Web/Pages/AssignmentFormPage.razor
@@ -0,0 +1,67 @@
+@page "/course/{CourseName}/assignment/{AssignmentId}"
+
+@using CanvasModel.EnrollmentTerms
+@using Management.Web.Shared.Components.AssignmentForm
+@using Management.Web.Shared.Course
+@using Management.Web.Shared.Module.Assignment.Templates
+@using Management.Web.Shared.Semester
+@using CanvasModel.Courses
+@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
+@using LocalModels
+@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Shared.Components
+
+@inject YamlManager yamlManager
+@inject CanvasService canvas
+@inject CoursePlanner planner
+@inject AssignmentEditorContext assignmentContext
+@inject ILogger<AssignmentFormPage> logger
+
+@code {
+  [Parameter]
+  public string? CourseName { get; set; } = default!;
+  [Parameter]
+  public string? AssignmentId { get; set; } = default!;
+
+  private bool loading { get; set; }= true;
+  
+  protected override async Task OnInitializedAsync()
+  {
+    if(loading)
+    {
+      loading = false;
+      logger.LogInformation($"loading assignment {CourseName} {AssignmentId}");
+      if(planner.LocalCourse == null)
+      {
+        var courses = await yamlManager.LoadSavedCourses();
+        planner.LocalCourse = courses.First(c => c.Name == CourseName);
+        logger.LogInformation($"set course to '{planner.LocalCourse?.Name}'");
+      }
+
+      if(assignmentContext.Assignment == null)
+      {
+        var assignment = planner
+          .LocalCourse?
+          .Modules
+          .SelectMany(m => m.Assignments)
+          .FirstOrDefault(a => a.Id == AssignmentId);
+
+        assignmentContext.Assignment = assignment;
+        logger.LogInformation($"set assignment to '{assignmentContext.Assignment?.Name}'");
+      }
+      base.OnInitialized();
+      StateHasChanged();
+    }
+  }
+
+}
+
+@if(loading)
+{
+  <Spinner />
+}
+
+@if(planner.LocalCourse != null && assignmentContext.Assignment != null)
+{
+  <AssignmentForm />
+}
\ No newline at end of file
diff --git a/Management.Web/Pages/Index.razor b/Management.Web/Pages/Index.razor
index 9b43aca..3110642 100644
--- a/Management.Web/Pages/Index.razor
+++ b/Management.Web/Pages/Index.razor
@@ -17,8 +17,8 @@
   private bool showNewFile { get; set; } = false;
   protected override void OnInitialized()
   {
-    planner.StateHasChanged += reload;
     planner.LocalCourse = null;
+    planner.StateHasChanged += reload;
   }
 
   private void reload()
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
index e473db2..5608bcf 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
@@ -190,7 +190,7 @@
       <div class="col">
         <textarea 
           id="description" 
-          class="form-control" 
+          class="form-control h-100" 
           rows=12
           @bind="description"
           @oninput="handleNewDescription"
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 481e8ff..5ca243a 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -4,18 +4,19 @@
 
 @inject CoursePlanner planner
 @inject CanvasService canvas
+@inject NavigationManager Navigation
 @inject AssignmentEditorContext assignmentContext
 
 @code {
   protected override void OnInitialized()
   {
     assignmentContext.StateHasChanged += reload;
+    reload();
   }
   private void reload()
   {
     if (assignmentContext.Assignment != null)
     {
-      AssignmentModal?.Show();
       name = assignmentContext.Assignment.Name;
       lockAtDueDate = assignmentContext.Assignment.LockAtDueDate;
     }
@@ -32,7 +33,6 @@
     name = "";
     lockAtDueDate = false;
   }
-  public Modal? AssignmentModal { get; set; } = null;
   private string name { get; set; } = String.Empty;
   private bool lockAtDueDate { get; set; }
 
@@ -48,7 +48,6 @@
 
       assignmentContext.SaveAssignment(newAssignment);
     }
-    AssignmentModal?.Hide();
     assignmentContext.Assignment = null;
   }
 
@@ -86,7 +85,6 @@
         await canvas.Assignments.Delete(courseId, assignment);
       }
     }
-    AssignmentModal?.Hide();
   }
 
   private void handleNameChange(ChangeEventArgs e)
@@ -134,65 +132,58 @@
       .FirstOrDefault(g => g.Id == assignmentContext.Assignment?.LocalAssignmentGroupId);
 }
 
-<Modal @ref="AssignmentModal" OnHide="OnHide" Size="xl">
-  <Title>
-    @assignmentContext.Assignment?.Name
-  </Title>
+@assignmentContext.Assignment?.Name
 
-  <Body>
-    @if (assignmentContext.Assignment != null)
-    {
-      <div class="m-1">
-        <label class="form-label">
-          Name
-        </label>
-        <input 
-          class="form-control" 
-          @bind="name"
-          @oninput="handleNameChange" 
-        />
-      </div>
-      <ButtonSelect
-        Label="Assignment Group"
-        Options="planner.LocalCourse.AssignmentGroups"
-        GetId="(g) => g.Id"
-        GetName="(g) => g.Name"
-        OnSelect="(g) => setAssignmentGroup(g)"
-        SelectedOption="selectedAssignmentGroup"
-      />
-      <div class="m-1">
-        <AssignmentDescriptionEditor />
-      </div>
+@if (assignmentContext.Assignment != null)
+{
+  <div class="m-1">
+    <label class="form-label">
+      Name
+    </label>
+    <input 
+      class="form-control" 
+      @bind="name"
+      @oninput="handleNameChange" 
+    />
+  </div>
+  <ButtonSelect
+    Label="Assignment Group"
+    Options="planner.LocalCourse.AssignmentGroups"
+    GetId="(g) => g.Id"
+    GetName="(g) => g.Name"
+    OnSelect="(g) => setAssignmentGroup(g)"
+    SelectedOption="selectedAssignmentGroup"
+  />
+  <div class="m-1">
+    <AssignmentDescriptionEditor />
+  </div>
 
-      <div class="form-check m-1">
-        <input 
-          class="form-check-input" 
-          id="lockAtDueDate" 
-          type="checkbox" 
-          @bind="lockAtDueDate"
-          @oninput="handleLockAtDueDateChange" 
-        />
-        <label 
-          class="form-check-label" 
-          for="lockAtDueDate"
-        >
-          Lock At Due Date
-        </label>
-      </div>
-      <RubricEditor />
-      <SubmissionTypeSelector />
-    }
-  </Body>
-  <Footer>
-    <ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
-    <button 
-      class="btn btn-primary" 
-      @onclick="@(() => {
-        AssignmentModal?.Hide();
-        assignmentContext.Assignment = null;
-      })"
+  <div class="form-check m-1">
+    <input 
+      class="form-check-input" 
+      id="lockAtDueDate" 
+      type="checkbox" 
+      @bind="lockAtDueDate"
+      @oninput="handleLockAtDueDateChange" 
+    />
+    <label 
+      class="form-check-label" 
+      for="lockAtDueDate"
     >
-      Done
-    </button>
-  </Footer>
-</Modal>
+      Lock At Due Date
+    </label>
+  </div>
+  <RubricEditor />
+  <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>
+
diff --git a/Management.Web/Shared/Course/CourseDetails.razor b/Management.Web/Shared/Course/CourseDetails.razor
index 25182c3..4b155a0 100644
--- a/Management.Web/Shared/Course/CourseDetails.razor
+++ b/Management.Web/Shared/Course/CourseDetails.razor
@@ -40,7 +40,6 @@
   }
 }
 
-<AssignmentForm />
 <QuizForm />
 
 <div class="row">
diff --git a/Management.Web/Shared/CurrentFiles.razor b/Management.Web/Shared/CurrentFiles.razor
index 18a73f5..0aeeb49 100644
--- a/Management.Web/Shared/CurrentFiles.razor
+++ b/Management.Web/Shared/CurrentFiles.razor
@@ -17,11 +17,11 @@
 
   void handleClick(MouseEventArgs e, LocalCourse course)
   {
-    logger.LogInformation("here");
+    @* logger.LogInformation("here"); *@
     planner.LocalCourse = course;
     Navigation.NavigateTo("/course/" + course.Name);
+    Console.WriteLine("navigated to course detail");
   }
-
 }
 
 <div class="text-center">
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
index 98cedba..8ee91d7 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
+++ b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
@@ -3,6 +3,7 @@
 
 @inject DragContainer dragContainer
 @inject CoursePlanner planner
+@inject NavigationManager Navigation
 @inject AssignmentEditorContext assignmentContext
 
 @inherits DroppableAssignment
@@ -44,6 +45,11 @@
     .FirstOrDefault(
       a => a.Id == Assignment.CanvasId
     ) != null;
+  private void OnClick() 
+  {
+    assignmentContext.Assignment = Assignment;
+    Navigation.NavigateTo("/course/" + planner.LocalCourse.Name + "/assignment/" + Assignment.Id);
+  }
 
 }
 
@@ -51,7 +57,7 @@
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
-  @onclick="@(() => assignmentContext.Assignment = Assignment)"
+  @onclick="OnClick"
   role="button"
 >
   <div class="card">
diff --git a/Management.Web/Shared/Semester/Day/AssignmentInDay.razor b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
index 2d5f76d..2f5fb6c 100644
--- a/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
+++ b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
@@ -2,8 +2,10 @@
 
 @inject DragContainer dragContainer
 @inject CoursePlanner planner
+@inject NavigationManager Navigation
 @inject AssignmentEditorContext assignmentContext
 
+@inject ILogger<AssignmentInDay> logger
 @inherits DroppableAssignment
 
 @code {
@@ -29,13 +31,23 @@
   {
     dragContainer.DropCallback = null;
   }
+
+  private void OnClick() 
+  {
+    if(planner.LocalCourse != null)
+    {
+      assignmentContext.Assignment = Assignment;
+      Navigation.NavigateTo("/course/" + planner.LocalCourse.Name + "/assignment/" + Assignment.Id);
+      logger.LogInformation("navigating to assignment page");
+    }
+  }
 }
 
 <div
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
-  @onclick="@(() => assignmentContext.Assignment = Assignment)"
+  @onclick="OnClick"
   role="button"
 >
   @Assignment.Name