remove reset button
Merge branch 'master' into fix-scroll