#21 Fixed diagram layout.