Reorg of the diagrams for better view