minor submenu fixes