Merge pull request #46 from graimundo/master

UX fixes