Various markup upgrades for the results page