Mo button fixes.
Merge pull request #512 from tobeytailor/buttons

Mo button fixes.