Fixing bubbling anim end event
Updating transition include to be more transition like