lots more navbar changes