Some more work on the buttons
Some more changes to buttons