Minor scroll and responsive fixes again and again.
Merge origin/master