NavBar changes again

Making sure that all 5 pages currently in use have the correct NavBar
setup.