fixed most of the buttons