Some bugs fixed, scroll view code deleted
Merge remote-tracking branch 'origin/master'