Fixed various bugs, move delete button to edit modal