updated menu structure
Merge branch 'JIRA-GWEB-225'