Menu Builder Refactored