Event form updates
Final updates