Added Name Label functionality