rearranged the buttons and made them all hooked up to the correct methods