Refactored menu creation