Improved class diagram layout