create event visuals finished
Fix merge conflicts