Fixed small bugs for button presses