Refactoring of scoreboard view