Some graphical improvments