Refactored markup for events page