UI Updates
Merge pull request #56 from toldavidorick/master

UI Updates