Some navbar fixes and naming changes.