Fixed broken menus after menu fix