fix z-index for the final scores
Sync with master