refactor, fix picture scroll