updates to scrollview to handle nestedSubviews: false