Revamping waterfall in d3