correcting email sender
adding labels to fields