More improvements for graph (tex, layout)