Merge pull request #8 from wiruzx/master

UI fixes