UI tweak
More polished animations
Merge branch 'fix-keyboard-issue'