Improved buttons
Merge branch 'master' of github.com:uopcs/warrior