Update menu gereration
Few fixes
Add new options
Merge remote-tracking branch 'origin/dev'