Fix score
Merge branch 'layout' into develop