Added Unit field
Unit field is not checked if its empty
unit field now functional
Merge branch 'info_ui' into unit_ui