refactoring & bug fix score screen