Fixed some formatting of events