IDEX-638: Refactor menus
IDEX-638: Refactor menus