Some visual improvements in the diagram