Re-order + remove broken with the Entity Reference (and File) widget