[IMP] refactor menu entries