some more menu work