853 nav bar changes

This closes #853