(Menu) Get rid of more hardcoded enums