UI fixes again
Merge pull request #32 from stas-tanko/stas

UI fixes again