fixed some issues with the buttons