Merged ManageEventsController, smaller changes