Tidy up 'Variant' label in CP settings

.. when Multicomponent model is not selected the 'variant'
   label gets left shown all by itself.