[TAC-27] menu refactoring