Ability
Refactoring menu creation logic