Cleanup, WIP on improved new event dialogue