Minor fixes
Add animation on focus
Merge branch 'develop'