Added Navbar and TODOs