More navbar fixes