Updated add event form
Fix merge conflicts