Made scrolling work better