More fixes for navigation bars.