Minor changes to scaling and click animation.
Merge branch 'yakovko'