Ui fixes
Merge pull request #13 from piotrglazar/feature/ui-fixes

Ui fixes