fixed the buttons and stuff