ui improvement
Merge pull request #149 from benitoro/master

ui improvement