[REFACTOR] - refactored menu creation.