Improve design of diagrams

Also, make some of the texts a bit more clear.