ClientAPI >> Button Events Transition Fix?

This should fix the problem with transitions. If not, it atleast makes
it run more smoother