Reorganize events page to fit structure