[OE-3514] cvi status markup tweaks