Improved the buttons.