fixes to buttons