#1,#2 .. more scroll test fixes, start simplifying the calculation of rows to render