Refactored menu