IDEX-638: Refactor menus