re-submitt nav bar
Merge branch 'master' into paul