Removed old template and added Navbar