UI Updates
Merge pull request #58 from toldavidorick/master

UI Updates