[REFACTOR] - code improvement (menu tree, dependency cycles, etc.)