some scrolling updates

shouldn't you be able to do this outside of the scroll function and deduplicate the two?