Added the d3 joins and fixed the circles