Added menu
Modified menu
Merge branch 'menu'