Fixed issues with submenus.