scroll fixes and optimization