Added Navbar and formatted