Improved graph layout #2