fixed rest of menus