+ minor menu work