Fix form element issue of having more than one associated label

Problem/Motivation

Having two labels for the same form element

Proposed resolution

• Remove the inner label

Remaining tasks

• Better patch
• Test
• Release

User interface changes

Have only one label

API changes

N/A

Data model changes

N/A