Added labels and for attributes for needed fields