Fixed the scrolling
show placeholder image
Merge branch 'master' into fix-scroll
Merge branch 'fix-scroll'