Merge pull request #30 from badnack/development

Development
UI cleanup
Merge remote-tracking branch 'upstream/development' into development