Adding the last changes to buttons