Fine tune animation speed
Merge branch 'animation' into develop