Input now contains animation on focus
Merge origin/master