Further labelling

Added labelling for categories and labelling for data values.