fix menus, add 2nd wrapper