UI
Updates
Merge pull request #63 from toldavidorick/master

UI