Some Scroll widget refactoring