Improved Buttons quite a bit, fixes #22