Changed to setting zorder explicitly in each D3 class