diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index c29d353..5c21a1d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,5 @@
 {
   "recommendations": [
-    "alexkrechik.cucumberautocomplete",
     "csharpier.csharpier-vscode"
   ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5bc9f86..53926d5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,3 @@
 {
-  "cucumberautocomplete.steps": [
-    "./Management.Gherkin/**/*.cs"
-  ]
+  "dotnet.defaultSolution": "canvasManagement.sln"
 }
\ No newline at end of file
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentForm/AssignmentDescriptionEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
similarity index 100%
rename from Management.Web/Shared/Module/Assignment/AssignmentForm/AssignmentDescriptionEditor.razor
rename to Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
similarity index 99%
rename from Management.Web/Shared/Module/Assignment/AssignmentForm/AssignmentForm.razor
rename to Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 95736ff..0f4a4a2 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -97,7 +97,7 @@
     submissionTypes = newTypes;
     StateHasChanged();
   }
-} 
+}
 
 <Modal @ref="AssignmentModal" OnHide="@(() => OnHide())">
   <Title>
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentForm/RubricEditor.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
similarity index 100%
rename from Management.Web/Shared/Module/Assignment/AssignmentForm/RubricEditor.razor
rename to Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentForm/RubricEditorItem.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor
similarity index 100%
rename from Management.Web/Shared/Module/Assignment/AssignmentForm/RubricEditorItem.razor
rename to Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentForm/SubmissionTypeSelector.razor b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
similarity index 100%
rename from Management.Web/Shared/Module/Assignment/AssignmentForm/SubmissionTypeSelector.razor
rename to Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
index 8c5477b..bda29a1 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
+++ b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
@@ -1,5 +1,5 @@
 @using Management.Web.Shared.Components
-@using Management.Web.Shared.Module.Assignment.AssignmentForm
+@using Management.Web.Shared.Components.AssignmentForm
 
 @inject AssignmentDragContainer dragContainer
 @inject CoursePlanner planner
diff --git a/Management.Web/Shared/Semester/AssignmentInDay.razor b/Management.Web/Shared/Semester/AssignmentInDay.razor
index b56a6cf..34b9150 100644
--- a/Management.Web/Shared/Semester/AssignmentInDay.razor
+++ b/Management.Web/Shared/Semester/AssignmentInDay.razor
@@ -1,3 +1,4 @@
+@using Management.Web.Shared.Components.AssignmentForm
 
 @inject AssignmentDragContainer dragContainer
 @inject CoursePlanner planner
@@ -18,6 +19,7 @@
   {
     planner.StateHasChanged -= reload;
   }
+  private bool showUpdateForm = false;
 
   private void dropOnDate(DateTime dropDate)
   {
@@ -112,7 +114,14 @@
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
+  @onclick="@(() => showUpdateForm = true)"
   role="button"
 >
   @Assignment.name
-</div>
\ No newline at end of file
+</div>
+
+<AssignmentForm
+  Assignment="Assignment"
+  Show="showUpdateForm"
+  OnHide="@(() => showUpdateForm = false)"
+/>
\ No newline at end of file
diff --git a/Management.Web/Shared/Semester/Day.razor b/Management.Web/Shared/Semester/Day.razor
index 2140202..e854f81 100644
--- a/Management.Web/Shared/Semester/Day.razor
+++ b/Management.Web/Shared/Semester/Day.razor
@@ -106,4 +106,4 @@
     <AssignmentInDay Assignment="assignment" @key="@assignment" />
   }
   </div>
-</div>
\ No newline at end of file
+</div>