added UI for note
conflict in job_controller removed