Updated Add/Edit event screen