Fixes button text
Even more toggle fixes
Merge branch 'master' of github.com:ekmartin/PowerHack