Minor improvements to buttons