More scroll  view fixes