Scrolling fix + cursor fix