Ticket #945: Improving navigation markup