some changes with butttons