formatting
Updated chart labels and component IDs