Still more navbar work.