Fixed Name Label issue in Layout