Even more compliant button behaviour.
Merge pull request #515 from tobeytailor/buttons

Even more compliant button behaviour.