UI improvement
Merge pull request #81 from benitoro/master

UI improvement