Tidy up display of events
Tidy up of events