label's small improvement.
Merge pull request #6730 from andyque/refactor5110

refactor ui framework
Merge pull request #6735 from Dhilan007/v3_labelfix

label's small improvement.