fix event view
Merge branch 'feature/268_events_extension' into staging