Issue #2019 fix

Tied labels to their respective controls