Update menu gereration
Few fixes
Add new options