Fixes with animations. Still some bugs to solve