fixed up event view display
Merge remote-tracking branch 'origin/dev' into feature/jtc_bug_fixes