Improvements to button behavior.