Trying to fix bugs in buttons.