More progress on events page