Improve animations
fix a crash when rotating device
Merge branch 'master' into improved-new-compose