added Navbar and consolidated header
fixed header bug
changed to single navbar