Improve Domain Diagram navigation