Refactored to add scrollViewContainer property