Improve insert event form