fixed some things, broke the buttons