Various bug fixes
Merge branch 'master' of https://github.com/woodbury/Musha

Various button showing, hiding, renaming changes