Improved D3 layout