Cleanup menus.
Menu fixed.
Merge branch 'develop'