merged cancel event buttons
tweaked events controller
minor changes to events controller