Small tweaks, and namespacing `data-evaluated` to `data-picture-evaluated`