Some fixes with buttons, yo.

Some fixes with buttons, yo.