(Menu) Refactor