Better layout of graphs
Improve graphs again.