Enhanced layout + fix for scores & dates