Feature/fix animations