improved ui
Merge pull request #26 from xuzt/master

Improved UI