minor code refactor
show/hide event editor
Merge remote-tracking branch 'origin/master'