Markup order more intuitive; noticed/fixed submenu bug