more cancel menu refactoring + code cleanup
Merge branch 'master' into new-book-events