made some minor changes
Merge branch 'UI' of https://github.com/nyus2014/CIU into UI