add country field back
move unit function to its own module
unit editing layout and unit profile page