Make CM_figures more didactic