#16 Refactor of validation & add controls on events adding & updating