Insert new indicator handler
Fix some bugs
Update
Update animation