Some changes of button