Change to using D3 for constructing table