More fixing of menu items

Change-Id: Id8245a134e1ccd23f558ad714503afd494179a1d