added menu
Merge remote-tracking branch 'remotes/origin/testing_menu'