Fix up the StringConstant activity UI for the new service panel.
Tidy up the code.