fixed buttons, rearranged some things