Refactoring and scrolling updates