Switch & Animation small changes