Move D3 into MainCtrl