tidied up the form for new event, and edit event.