Fix activity management
Refactor

Single Canvas activity for edit and new note
Refactor 2