* Improve animation rendering

