Menu refactored with checklist