UI Improvements
Merge pull request #85 from jdorn/ui-improvements

UI Improvements