Removed useless images
Use image and animation
Refine animations