Corrected some issues with the buttons.