Some scrolling improvements