Clean up the draw a little

See ttile