Improving the buttons.