nav bar
Merge branch 'pierre'