add nav menu
Merge branch 'add-nav'