Updated diagram layout