EnclosMenu refactoring