Further graphical improvements