Improve Event edit and dedupe modals