Returning size and added scrollview
Fixed num cols calculation for low N items
Merge branch 'step6'