Reorganize add event form as requested in #79