Fixed #204
Merge pull request #212 from justjanne/pr/fix-ui

Fixed several UI bugs