Fixed Name Label issue in Layout
Merge branch 'master' into master_clean