buttons were self-closing, now they're not
Merge pull request #1533 from stevewithington/develop

buttons were self-closing, now they're not