Add legend to generated graph with container name (unfortunately this will not always be corrected)

Also order dictionaries