Scores Layout & Bug Fixes