Fix menu and submenu links ordering. Sub-nav menu on secondary pages should continue to be present.