Result HTML major revamp