Much of tweaks to D3 content. Fixes #615