Fixed some issues added animate