Pull req
Merge pull request #1 from Abbath/master

UI update