Lint
Merge pull request #120 from vboginskey/ui-improvements

Lint