Reorganized menu