Event Dialog Bug fixes