Fixed the view to display events
merged conflicts