Improvements to the graphical output