Reorder diagram, fix type, and remove redundant page