Changed display order for Events
Merge branch 'james'