ScrollView Update

There are still problem on scrollview