Graphic improvments