Tweak Class Diagram layout; story #35