Fixes

Cleaner way to animate keyboard and scrollView