refactor new report form