Major UI update
Merge pull request #18 from jammm/master

Major UI update