Tweaks to button class.