-Fixed some "stupiding" in button behavior