Match main menu markup with D6 and CKAN - issue #778