Minor changes to improve single sourcing
Add LabelWithMarkup feature