Edges connected to compounds, draw z-order off #666

reorganise z sort and collated draw