refactor and revise layout for scores