Merge pull request #68 from alfeko/master

UI Update
Merge pull request #72 from alfeko/alexbranch

Merge pull request #68 from alfeko/master