UI updates
Merge pull request #31 from stas-tanko/stas

UI updates