changes to and testing of event phase one layout