Made visual changes, and rewrote when Names were drawn.