Patched up the button system for all buttons.