Improve the graph layout heuristics.

Fixes some hard cases in the OU database.
More graph layout tweaks.