More links, and move circle drawing into a separate function