Rework Doxygen layout
Increase diagram compactness