Fix menu and submenu links ordering. Sub-nav menu on secondary pages should continue to be present.
Merge pull request #100 from ipoconnection/fix_menus_and_submenus

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