Adedd improvements to sub-menu.