Diagram is shown, but wrong layout
New track view similar to Martin's
Cleaned up