Updated Button behavior