Improved some drawing.