Added menus
Added menu to app
Merge branch 'menu'