Fix them broken menu items properly this time