Faces code cleanup - menu correction.