Fix menu and submenu links ordering. Sub-nav menu on secondary pages sho...

...uld continue to be present.