#130 - minor UI bug fixes
Merge pull request #504 from ermauliks/master

#130 - minor UI bug fixes