Issue #2019 fix. Tied labels to their respective controls
Updated Version 3.1.58