Rearrange index and flow. Update animation