Updated scrolling behavior