Improve the buttons