Added search box to the Navbar and included few other changes