Feat-76
Fix feat-76 (change menu entity to item entity)
Feat-77
feat-78
Merge pull request #8 from c2is/feat-6

Feat 6