added menus
Merge origin/master