more menus, small changes