Fixed regressions in main menu selection: first menu item in submenus were never highlighted when first item is shown and all submenu items were highlighted when any other item is shown.