Restructured graphic to be based on type