Added Navbar and cleaned up the page