Fix diagram order, fix type, and remove redundant page