Navigation bar fixes.

This should finally fix #122.