better scroll
better stable loading
Merge branch 'issue1'