Tweaks to buttons to use a little less space