Added scroll view bug fix