Set dopri message on cancel
Reset module creators on save
Decouple and refactor main controller and view