Associated labels with correct control IDs and render span if no control...

... is specified in the property panel

Fixes U4-4349 and U4-5849