Lots of ui work
Merge pull request #125 from HoltMaki/master

Lots of ui work