Some UI stuff
Merge branch 'master' of github.com:kwilding/kylewilding2