refactored menu