Merge pull request #29 from fatcerberus/master

UI improvements