Optimised graph layout a bit more