Button fixed

Fixed some bugs about the button, but there is still one more to go...