updates to use ScrollView