(Menu) Refactor more hardcoded enums