Fixed menu organization.