Scrolling issue and optimization