Disable buttons more aggressively