Some changes to buttons