Changes: Flattened menu structure