fixed animation and routing functional