Minor weaks to buttons