Improved the buttons