More consistent animations
Merge branch 'master' into stylus