#57 - Some UI fixes

- it also includes #74
Merge pull request #76 from ermauliks/master

#57 - Some UI fixes