Refactored the EventForm