More tweaks for the graph layout