ScrumView refactoring