more navbar cleanup