Several UI enhancements
Merge branch 'master' of github.com:jmcomets/gamerush3-team