Added search and few design fixes