UI fixes
Merge pull request #28 from stas-tanko/stas

UI fixes