Improve graphics
