ScrumPage refactoring