Changes to the Buttons so they are consistent