new helper scrollToCurrentImage & refactor some code