improve the buttons