Working version of the diagramatic view. Needs fixing on ordering and label. Also needs removal of pallete and some visual changes