Improvements to SimpleButton