Some improvements to the button