Fixes #23. Button cleanup.
Version 2.4-rc3