[TASK] Reorganise Event input form