Cleanup template
Reorganise fields in event form #151