Minor tweaks to buttons