UI polish
Merge pull request #35 from windyarts/master

UI bug fixed