some scrolling updates

why not move the `scrollIntoViewIfNeeded` check and call here instead of the scroll functions below?