more navbar fixes