Labels right aligned

Labels right aligned
Merge remote-tracking branch 'origin/master' into 10.2_design_changes_forms