Reorder figures, add \cref's to them