further scroll view fixes