Refactor Scores Screen