Added bargraph, table and other changes