Added name label functionality