diff --git a/Controller/NotesController.php b/Controller/NotesController.php
index 50c59ac..2168046 100644
--- a/Controller/NotesController.php
+++ b/Controller/NotesController.php
@@ -52,7 +52,6 @@ class NotesController
                 $_POST['content'], 
                 $_SESSION['user_id']
             );
-            exit();
             
             if ($note) {
                 // Redirect to show notes page after successful creation
@@ -91,6 +90,6 @@ class NotesController
     {
         $noteId = $_GET['id'];
         $this->notesModel->deleteNote($noteId, $_SESSION['user_id']);
-        header("Location: ?controller=Notes&page=showNotes");
+        header("Location: ?controller=Notes&page=showNotes&do=showNotes");
     }
 }
\ No newline at end of file
diff --git a/Controller/WelcomeController.php b/Controller/WelcomeController.php
index 4f6de84..e200495 100644
--- a/Controller/WelcomeController.php
+++ b/Controller/WelcomeController.php
@@ -17,33 +17,5 @@ class WelcomeController
         if ($this->notesModel === null) {
             $this->notesModel = new \ppa\Model\NotesModel();
         }
-
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            if ($_POST['action'] === 'create_note') {
-                $this->notesModel->createNote(
-                    $_POST['title'], 
-                    $_POST['content'], 
-                    $_SESSION['user_id']
-                );
-                exit();
-            }
-            else if ($_POST['action'] === 'update_note') {
-                $this->notesModel->editNote(
-                    $_POST['note_id'], 
-                    $_POST['title'], 
-                    $_POST['content'], 
-                    $_SESSION['user_id']
-                );
-                exit();
-            }
-            else if ($_POST['action'] === 'delete_note') {
-                $this->notesModel->deleteNote(
-                    $_POST['note_id'], 
-                    $_SESSION['user_id']
-                );
-                exit();
-            }
-            header('Location: ?controller=Notes&page=showNotes&do=showNotes');
-        }
     }
 }
diff --git a/Views/Notes/createNote.phtml b/Views/Notes/createNote.phtml
index 3181cc9..e67340d 100644
--- a/Views/Notes/createNote.phtml
+++ b/Views/Notes/createNote.phtml
@@ -62,6 +62,8 @@ function sanitize($data, $flags = ENT_QUOTES, $encoding = 'UTF-8') {
     <div class="form-actions">
         <button type="submit" class="button"><?php echo $isEditMode ? 'Update Note' : 'Create Note'; ?></button>
     </div>
+    <input type="hidden" name="controller" value="Notes">
+    <input type="hidden" name="do" value="createNote">
 </form>
 
 </div>
diff --git a/Views/Notes/editNote.phtml b/Views/Notes/editNote.phtml
index 2797213..1cd33f5 100644
--- a/Views/Notes/editNote.phtml
+++ b/Views/Notes/editNote.phtml
@@ -62,6 +62,8 @@ function sanitize($data, $flags = ENT_QUOTES, $encoding = 'UTF-8') {
     <div class="form-actions">
         <button type="submit" class="button"><?php echo $isEditMode ? 'Update Note' : 'Create Note'; ?></button>
     </div>
+    <input type="hidden" name="controller" value="Notes">
+    <input type="hidden" name="do" value="editNote">
 </form>
 
 </div>