Added two new EventView screens and other changes