Large refactoring of the rendering

- More "d3" like.  Makes position manipulations easier