Added Navbar, minor updates

o Added Navbar
o Minor updates made throughout files