Merge pull request #68 from alfeko/master

UI Update