Add ScrollView, minor fixes