Minor fixes to buttons