More navbar fixes.